diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 7c625c208e1..2d4a1c3a0ad 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -171,6 +171,12 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
 #define FLUSH_TIME		0		/* Don't flush tables */
 #define MAX_CONNECT_ERRORS	10		// errors before disabling host
 
+#ifdef HAVE_INNOBASE_DB
+#define IF_INNOBASE_DB(A, B) (A)
+#else
+#define IF_INNOBASE_DB(A, B) (B)
+#endif
+
 #if defined(__WIN__) || defined(OS2)
 #define IF_WIN(A,B) (A)
 #undef	FLUSH_TIME
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 6e28f5bcefb..9a78daa1479 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1810,9 +1810,8 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
     TABLE_LIST table_list;
     LEX_STRING conv_name;
     /* Saved variable value */
-#ifdef HAVE_INNOBASE_DB
-    my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;
-#endif
+    my_bool old_innodb_table_locks= 
+              IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
 
 
     statistic_increment(thd->status_var.com_stat[SQLCOM_SHOW_FIELDS],
@@ -2336,9 +2335,8 @@ mysql_execute_command(THD *thd)
   /* Locked closure of all tables */
   TABLE_LIST *locked_tables= NULL;
   /* Saved variable value */
-#ifdef HAVE_INNOBASE_DB
-  my_bool old_innodb_table_locks= thd->variables.innodb_table_locks;
-#endif
+  my_bool old_innodb_table_locks=
+            IF_INNOBASE_DB(thd->variables.innodb_table_locks, FALSE);
   DBUG_ENTER("mysql_execute_command");
   thd->net.no_send_error= 0;