into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


configure.in:
  Auto merged
mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  SCCS merged

configure.in:
  Moving these to ha_ndbcluster.m4

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


storage/ndb/src/Makefile.am:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Will add the new code by hand.
configure.in:
  Moving this code to ha_ndbcluster.

config/ac-macros/ha_ndbcluster.m4:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
  BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.

configure.in:
  I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
  ---
  missed storage in one more place
  ---
  added storage back to patch after merge from 5.0-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
mysys/string.c:
  Auto merged
storage/ndb/src/Makefile.am:
  Auto merged

into  recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.


BitKeeper/deleted/.del-libndb.ver.in:
  Rename: ndb/src/libndb.ver.in -> BitKeeper/deleted/.del-libndb.ver.in
BitKeeper/etc/ignore:
  Added storage/ndb/src/libndb.ver to the ignore list

BitKeeper/etc/ignore:
  Added ndb/src/libndb.ver to the ignore list

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint

into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint

into  recycle.(none):/src/mysql-5.0-maint


mysys/string.c:
  Auto merged

into  recycle.(none):/src/mysql-5.1-maint


mysys/string.c:
  Auto merged

into  recycle.(none):/src/bug22807/my51-bug22807


mysys/string.c:
  Auto merged

- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.


mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Fix compiler warnings.
  - Used dynstr_append_mem where string length is known.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Use local.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/t/ps.test:
  Manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.


mysql-test/t/ps.test:
  Quash platform-specific warnings.

into  polly.local:/home/kaa/src/maint/mysql-5.1-maint

mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.


client/mysqlimport.c:
  Changed the opt_use_threads variable type to uint.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

 - Additional patch removing check for mysql_errno on already closed
   mysql1


tests/mysql_client_test.c:
  No need to check mysql_errno of mysql1 which has already been closed.

mysql-test/r/range.result:
  Fix for bug #22533: Traditional: Too-long bit value not rejected.
    - results adjusted.

into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


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

into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint


configure.in:
  Auto merged
storage/ndb/src/Makefile.am:
  Auto merged

storage/ndb/src/libndb.ver.in:
  BitKeeper file /home/mtaylor/src/mysql-5.1-new-maint/storage/ndb/src/libndb.ver.in