bzr commit into mysql-6.0-falcon branch (hky:2942)

[Hakan Kuecuekyilmaz]

#At file:///home/hakan/work/mysql/mysql-6.0-falcon-to-merge/ based on revid:hky@stripped

 2942 Hakan Kuecuekyilmaz	2008-12-25 [merge]
      Merged
          mysql-6.0 --> mysql-6.0-falcon.
modified:
  configure.in
  mysql-test/suite/maria/t/maria-lock.test
  sql/sql_base.cc

=== modified file 'configure.in'
--- a/configure.in	2008-12-14 11:36:15 +0000
+++ b/configure.in	2008-12-17 13:06:53 +0000
@@ -11,7 +11,7 @@ AC_CANONICAL_SYSTEM
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
 
-AM_INIT_AUTOMAKE(mysql, 6.0.9-alpha)
+AM_INIT_AUTOMAKE(mysql, 6.0.10-alpha)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=6

=== modified file 'mysql-test/suite/maria/t/maria-lock.test'
--- a/mysql-test/suite/maria/t/maria-lock.test	2008-10-23 16:29:52 +0000
+++ b/mysql-test/suite/maria/t/maria-lock.test	2008-12-16 12:11:49 +0000
@@ -2,6 +2,7 @@
 # Different cases involving locking that has failed with Maria
 #
 # Can't test with embedded server
+-- source include/have_maria.inc
 -- source include/not_embedded.inc
 
 --disable_warnings

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2008-12-14 11:36:15 +0000
+++ b/sql/sql_base.cc	2008-12-25 07:18:37 +0000
@@ -6524,7 +6524,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);
   }