bk commit into 5.0 tree (monty:1.2018)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2018 06/01/06 12:48:14 monty@stripped +2 -0
  After merge fix and a safety fix for handler

  sql/sql_trigger.cc
    1.40 06/01/06 12:48:09 monty@stripped +3 -2
    After merge fix

  sql/sql_handler.cc
    1.78 06/01/06 12:48:09 monty@stripped +7 -7
    Move lock tables before conditions as lock tables may reopen tables

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.0

--- 1.39/sql/sql_trigger.cc	2006-01-06 01:08:45 +02:00
+++ 1.40/sql/sql_trigger.cc	2006-01-06 12:48:09 +02:00
@@ -1189,9 +1189,10 @@
       save_query_tables_own_last= thd->lex->query_tables_own_last;
       thd->lex->query_tables_own_last= 0;
 
-      res= check_table_access(thd, SELECT_ACL | UPDATE_ACL, &table_list, 0);
+      err_status= check_table_access(thd, SELECT_ACL | UPDATE_ACL,
+                                     &table_list, 0);
       thd->lex->query_tables_own_last= save_query_tables_own_last;
-      if (res)
+      if (err_status)
       {
         sp_restore_security_context(thd, save_ctx);
         return TRUE;

--- 1.77/sql/sql_handler.cc	2006-01-06 00:47:40 +02:00
+++ 1.78/sql/sql_handler.cc	2006-01-06 12:48:09 +02:00
@@ -414,6 +414,13 @@
   }
   tables->table=table;
 
+  HANDLER_TABLES_HACK(thd);
+  lock= mysql_lock_tables(thd, &tables->table, 1, 0, &not_used);
+  HANDLER_TABLES_HACK(thd);
+
+  if (!lock)
+    goto err0; // mysql_lock_tables() printed error message already
+
   if (cond && ((!cond->fixed &&
                 cond->fix_fields(thd, &cond)) || cond->check_cols(1)))
     goto err0;
@@ -426,13 +433,6 @@
       goto err0;
     }
   }
-
-  HANDLER_TABLES_HACK(thd);
-  lock= mysql_lock_tables(thd, &tables->table, 1, 0, &not_used);
-  HANDLER_TABLES_HACK(thd);
-
-  if (!lock)
-    goto err0; // mysql_lock_tables() printed error message already
 
   if (insert_fields(thd, &thd->lex->select_lex.context,
                     tables->db, tables->alias, &it, 0))