"lock" is a reserved MySQL keyword

diff --git a/include/lock.php b/include/lock.php
index cc2888c0a49ae3d738eae7a48cd4ca3b961cc294..e7e176eeec22aef020a3924f98ddcd36cdb06f00 100644 (file)
--- a/include/lock.php
+++ b/include/lock.php
@@ -10,19 +10,19 @@ function lock_function($fn_name, $block = true, $wait_sec = 2) {
        $got_lock = false;
 
        do {
-               q("LOCK TABLE lock WRITE");
-               $r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1",
+               q("LOCK TABLE locks WRITE");
+               $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
                        dbesc($fn_name)
                );
 
                if((count($r)) && (! $r[0]['locked'])) {
-                       q("UPDATE lock SET locked = 1 WHERE name = '%s' LIMIT 1",
+                       q("UPDATE locks SET locked = 1 WHERE name = '%s' LIMIT 1",
                                dbesc($fn_name)
                        );
                        $got_lock = true;
                }
                elseif(! $r) { // the Boolean value for count($r) should be equivalent to the Boolean value of $r
-                       q("INSERT INTO lock ( name, locked ) VALUES ( '%s', 1 )",
+                       q("INSERT INTO locks ( name, locked ) VALUES ( '%s', 1 )",
                                dbesc($fn_name)
                        );
                        $got_lock = true;
@@ -47,7 +47,7 @@ function block_on_function_lock($fn_name, $wait_sec = 2) {
                $wait_sec = 2;  // don't let the user pick a value that's likely to crash the system
 
        do {
-               $r = q("SELECT locked FROM lock WHERE name = '%s' LIMIT 1",
+               $r = q("SELECT locked FROM locks WHERE name = '%s' LIMIT 1",
                                dbesc(fn_name)
                     );
 
@@ -63,7 +63,7 @@ function block_on_function_lock($fn_name, $wait_sec = 2) {
 if(! function_exists('unlock_function')) {
 function unlock_function(fn_name) {
        //$r = q("LOCK TABLE lock WRITE");
-       $r = q("UPDATE lock SET locked = 0 WHERE name = '%s' LIMIT 1",
+       $r = q("UPDATE locks SET locked = 0 WHERE name = '%s' LIMIT 1",
                        dbesc(fn_name)
             );
        //$r = q("UNLOCK TABLES");

diff --git a/update.php b/update.php
index 5e5ec3e865590812d57c0bd9e8a4b2cdcdd4910e..37dce341f435f049b6c5ed151a449ecbb176dd81 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1309,10 +1309,10 @@ function update_1150() {
 
 
 function update_1151() {
-       $r = q("CREATE TABLE IF NOT EXISTS lock (
+       $r = q("CREATE TABLE IF NOT EXISTS locks (
                        id INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
-                       name CHAR(128) NOT NULL ,
-                       locked TINYINT(1) NOT NULL DEFAULT '0'
+                       name CHAR( 128 ) NOT NULL ,
+                       locked TINYINT( 1 ) NOT NULL DEFAULT '0'
                  ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
        if (!$r)
                return UPDATE_FAILED;