into  eel.(none):/home/jonas/src/mysql-4.1-push

into  mysql.com:/home/alexi/dev/mysql-4.1-12101

into  eel.(none):/home/jonas/src/mysql-4.1-push

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

sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.

  new testprogram testSRBank


BitKeeper/etc/ignore:
  Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
  incProperty
ndb/test/ndbapi/Makefile.am:
  new test program
ndb/test/ndbapi/bank/Bank.cpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
  incProperty
ndb/test/src/UtilTransactions.cpp:
  close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
  New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''

   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

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

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

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


sql/item_cmpfunc.h:
  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.

  fixed compile error


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

into  mysql.com:/Users/mikron/mysql-4.1

ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fixed a bug and an issue with the added debug code for finding
  redo log write mistakes
  Removed a number of unnecessary break's
ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Added printouts of new debug info in log page header

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

ndb/src/kernel/blocks/backup/Backup.hpp:
  missed this file in prev commit
ndb/test/src/NdbBackup.cpp:
  corrected printouts in backup test

so that _only_ backup master replies to API
 

into mysql.com:/M41/mysql-4.1

Added debug info to all log page headers

configure.in:
  Auto merged
include/my_global.h:
  Auto merged

into  selena.:H:/MYSQL/src/#12517-mysql-4.1

into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607

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


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

into  mysql.com:/home/hartmut/projects/mysql/dev/4.1


client/mysqlimport.c:
  Auto merged

into  mysql.com:/home/alexi/mysql-4.1

Small tweak for random read performance (we shouldn't always tell the OS that we will be doing a linear scan). 


sql/examples/ha_tina.cc:
  Small tweak for random read performance.

into  mysql.com:/home/alexi/dev/mysql-4.1-0


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  block signals in threads making main process get all signals...

into  mysql.com:/usr/home/bar/mysql-4.1.b12611

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into  mysql.com:/usr/home/bar/mysql-4.1.b12829


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-4.1

  Added test cases for bug #12863.
item_sum.cc, item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.


sql/item_sum.h:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
sql/item_sum.cc:
  Fixed bug #12863.
  Added a flag to Item_func_group_concat set to FALSE after
  concatenation of the first element of a group.
mysql-test/t/func_gconcat.test:
  Added test cases for bug #12863.
mysql-test/r/func_gconcat.result:
  Added test cases for bug #12863.