bzr commit into mysql-6.0 branch (sergefp:2759)

[Sergey Petrunia]

#At file:///home/spetrunia/dev/mysql-6.0-merge/ based on
revid:sergefp@stripped

 2759 Sergey Petrunia	2008-12-29 [merge]
      Trivial merge
modified:
  .bzr-mysql/default.conf
  sql/sql_base.cc

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-22 20:00:22 +0000
+++ b/.bzr-mysql/default.conf	2008-12-29 08:58:54 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-opt-subqueries/
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-6.0-opt-subqueries"
+tree_name = "mysql-6.0"

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2008-12-27 01:32:33 +0000
+++ b/sql/sql_base.cc	2008-12-29 08:58:54 +0000
@@ -6523,7 +6523,14 @@ int setup_wild(THD *thd, TABLE_LIST *tab
     /* make * substituting permanent */
     SELECT_LEX *select_lex= thd->lex->current_select;
     select_lex->with_wild= 0;
-    select_lex->item_list= fields;
+
+    /*
+      The assignment below is translated to memcpy() call (at least on some
+      platforms). memcpy() expects that source and destination areas do not
+      overlap. That problem was detected by valgrind.
+    */
+    if (&select_lex->item_list != &fields)
+      select_lex->item_list= fields;
 
     thd->restore_active_arena(arena, &backup);
   }