bk commit into 4.1 tree (lars:1.2419)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
4.1 repository of lthalmann. When lthalmann 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.2419 05/09/11 00:57:31 lars@stripped +1 -0
  Removed redundant reset_one_shot_variables calls

  sql/sql_parse.cc
    1.466 05/09/11 00:57:22 lars@stripped +0 -3
    Optimization, this reset is executed below anyway

# 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:	lars
# Host:	dl145h.mysql.com
# Root:	/users/lthalmann/bk/mysql-4.1-one_shot

--- 1.465/sql/sql_parse.cc	2005-09-06 20:38:48 +02:00
+++ 1.466/sql/sql_parse.cc	2005-09-11 00:57:22 +02:00
@@ -3327,7 +3327,6 @@
 	 !db_ok_with_wild_table(lex->name)))
     {
       my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
-      reset_one_shot_variables(thd);
       break;
     }
 #endif
@@ -3363,7 +3362,6 @@
 	 !db_ok_with_wild_table(lex->name)))
     {
       my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
-      reset_one_shot_variables(thd);
       break;
     }
 #endif
@@ -3404,7 +3402,6 @@
 	 !db_ok_with_wild_table(db)))
     {
       my_error(ER_SLAVE_IGNORED_TABLE, MYF(0));
-      reset_one_shot_variables(thd);
       break;
     }
 #endif