bk commit into 5.0 tree (evgen:1.1995)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 repository of evgen. When evgen 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.1995 05/06/23 03:51:10 evgen@stripped +3 -0
  insert_update.result, insert_update.test, sql_base.cc:
    Fix for bugfix #9728 merge

  mysql-test/r/insert_update.result
    1.16 05/06/23 03:26:42 evgen@stripped +1 -1
    Fix for bugfix #9728 merge

  mysql-test/t/insert_update.test
    1.14 05/06/23 03:26:18 evgen@stripped +1 -1
    Fix for bugfix #9728 merge

  sql/sql_base.cc
    1.258 05/06/23 03:25:25 evgen@stripped +9 -4
    Fix for bugfix #9728 merge

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/mysql-5.0-merge

--- 1.257/sql/sql_base.cc	2005-06-23 01:02:40 +04:00
+++ 1.258/sql/sql_base.cc	2005-06-23 03:25:25 +04:00
@@ -2626,7 +2626,6 @@
   uint length=(uint) strlen(name);
   char name_buff[NAME_LEN+1];
 
-
   if (item->cached_table)
   {
     /*
@@ -2693,10 +2692,13 @@
     db= name_buff;
   }
 
+  bool search_global= item->item_flags & MY_ITEM_PREFER_1ST_TABLE;
   if (table_name && table_name[0])
   {						/* Qualified field */
-    bool found_table=0;
-    for (; tables; tables= tables->next_local)
+    bool found_table=0;    
+    uint table_idx= 0;
+    for (; tables; tables= search_global?tables->next_global:tables->next_local,
+        table_idx++)
     {
       /* TODO; Ensure that db and tables->db always points to something ! */
       if (!my_strcasecmp(table_alias_charset, tables->alias, table_name) &&
@@ -2732,6 +2734,8 @@
 	    return (Field*) 0;
 	  }
 	  found=find;
+          if (table_idx == 0 && item->item_flags & MY_ITEM_PREFER_1ST_TABLE) 
+            break;
 	}
       }
     }
@@ -2758,7 +2762,8 @@
   }
   bool allow_rowid= tables && !tables->next_local;	// Only one table
   uint table_idx= 0;
-  for (; tables ; tables= tables->next_local, table_idx++)
+  for (; tables ; tables= search_global?tables->next_global:tables->next_local, 
+      table_idx++)
   {
     if (!tables->table && !tables->ancestor)
     {

--- 1.15/mysql-test/r/insert_update.result	2005-05-14 19:19:54 +04:00
+++ 1.16/mysql-test/r/insert_update.result	2005-06-23 03:26:42 +04:00
@@ -1,4 +1,4 @@
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));
 INSERT t1 VALUES (1,2,10), (3,4,20);
 INSERT t1 VALUES (5,6,30) ON DUPLICATE KEY UPDATE c=c+100;

--- 1.13/mysql-test/t/insert_update.test	2005-05-14 17:24:32 +04:00
+++ 1.14/mysql-test/t/insert_update.test	2005-06-23 03:26:18 +04:00
@@ -1,5 +1,5 @@
 --disable_warnings
-DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t1, t2;
 --enable_warnings
 
 CREATE TABLE t1 (a INT, b INT, c INT, UNIQUE (A), UNIQUE(B));