scripts/Makefile.am:
  Auto merged

client/mysqltest.c:
  Fix spelling error
mysql-test/t/information_schema.test:
  Eol junk detected, added #
mysql-test/t/rpl_slave_status.test:
  Missing ;
mysql-test/t/sp.test:
  Eol junk detected, added #
mysql-test/t/view.test:
  Eol junk detected, added #

scripts/Makefile.am:
  Add "MYSQL_BASE_VERSION" to the list of substituted variables,
  for later (possible) use in "mysql_install_db" and "mysqld_safe".

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


client/mysqltest.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/lib/mtr_timer.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/create_select_tmp.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/handler.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/kill.test:
  Auto merged
mysql-test/t/ndb_autodiscover2.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
client/mysqltest.c:
  Merge with --parsing-disabled
mysql-test/t/mysqltest.test:
  Manual merge

client/mysqltest.c:
  Fixes after merge
mysql-test/r/type_newdecimal.result:
  Update results after correction of testcase
mysql-test/t/flush_read_lock_kill.test:
  Found extra delimiter
mysql-test/t/kill.test:
  Found extra delimiter
mysql-test/t/rpl_loaddata.test:
  Found extra delimiter
mysql-test/t/rpl_sp.test:
  Found extra delimiter
mysql-test/t/strict.test:
  Convert "!$1292" to "--error 1292"
mysql-test/t/type_newdecimal.test:
  Missing ;

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

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


client/mysqltest.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Make sure mtr_kill_processes() is called with an array ref
  Corrected error string for STDERR redirect


mysql-test/lib/mtr_process.pl:
  Make sure mtr_kill_processes() is called with an array ref

into  mysql.com:/export/space/pekka/ndb/version/my50

mysql-test/r/ndb_index_ordered.result:
  fix ha_ndb crash on ordered index on nullable varchar
mysql-test/t/ndb_index_ordered.test:
  fix ha_ndb crash on ordered index on nullable varchar
sql/ha_ndbcluster.cc:
  fix ha_ndb crash on ordered index on nullable varchar

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

 - Temporary fix, disable x86 assembler.


BUILD/compile-pentium-icc:
  Cleanup build script for icc
extra/yassl/taocrypt/include/misc.hpp:
  Disable x86 assembler  when compiling with icc
BUILD/compile-pentium-icc-yassl:
  New BitKeeper file ``BUILD/compile-pentium-icc-yassl''

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/rpl_flush_log_loop.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysql-test/t/rpl_EE_error.test:
  Auto merged
mysql-test/t/rpl_deadlock.test:
  Auto merged
mysql-test/t/rpl_drop_temp.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
client/mysqltest.c:
  Manual merge
mysql-test/r/mysqltest.result:
  Manual merge
mysql-test/t/flush.test:
  Manual merge
mysql-test/t/mysqltest.test:
  Manual merge
mysql-test/t/rpl_change_master.test:
  Manual merge
mysql-test/t/rpl_until.test:
  Manual merge

 - Make sure that mysqltest always uses ssl when connecting to the server.
 - Pass a i32-bit int variable as argument to FIONREAD ioctl.


client/mysqltest.c:
  Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings.
  Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings.
extra/yassl/src/socket_wrapper.cpp:
  64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value.
  Using "int" unless _WIN32_ is defined.
sql/sql_parse.cc:
  Update error message when sslaccepts fails. Must have been a copy and paste error.
vio/viossl.c:
  Minor fixes
  Add timeout to DBUG_PRINT
  use function vio_ssl_fd to get sd from vio
  Remove extra whitespace
vio/viosslfactories.c:
  Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.

client/mysqltest.c:
  Fix warnings
  Remove unused vars

client/mysqltest.c:
  Fix function var_copy to make it possible to assign one variable to another. 
  ex: let $1=$2
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Add test cases for variable to variable assignment

 - Move clearing of expected errors


client/mysqltest.c:
  Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache.
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Add test for bug#12471

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


sql/examples/ha_archive.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

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


sql/examples/ha_archive.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.0-clean


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/mi_extra.c:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysys/my_access.c:
  Auto merged
BitKeeper/deleted/.del-extra.c~706f29d72beb2565:
  Auto merged
sql/examples/ha_tina.cc:
  Resolve conflict

into  mysql.com:/home/jimw/my/mysql-4.1-clean

into  mysql.com:/home/jimw/my/mysql-4.1-clean

on Windows. (Bug #12325)


mysql-test/r/lowercase_table.result:
  Update results
mysql-test/t/lowercase_table.test:
  Move test to new windows.test, since it is Windows-specific
mysys/my_access.c:
  Check that we've matched the whole forbidden name.
mysql-test/include/windows.inc:
  New BitKeeper file ``mysql-test/include/windows.inc''
mysql-test/r/windows.result:
  New BitKeeper file ``mysql-test/r/windows.result''
mysql-test/t/windows.test:
  New BitKeeper file ``mysql-test/t/windows.test''

into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Resolve conflicts
sql/ha_innodb.cc:
  Resolve conflicts
sql/item_strfunc.cc:
  Resolve conflicts

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

into moonbone.local:/work/12861-bug-4.1-mysql

  After merge fix for bug #12537


sql/item.cc:
  After merge fix for bug #12537
sql/sql_select.cc:
  After merge fix for bug #12537
mysql-test/r/create.result:
  After merge fix for bug #12537
mysql-test/t/create.test:
  After merge fix for bug #12537

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

on Solaris even though it is available, and declare it ourselves in
that case. (Bug #7156)


configure.in:
  Add test for madvise() being declared when C++ compiler is used.
include/my_global.h:
  Handle madvise() being available but not declared in C++
isam/extra.c:
  Fix typo in define test
myisam/mi_extra.c:
  Fix typo in define test
sql/examples/ha_tina.cc:
  Test that we have madvise() before trying to call it.

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

Use !<err_no> instead


client/mysqltest.c:
  Remove syntax !$<err_no> to set an expected error code
mysql-test/r/mysqltest.result:
  Update test result
mysql-test/t/mysqltest.test:
  Uncomment tests for the deprecated syntax

 - Add stricter checking of syntax in mysqltest


client/mysqltest.c:
  Stricter checking of syntax in mysqltest.
mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/create.test:
  Remove extra ;
mysql-test/t/create_select_tmp.test:
  Remove extra ;
mysql-test/t/drop.test:
  Remove extra ;
mysql-test/t/flush.test:
  Remove extra ;
mysql-test/t/handler.test:
  Remove extra ;
mysql-test/t/innodb.test:
  Remove extra ;
mysql-test/t/mysqltest.test:
  Add more tests for replace, replace_columns, comments with commands and sync_with_master
mysql-test/t/rpl000001.test:
  Remove extra ;
mysql-test/t/rpl_EE_error.test:
  Remove extra ;
mysql-test/t/rpl_drop.test:
  Remove extra ;
mysql-test/t/rpl_error_ignored_table.test:
  Remove extra ;
mysql-test/t/rpl_loaddata.test:
  Remove extra ;