tests/mysql_client_test.c:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

   This fix is cancellation of ChangeSet
   1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0
   Bug 7142  Show Fields from fails using Borland's dbExpress interface
   The reason is we can't fix bug#7142 without
   breaking of existing applications/APIs that worked fine with earlier 4.1
   bug 7142 is fixed in 5.0




mysql-test/r/ps_1general.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_2myisam.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_3innodb.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_4heap.result:
  Bug #12817 SHOW STATUS now blob fields
mysql-test/r/ps_5merge.result:
  Bug #12817 SHOW STATUS now blob fields
sql/item.cc:
  Bug #12817 SHOW STATUS now blob fields
sql/sql_show.cc:
  Bug #12817 SHOW STATUS now blob fields
tests/mysql_client_test.c:
  Bug #12817 SHOW STATUS now blob fields

client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651

sql/item_cmpfunc.h:
  Auto merged

into lmy004.:/work/mysql-5.0-bug12651


sql/sql_base.cc:
  Auto merged

client/mysqlimport.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-bug12943


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into rurik.mysql.com:/home/igor/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/ndbapi/SignalSender.cpp:
  Merge

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_class.cc:
  SCCS merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

  Added a test case with VIEW for bug #12885.


mysql-test/t/olap.test:
  Added a test case with VIEW for bug #12885.
mysql-test/r/olap.result:
  Added a test case with VIEW for bug #12885.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_cmpfunc.h:
  Auto merged

mysql-test/r/connect.result:
  Auto merged
mysql-test/t/connect.test:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.
olap.test, olap.result:
  Added test case for bug #12885.


mysql-test/r/olap.result:
  Added test case for bug #12885.
mysql-test/t/olap.test:
  Added test case for bug #12885.
sql/sql_select.cc:
  Fixed bug #12885.
  Forced inheritence of the maybe_null flag for the expressions
  containing GROUP BY attributes in selects with ROLLUP.

into  mysql.com:/home/jimw/my/mysql-5.0-clean

are thus dangling later)


mysql-test/r/ps.result:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
mysql-test/t/ps.test:
  test for bug #12651
  (data allocated on thd's arena but not on permanent arena)
sql/sql_base.cc:
  if there is tree transformation then backup the current arena
  and use permanent one (for PS) otherwise the data will be deallocated
  after the prepare process is finished.
  this bug was introduced with the recent natural join patch

into  mysql.com:/home/timka/mysql/src/5.0-2486

  fixed compile error


ndb/src/ndbapi/SignalSender.cpp:
  fixed compile error

into  mysql.com:/home/timka/mysql/src/5.0-2486

into mysql.com:/usersnfs/pchardin/mysql-5.0


sql/sp_head.cc:
  Auto merged

(recommit with the right Bug#)


mysql-test/r/sp.result:
  result file modified to reflect new test
mysql-test/t/sp.test:
  added test for the bug
sql/item.cc:
  protect Item_splocal value from modification by CONCAT() et al
sql/item.h:
  added a buffer to save Item_splocal string pointer
sql/sp_head.cc:
  don't employ reuse mechanism to save var into itself

sql/sp_head.cc:
  Remove an obsolete comment (recursion in SP is disabled)
sql/sql_select.h:
  Remove an unused variable.