From 75ed37fb3d17d97d73a53a62c10caa3a4d11c632 Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Sun, 17 Jun 2012 11:25:36 -0600
Subject: [PATCH] "lock" is a reserved MySQL keyword

---
 include/lock.php | 12 ++++++------
 update.php       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/lock.php b/include/lock.php
index cc2888c0a4..e7e176eeec 100644
--- 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 5e5ec3e865..37dce341f4 100644
--- 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;