From: ingo
Date: December 26 2005 9:53am
Subject: bk commit into 5.1 tree (ingo:1.1996)
List-Archive: http://lists.mysql.com/commits/415
Message-Id: <E1Eqp37-0001Wq-LR@chilla.local>

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.1996 05/12/26 10:53:43 ingo@stripped +1 -0
  Merge mysql.com:/home/mydev/mysql-5.1
  into  mysql.com:/home/mydev/mysql-5.1-bug5390

  sql/sql_parse.cc
    1.501 05/12/26 10:53:36 ingo@stripped +0 -0
    Auto merged

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug5390/RESYNC

--- 1.500/sql/sql_parse.cc	2005-12-22 10:12:33 +01:00
+++ 1.501/sql/sql_parse.cc	2005-12-26 10:53:36 +01:00
@@ -2824,7 +2824,7 @@
         if (!(lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))
         {
           TABLE_LIST *duplicate;
-          if ((duplicate= unique_table(create_table, select_tables)))
+          if ((duplicate= unique_table(thd, create_table, select_tables)))
           {
             update_non_unique_table_error(create_table, "CREATE", duplicate);
             res= 1;
@@ -2840,7 +2840,7 @@
                tab= tab->next_local)
           {
             TABLE_LIST *duplicate;
-            if ((duplicate= unique_table(tab, select_tables)))
+            if ((duplicate= unique_table(thd, tab, select_tables)))
             {
               update_non_unique_table_error(tab, "CREATE", duplicate);
               res= 1;