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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/handler.cc:
  Auto merged

 - Wait for ndb_mgmd with timeout


mysql-test/mysql-test-run.pl:
  Add new function 'ndb_mgmd_wait_started' that will wait with timeout until ndb_mgmd has been started
  Don't bother to save the return value from 'ndb_mgmd_start' in local var as it's not used.

Add check in 'spawn_impl' that we are not trying to span when the path to the executable is empty or undefined

include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

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

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

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51


mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
BUILD/SETUP.sh:
  SCCS merged
BUILD/check-cpu:
  Manual merge.

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50


BUILD/SETUP.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
BUILD/check-cpu:
  Manual merge.

into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41


BUILD/SETUP.sh:
  SCCS merged

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


sql/sql_prepare.cc:
  Merge 5.0 to 5.1 
   - mysql_log.write => general_log_write
tests/mysql_client_test.c:
  Manual merge

 - Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
 - Add test case to check that also prepared statements end up in the query log
Bug#14346 Prepared statements corrupting general log/server memory
 - Use "stmt->query" when logging the newly prepared query instead of "packet"


sql/sql_prepare.cc:
  mysql_stmt_prepare
   - Use "%.*b" format when printing to log
   - Print the query from stmt instead of "packet", packet points at the net in/out buffer and has most likely been overwritten
     when  result for prepare was written to client.
  mysql_stmt_execute 
   - Use "%.*b" format when printing to log
   - Print the query from thd as the expanded query has been specifially set to be valid also after restore from backup statement
tests/mysql_client_test.c:
  Add tests for bug#21813 to already existing test for bug#17667. Add functionality for also executing prepared statements and making sure they end up in the log as well.

CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.



libmysql/CMakeLists.txt:
  Fix for Cmake BC problems (as suggested by Elliot)

into  gbichot3.local:/home/mysql_src/mysql-5.1-maint

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

into  polly.local:/home/kaa/src/maint/m50-maint--07OGt

into  gbichot3.local:/home/mysql_src/mysql-5.1-maint

and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
It was an assertion failure, only in debug builds, not present
in released versions (nothing to document).
It happened when doing SHOW TABLE STATUS on an InnoDB table
having an auto_increment column, right after creating the table.
The test which would have caught this problem was disabled in 
mid-April for another reason (how much I like tests disabled for
months...).


mysql-test/t/disabled.def:
  test now passes (and serves as the test for this bugfix)
sql/ha_innodb.cc:
  Before a val_() calls on a Field object, if that field was not marked
  for read, we need to mark it. This is explained here:
  ChangeSet 1.2119.601.1 2006/06/04 18:52:22 monty@mysql.com
  quoting the changeset's comment:
  
    - If a handler needs to call Field->val() or Field->store() on columns
      that are not used in the query, one should install a temporary
      all-columns-used map while doing so. For this, we provide the following
      functions:
    
      my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
      field->val();
      dbug_tmp_restore_column_map(table->read_set, old_map);
    
      and similar for the write map:
    
      my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
      field->val();
      dbug_tmp_restore_column_map(table->write_set, old_map);
    
      If this is not done, you will sooner or later hit a DBUG_ASSERT
      in the field store() / val() functions.
      (For not DBUG binaries, the dbug_tmp_restore_column_map() and
      dbug_tmp_restore_column_map() are inline dummy functions and should
      be optimized away be the compiler).
  
  Note that I verified that the bug didn't exist in non-debug builds.

into  lamia.home:/home/timka/mysql/src/5.1-bug-21456


mysql-test/r/distinct.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

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


sql/ha_innodb.cc:
  Auto merged

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/merge/mysql-5.1


storage/innobase/btr/btr0btr.c:
  Null merge.
storage/innobase/buf/buf0buf.c:
  Null merge.
storage/innobase/dict/dict0dict.c:
  Null merge.
storage/innobase/fil/fil0fil.c:
  Null merge.
storage/innobase/fsp/fsp0fsp.c:
  Null merge.
storage/innobase/include/btr0cur.ic:
  Null merge.
storage/innobase/include/buf0buf.ic:
  Null merge.
storage/innobase/log/log0log.c:
  Null merge.
storage/innobase/log/log0recv.c:
  Null merge.
storage/innobase/os/os0file.c:
  Null merge.
storage/innobase/row/row0mysql.c:
  Null merge.
storage/innobase/row/row0sel.c:
  Null merge.
storage/innobase/srv/srv0start.c:
  Null merge.
storage/innobase/ut/ut0dbg.c:
  Null merge.
client/mysqltest.c:
  Manual merge.
include/config-netware.h:
  Manual merge.
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/t/func_time.test:
  Manual merge.
sql/ha_innodb.cc:
  Manual merge.
sql/item_timefunc.cc:
  Manual merge.
sql/sql_acl.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.

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.

Fixed stacktrace dumps for i386/NPTL

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