mysql-test/extra/rpl_tests/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/t/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/r/rpl_EE_err.result:
Splitting tests case per Lars review
mysql-test/t/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/r/rpl_stm_EE_err2.result:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
Delete: mysql-test/t/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
Delete: mysql-test/r/rpl_row_EE_err.result
mysql-test/t/ndb_dd_basic.test:
Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
Changed test.t1 back to t1 per Jonas's review
mysql-test/t/ndb_dd_basic.test:
Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/extra/binlog_tests/ctype_cp932.test:
fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
fixed test result
mysql-test/t/ctype_ucs.test:
fixed test case
sql/sql_show.cc:
Compilation with disabled partitioning is fixed
client/mysqltest.c:
Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
Correct test result, "At line 1" should be printed
into mysql.com:/usr/local/mysql/mysql-5.1-new
storage/ndb/src/common/portlib/Makefile.am:
Auto merged
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
Auto merged
storage/ndb/config/common.mk.am:
Manual merge.
Checking that binlog is open before calling binlog_query().
mysql-test/r/rpl_row_basic_11bugs.result:
Result change caused by test change.
mysql-test/t/rpl_row_basic_11bugs.test:
Ignoring format event since it contain the version number.
sql/sql_insert.cc:
Debriding code.
Checking that binlog is open before calling binlog_query().
client/mysqltest.c:
Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
Remove test results for disabled test
mysql-test/t/mysqltest.test:
Disable test for "let assigns each column of query to own var"
There is a specific rpl_ignore_grant test case for GRANT.
mysql-test/r/rpl_ignore_revoke.result:
New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
include/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/sql_acl.cc:
Auto merged
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqlslap.result:
Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
Real output produced, remove "echo"
mysql-test/r/archive.result:
New result file.
mysql-test/t/archive.test:
Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
Changed comparision function to compare memory locations.
Modified function for storing the auto_increment.
Removed useless DBUG_PRINT
into linux.site:/home/reggie/work/mysql-5.1-rbr_cleanups
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_class.cc:
accepted Mat's changes to the template defs
