into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
CMakeLists.txt:
  Auto merged
configure.in:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


configure.in:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/include/mix1.inc:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  use local

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


configure.in:
  Auto merged

Marko after applying latest snapshot).


storage/innobase/handler/ha_innodb.cc:
  Remove redundant assignment to thd_to_trx(thd); trx is
  declared as a reference to thd_to_trx(thd) at the top
  of the function, so this assignment isn't useful.
storage/innobase/include/trx0trx.h:
  Remove two unused members from struct trx_struct.  allow_duplicates
  and replace_duplicates are not used; a single duplicates member is
  used instead to represent both flags.

sql/sql_class.cc:
  Fix a valgrind warning (row_count_func is used before it was initialized
  in SQLCOM_CALL)

into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0

  - THD::tmp_table_used removed, THD::thread_specific_used used instead.

The files below "mysql-test/suite/funcs_2" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
    bk edit $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

There is only one file whose contents differs between 5.0 and 5.1,
restore its current 5.1 contents:
   mysql-test/suite/funcs_2/r/ndb_charset.result


BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7:
  Delete: mysql-test/suite/funcs_2/charset/charset_master.test
mysql-test/suite/funcs_2/charset/charset_master.test:
  Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test
BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4:
  Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt
BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b:
  Delete: mysql-test/suite/funcs_2/include/check_charset.inc
mysql-test/suite/funcs_2/data/charset_utf8.txt:
  Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt
mysql-test/suite/funcs_2/include/check_charset.inc:
  Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc
BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1:
  Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e:
  Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6:
  Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/include/check_charset_ucs2.inc:
  Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc
mysql-test/suite/funcs_2/include/check_charset_utf8.inc:
  Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc
BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16:
  Delete: mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472:
  Delete: mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl:
  Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
mysql-test/suite/funcs_2/r/innodb_charset.result:
  Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result
BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771:
  Delete: mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689:
  Delete: mysql-test/suite/funcs_2/r/ndb_charset.result
mysql-test/suite/funcs_2/r/memory_charset.result:
  Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result
mysql-test/suite/funcs_2/r/myisam_charset.result:
  Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result
BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39:
  Delete: mysql-test/suite/funcs_2/t/innodb_charset.test
BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd:
  Delete: mysql-test/suite/funcs_2/t/memory_charset.test
BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58:
  Delete: mysql-test/suite/funcs_2/t/myisam_charset.test
mysql-test/suite/funcs_2/t/innodb_charset.test:
  Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test
mysql-test/suite/funcs_2/t/memory_charset.test:
  Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test
mysql-test/suite/funcs_2/t/myisam_charset.test:
  Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test
BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d:
  Delete: mysql-test/suite/funcs_2/t/ndb_charset.test
BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433:
  Delete: mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/readme.txt:
  Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt
mysql-test/suite/funcs_2/t/ndb_charset.test:
  Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
  
  Restore the 5.1 contents into the 5.0-dependent file.

mysql-test/r/log_tables.result:
  Update results.
mysql-test/t/log_tables.test:
  Silence a race condition: TRUNCATE code issues mysql_frm_type without
  a metadata lock, and finds no table if hits the moment when
  ALTER is swapping two tables.

into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.1


mysql-test/r/mysqlbinlog.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  manual merge

restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.


mysql-test/r/mysqlbinlog.result:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - test result.
mysql-test/t/mysqlbinlog.test:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - test case.
sql/item_create.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - set thread_specific_used flag for the connection_id() function.
sql/item_func.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - always return thd->variables.pseudo_thread_id as a connection_id() 
  result, as it contains a proper value for both master and slave.
sql/log_event.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - set LOG_EVENT_THREAD_SPECIFIC_F event flag if thread_specific_used
  is set.
sql/sql_class.cc:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - thd->thread_specific_used introduced, which is set if thread specific 
  value(s) used in a statement.
sql/sql_class.h:
  Fix for bug #29928: INSERT ... VALUES(connection_id(), ...) incorrect 
  restores from mysqlbinlog out
    - thd->thread_specific_used introduced, which is set if thread specific 
  value(s) used in a statement.

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint

which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).


scripts/mysql_setpermission.sh:
  Option 6 tries to apply global privileges at the database
  level which does not work - remove it.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.

mysql-test/r/func_time.result:
  Update results (use fixed datetime values instead of NOW()).
