bk commit into 5.0 tree (sergefp:1.1968)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1968 05/09/09 11:50:38 sergefp@stripped +23 -0
  Post-merge fixes

  sql/item_sum.cc
    1.163 05/09/09 11:50:33 sergefp@stripped +1 -1
    Post-merge fixes

  mysql-test/t/olap.test
    1.24 05/09/09 11:50:33 sergefp@stripped +3 -4
    Post-merge fixes

  sql/sql_select.cc
    1.369 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  sql/sql_class.cc
    1.209 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  sql/item_sum.h
    1.94 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  sql/item_cmpfunc.h
    1.112 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  sql/item_cmpfunc.cc
    1.176 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/test/src/NdbBackup.cpp
    1.24 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/NdbTransaction.cpp
    1.46 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/ndbapi/Makefile.am
    1.14 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.36 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.86 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.11 05/09/09 11:44:07 sergefp@stripped +0 -0
    Auto merged

  ndb/src/kernel/main.cpp
    1.55 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.23 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/func_gconcat.test
    1.37 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  mysql-test/t/connect.test
    1.16 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/olap.result
    1.30 05/09/09 11:44:06 sergefp@stripped +0 -1
    Auto merged

  mysql-test/r/func_gconcat.result
    1.47 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  mysql-test/r/connect.result
    1.17 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  include/my_global.h
    1.104 05/09/09 11:44:06 sergefp@stripped +0 -0
    Auto merged

  configure.in
    1.344 05/09/09 11:44:06 sergefp@stripped +0 -1
    Auto merged

  client/mysqlimport.c
    1.53 05/09/09 11:44:06 sergefp@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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-merge/RESYNC

--- 1.111/sql/item_cmpfunc.h	2005-09-08 02:56:52 +04:00
+++ 1.112/sql/item_cmpfunc.h	2005-09-09 11:44:07 +04:00
@@ -910,7 +910,7 @@
     else
     {
       args[0]->update_used_tables();
-      if (!(used_tables_cache=args[0]->used_tables()))
+      if ((const_item_cache= !(used_tables_cache= args[0]->used_tables())))
       {
 	/* Remember if the value is always NULL or never NULL */
 	cached_value= (longlong) args[0]->is_null();

--- 1.162/sql/item_sum.cc	2005-09-08 08:36:19 +04:00
+++ 1.163/sql/item_sum.cc	2005-09-09 11:50:33 +04:00
@@ -2743,7 +2743,7 @@
   if (item->no_appended)
     item->no_appended= FALSE;
   else
-    item->result.append(*item->separator);
+    result->append(*item->separator);
 
   tmp.length(0);
 

--- 1.208/sql/sql_class.cc	2005-09-09 07:33:24 +04:00
+++ 1.209/sql/sql_class.cc	2005-09-09 11:44:07 +04:00
@@ -383,8 +383,10 @@
   my_free((char*) variables.time_format, MYF(MY_ALLOW_ZERO_PTR));
   my_free((char*) variables.date_format, MYF(MY_ALLOW_ZERO_PTR));
   my_free((char*) variables.datetime_format, MYF(MY_ALLOW_ZERO_PTR));
+  
   sp_cache_clear(&sp_proc_cache);
   sp_cache_clear(&sp_func_cache);
+
   if (global_read_lock)
     unlock_global_read_lock(this);
   if (ull)
@@ -423,9 +425,6 @@
     cleanup();
 
   ha_close_connection(this);
-
-  sp_cache_clear(&sp_proc_cache);
-  sp_cache_clear(&sp_func_cache);
 
   DBUG_PRINT("info", ("freeing host"));
   if (host != my_localhost)			// If not pointer to constant

--- 1.29/mysql-test/r/olap.result	2005-09-09 02:44:51 +04:00
+++ 1.30/mysql-test/r/olap.result	2005-09-09 11:44:06 +04:00
@@ -579,7 +579,6 @@
 1	1	1
 2	1	1
 NULL	NULL	2
-DROP TABLE t1;
 CREATE TABLE t1(id int, type char(1));
 INSERT INTO t1 VALUES
 (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"),

--- 1.23/mysql-test/t/olap.test	2005-09-09 02:44:12 +04:00
+++ 1.24/mysql-test/t/olap.test	2005-09-09 11:50:33 +04:00
@@ -262,7 +262,6 @@
 
 DROP TABLE t1;
 
-#
 # Bug #12885(1): derived table specified by a subquery with
 #                ROLLUP over expressions on not nullable group by attributes 
 #