bk commit into 4.1 tree (kp:1.2472)

[gkrishna]

Below is the list of changes that have just been committed into a local
4.1 repository of kp. When kp 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.2472 06/01/05 14:05:19 kp@stripped +2 -0
  Merge bk://mysql.bkbits.net/mysql-4.1
  into  blr-techserv.blr.novell.com:/home/kp/blr-engrlinux/bk/new/mysql-4.1_repair/mysql_4.1repair

  sql/sql_parse.cc
    1.474 06/01/05 14:04:33 kp@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.591 06/01/05 14:04:23 kp@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:	kp
# Host:	blr-techserv.blr.novell.com
# Root:	/home/kp/blr-engrlinux/bk/new/mysql-4.1_repair/mysql_4.1repair/RESYNC

--- 1.590/sql/mysqld.cc	2005-12-16 14:54:38 +05:30
+++ 1.591/sql/mysqld.cc	2006-01-05 14:04:23 +05:30
@@ -4370,7 +4370,7 @@
   {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts.", 0, 0, 0,
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"character-set-client-handshake", OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
-   "Don't use client side character set value sent during handshake.",
+   "Don't ignore client side character set value sent during handshake.",
    (gptr*) &opt_character_set_client_handshake,
    (gptr*) &opt_character_set_client_handshake,
     0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
@@ -5950,7 +5950,7 @@
 #else
   have_openssl=SHOW_OPTION_NO;
 #endif
-#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
+#ifdef HAVE_BROKEN_REALPATH
   have_symlink=SHOW_OPTION_NO;
 #else
   have_symlink=SHOW_OPTION_YES;
@@ -6631,7 +6631,7 @@
     usage();
     exit(0);
   }
-#if !defined(HAVE_REALPATH) || defined(HAVE_BROKEN_REALPATH)
+#if defined(HAVE_BROKEN_REALPATH)
   my_use_symdir=0;
   my_disable_symlinks=1;
   have_symlink=SHOW_OPTION_NO;

--- 1.473/sql/sql_parse.cc	2005-12-16 14:55:49 +05:30
+++ 1.474/sql/sql_parse.cc	2006-01-05 14:04:33 +05:30
@@ -2902,16 +2902,17 @@
     if (unit->select_limit_cnt < select_lex->select_limit)
       unit->select_limit_cnt= HA_POS_ERROR;		// No limit
 
-    if (find_real_table_in_list(tables->next, tables->db, tables->real_name))
+    if ((res= open_and_lock_tables(thd, tables)))
+      break;
+
+    insert_table= tables->table;
+    /* MERGE sub-tables can only be detected after open. */
+    if (mysql_lock_have_duplicate(thd, insert_table, tables->next))
     {
       /* Using same table for INSERT and SELECT */
       select_lex->options |= OPTION_BUFFER_RESULT;
     }
 
-    if ((res= open_and_lock_tables(thd, tables)))
-      break;
-      
-    insert_table= tables->table;
     /* Skip first table, which is the table we are inserting in */
     select_lex->table_list.first= (byte*) first_local_table->next;
     tables= (TABLE_LIST *) select_lex->table_list.first;