mysql-test/t/func_time.test:
  Use fixed datetime values instead of NOW(): the test would have a sporadic
  failure when current day changed between two consequtive calls to
  NOW(). The test actually tests FROM_DAYS/TO_DAYS functions, 
  so use of NOW() is not necessary.

into  trift2.:/MySQL/M51/push-5.1

into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776


configure.in:
  Auto merged

into  sin.intern.azundris.com:/home/tnurnberg/10776/50-10776


configure.in:
  Auto merged

5.1 specific fixes so cluster will build on AIX (with IBM compiler)


config/ac-macros/ha_ndbcluster.m4:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
  
  build NDB binaries as static on AIX. because that actually
  *works*.
  
  when building dynamic, with the IBM compiler (xlC_r), and
  the build breaks on AIX due to missing symbols
  (__vec__delete2 et al.), try adding -lhC to the Makefile.
storage/ndb/src/mgmclient/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
  
  fix path
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
  
  __align is a keyword in xlC_r
storage/ndb/test/ndbapi/testIndexStat.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
  
  gptr is now uchar*
  
  template can't be static on xlC_r?
storage/ndb/test/ndbapi/test_event_merge.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
  
  gptr is now uchar*
storage/ndb/test/run-test/main.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
  
  gptr is now uchar*
storage/ndb/test/src/NDBT_Test.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
  
  gptr is now uchar*

into  sin.intern.azundris.com:/home/tnurnberg/10776/51-10776


include/mysql.h:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/benchronja.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexTT.cpp:
  Auto merged
storage/ndb/test/ndbapi/flexTimedAsynch.cpp:
  Auto merged
storage/ndb/test/ndbapi/initronja.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanFilter.cpp:
  Auto merged
storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  Auto merged
configure.in:
  manual merge
storage/ndb/src/common/util/File.cpp:
  manual merge
storage/ndb/src/mgmsrv/Makefile.am:
  manual merge

mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?


config/ac-macros/large_file.m4:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
  
  we no longer declare anything large-file on AIX.  the
  GNU C++ compiler declares _LARGE_FILE_API all of its
  own, and either way we're now pulling in <standards.h>
  when on AIX, which defines _LARGE_FILE_API (if not
  already defined).
configure.in:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (1)
  
  build NDB binaries as static on AIX. because that actually
  *works*.
  
  when building dynamic, with the IBM compiler (xlC_r), and
  the build breaks on AIX due to missing symbols
  (__vec__delete2 et al.), try adding -lhC to the Makefile.
include/mysql.h:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (2)
  
  we're now pulling in <standards.h> when on AIX, which
  defines _LARGE_FILE_API (if not already defined).
ndb/src/common/util/File.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (3)
  
  do not de-scope the standards, for they may be funky macros
ndb/src/mgmclient/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (4)
  
  make IBM C++ compiler happy on AIX
ndb/src/mgmsrv/Makefile.am:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (5)
  
  GNU compiler has no sense of humour about this
ndb/test/ndbapi/benchronja.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexAsynch.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexHammer.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexScan.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTT.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/flexTimedAsynch.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/initronja.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)
ndb/test/ndbapi/testOperations.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (7)
  
  IBM C compiler on AIX is not happy with the re-def.
ndb/test/ndbapi/testScanFilter.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (8)
  
  The IBM C++ compiler on AIX doesn't like initializing from pow().
  This works, but breaks a VAL (bool res_cal[TUPLE_NUM] ...) later on.
ndb/test/odbc/SQL99_test/SQL99_test.cpp:
  Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 (6)
  
  MAXTHREADS collides with a #define from <sys/thread.h> on AIX
  (IBM compiler).  Call it NDB_MAXTHREADS instead.  Also explicitly
  #undef it here lest someone use it by habit and get really funny
  results.  (K&R says we may #undef non-existent symbols.)

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51


mysql-test/r/federated.result:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Use local (manual merge)

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/50


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge

  
Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4 GB.
  
The test case for this bug is a part of the test suite for bug #5731.


sql/sql_select.cc:
  Use size_t instead of uint when calculating join buffer size, because uint can be overflown on 64-bit platforms and join_buffer_size > 4G.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge.
mysql-test/r/innodb_mysql.result:
  Manual merge.

sql/sql_base.cc:
  Fix an incorrect manual merge.