Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

sql/sql_parse.cc

@@ -1310,7 +1310,7 @@ enum enum_mysql_completiontype {
   SAVEPOINT_NAME_ROLLBACK=2,
   SAVEPOINT_NAME_RELEASE=4,
   COMMIT_AND_CHAIN=6,
-  ROLLBACK_AND_CHAIN=7,
+  ROLLBACK_AND_CHAIN=7
 };
 
 int mysql_endtrans(THD *thd, enum enum_mysql_completiontype completion, 
@@ -2234,7 +2234,9 @@ 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
   DBUG_ENTER("mysql_execute_command");
 
   /*
@@ -2330,7 +2332,9 @@ mysql_execute_command(THD *thd)
 	{
 	  if ((locked_tables= sp_hash_to_table_list(thd, &lex->sptabs)))
 	  {
+#ifdef HAVE_INNOBASE_DB
 	    thd->variables.innodb_table_locks= FALSE;
+#endif
 	    sp_open_and_lock_tables(thd, locked_tables);
 	  }
 	}
@@ -4346,7 +4350,9 @@ mysql_execute_command(THD *thd)
 
   if (locked_tables)
   {
+#ifdef HAVE_INNOBASE_DB
     thd->variables.innodb_table_locks= old_innodb_table_locks;
+#endif
     if (thd->locked_tables)
       sp_unlock_tables(thd);
   }