into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals


tests/mysql_client_test.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals


tests/mysql_client_test.c:
  Auto merged

single file is a bad practice.  


tests/mysql_client_test.c:
  Replace literal characters which don't make sense in UTF8 with ubiquitously-
  understood numbers.

mysql-test/r/mysqldump.result:
  post-merge fix.
mysql-test/t/mysqldump.test:
  post-merge fix.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21527


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqldump.c:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge

    
init_dumping now accepts a function pointer to the table or view specific init_dumping function.  This allows both tables and views to use the init_dumping function.


client/mysqldump.c:
  Added functions for table and view specific dumping initalization.
mysql-test/r/mysqldump.result:
  Added Result.
mysql-test/t/mysqldump.test:
  Added test case.

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged

into  zim.(none):/home/brian/mysql/arch-5.1


BUILD/compile-alpha-cxx:
  Auto merged
BUILD/compile-alpha-debug:
  Auto merged
BUILD/compile-dist:
  Auto merged
BUILD/compile-ia64-debug-max:
  Auto merged
CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
BUILD/FINISH.sh:
  Innodbase config still needed.

into  zim.(none):/home/brian/mysql/arch-5.1


sql/handler.cc:
  Auto merged

Fixed "discover" in the handler API.

Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread. 


sql/ha_innodb.h:
  Unused variable
sql/ha_ndbcluster.cc:
  Added "discover" to handlerton.
sql/handler.cc:
  Added plugin loop and correctly now use handler API.
sql/handler.h:
  Removed unused variable. Added discover to handler API
sql/mysqld.cc:
  Removed unused variables.
sql/sql_plugin.cc:
  Fixed DBUG Enter comment (obvious cut paste mistake)
storage/csv/ha_tina.cc:
  Found that if we don't bzero handlerton, that things can go boom!
  
  This probably needs to be fixed for all handlers

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


include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql-common/client.c:
  Auto merged

	InterfaceError on connect

Removed the bool flag from the st_mysql_options struct, since it adds 
another word in size to the memory size and shifts member memory locations
down, both of which break binary-interface compatibility.

Instead, use a flag, 2**30, in the client_options bit-field to represent
that the client should check the SSL certificate of the server.


include/mysql.h:
  Do not change the struct size.
include/mysql_com.h:
  Add a new bit-flag for client verifying server SSL certificate.
  
  Emphasize that we're not stepping on anyone else's bit/toes.
sql-common/client.c:
  Set and read the bit-field for client-side SSL-cert checking of the server.

CMakeLists.txt:
  add for federated
libmysqld/CMakeLists.txt:
  ha_heap.cc and ha_myisam.cc are removed
  add for federated
sql/CMakeLists.txt:
  add for federated
sql/handler.cc:
  fix for fussy compilers
storage/heap/CMakeLists.txt:
  add ha_heap.cc
storage/myisammrg/CMakeLists.txt:
  add ha_myisammrg.cc

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


mysql-test/r/csv.result:
  SCCS merged
mysql-test/t/csv.test:
  SCCS merged
storage/csv/ha_tina.cc:
  Using petr's merge.
sql/sql_acl.cc:
  SCCS merged
sql/sql_show.cc:
  SCCS merged

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/csv.result:
  manual merge
mysql-test/t/csv.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint


BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  manual merge
mysql-test/r/grant.result:
  manual merge

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972

The mysql client uses the default character set on reconnect.  The default character set is now controled by the client charset command while the client is running.  The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.


client/mysql.cc:
  Client charset command now changes the default character set and issues a SET NAMES command to the server.
mysql-test/r/mysql.result:
  Corrected results for new behaviour.
mysql-test/t/mysql.test:
  Removed redundant commands from test.

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

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

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint


support-files/mysql.spec.sh:
  Auto merged

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


mysql-test/r/ndb_dd_backuprestore.result:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint


support-files/mysql.spec.sh:
  Auto merged

 - Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
 


mysql-test/r/ndb_dd_advance.result:
  Update result file
mysql-test/r/ndb_dd_advance2.result:
  Update result file
mysql-test/r/ndb_dd_backuprestore.result:
  Update result file
mysql-test/r/ndb_dd_basic.result:
  Update result file
mysql-test/r/ndb_dd_disk2memory.result:
  Update result file
sql/sql_show.cc:
  Add "not in version before"  comments around "WITH PARSER xxx" and "TABLESPACE xxx STORAGE DISK"
  Use STRING_WITH_LEN when adding fixed string AUTO_INCREMENT= to output from SHOW TABLE

into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

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


dbug/dbug.c:
  Auto merged
configure.in:
  SCCS merged

configure.in:
  Exclude
dbug/dbug.c:
  Exclude

into  maint1.mysql.com:/data/localhome/tsmith/bk/51

into  maint1.mysql.com:/data/localhome/tsmith/bk/50

into  siva.hindu.god:/usr/home/tim/m/bk/51


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/50


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/beef-51


mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  siva.hindu.god:/usr/home/tim/m/bk/beef-50


mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge
sql/item_func.h:
  Manual merge
sql/item_strfunc.cc:
  Manual merge