mysql-test/t/rpl_ndb_dd_advance.test:
New test case to test advance use of Cluster Disk Data and replication
mysql-test/include/ndb_restore_slave_eoption.inc:
New support file to help test advance use of Cluster Disk Data and replication
mysql-test/r/rpl_ndb_dd_advance.result:
New result file for test of advance use of Cluster Disk Data and replication
-added setting up of binlogging after receiving rename table
+cleanup
mysql-test/r/ndb_binlog_ddl_multi.result:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/t/ndb_binlog_ddl_multi.test:
Bug #17838 binlog not setup on seconday master after rename
mysql-test/include/show_binlog_events.inc:
New BitKeeper file ``mysql-test/include/show_binlog_events.inc''
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
mysql-test/r/rpl_ndb_blob.result:
result change
mysql-test/t/disabled.def:
Disabling problematic tests.
mysql-test/t/rpl_ndb_blob.test:
Don't show binlog since it's not deterministic.
sql/log_event.cc:
Print a warning instead of error on failure to open non-existing table.
This is a temporary patch to prevent a bug in NDB from stopping the slave.
Make partitioned tables report the row format of the underlying
tables (when they are all the same).
mysql-test/r/partition.result:
Add new results
mysql-test/t/partition.test:
Add regression test
sql/ha_partition.cc:
Add get_row_type(), which peeks at the underlying tables and returns
the row_type if they are consistent.
sql/ha_partition.h:
Add get_row_type() method
Temporary tables are no longer allowed to be partitioned.
mysql-test/r/partition.result:
Add result
mysql-test/t/partition.test:
Add new regression test
sql/share/errmsg.txt:
Add new error message
sql/sql_table.cc:
Don't allow creating temporary table with partitions
fixed test case from previous commit
mysql-test/r/ndb_lock.result:
fixed result file form previous commit
sql/ha_ndbcluster.cc:
cleanup of ndb invalidate dictionary cache
sql/ha_ndbcluster.h:
cleanup of ndb invalidate dictionary cache
into mysql.com:/home/bk/w3023-mysql-5.1-new
mysql-test/t/sp.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/table.h:
Auto merged
Minor changes to make it work with NDB.
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Not updated result file
mysql-test/r/ndb_binlog_ignore_db.result:
Result change
mysql-test/r/rpl_ndb_blob.result:
Result change
mysql-test/r/rpl_ndb_charset.result:
Result change
mysql-test/r/rpl_ndb_dd_basic.result:
Result change
sql/ha_ndbcluster_binlog.cc:
Only calling injector::use_table() if there are data events in epoch.
into neptunus.(none):/home/msvensson/mysql/bug17137/my51-bug17137
sql/sql_delete.cc:
Code has changed to use close_temporary_table which will decrease counter for open slave temp tables so the fix from previous versions can be removed.
- Decrease "slave_open_temp_tables" during reopen of truncated table.
- Add test "rpl_trunc_temp"
sql/sql_delete.cc:
Decrease "slave_open_temp_tables" after temporary table has been closed, it will be
increased again when the temp table is reopened after it's been truncated.
mysql-test/r/rpl_trunc_temp.result:
New BitKeeper file ``mysql-test/r/rpl_trunc_temp.result''
mysql-test/t/rpl_trunc_temp.test:
New BitKeeper file ``mysql-test/t/rpl_trunc_temp.test''
Removed error on seeing table map event when slave is in SBR mode
and switching temporarily to RBR mode to replicate the rows.
sql/log_event.cc:
Settig binlog format to "row" on seeing a table map event.
Resetting binlog format on error and seeing STMT_END_F.
sql/sql_class.h:
Adding method to unconditially set binlog format to "row".
mysql-test/r/rpl_rbr_to_sbr.result:
New BitKeeper file ``mysql-test/r/rpl_rbr_to_sbr.result''
mysql-test/t/rpl_rbr_to_sbr.test:
New BitKeeper file ``mysql-test/t/rpl_rbr_to_sbr.test''
only its own tables to prevent getting tables from others.
mysql-test/r/rpl_trigger.result:
Update the result file.
mysql-test/t/rpl_trigger.test:
Fix the test to query only its own tables to prevent getting tables
from other tests.
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
client/mysqltest.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
Now the DROP privilege is also required on a table in order to be able
to drop a partition from the table using ALTER TABLE.
sql/sql_parse.cc:
Require DROP privilege in addition to ALTER for dropping a partition
mysql-test/r/partition_grant.result:
New BitKeeper file ``mysql-test/r/partition_grant.result''
mysql-test/t/partition_grant.test:
New BitKeeper file ``mysql-test/t/partition_grant.test''
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/mysql_client_test.c:
Auto merged
Transaction aborted on slave should be retries. The OPTION_BEGIN
bit was cleared prematurely. Removed dependence of code on value
of OPTION_BEGIN bit when executing retries.
mysql-test/r/rpl_ndb_basic.result:
Result change.
mysql-test/t/disabled.def:
Enabling test.
mysql-test/t/rpl_ndb_basic.test:
Changing test to allow checking that slave did not stop.
sql/slave.cc:
Rolling back transaction before retrying it.
Only resetting transaction retries counter on a successful execution
or a non-transitional error.
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
mysql-test/r/sp.result:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/skip_grants.result:
Merge 5.0 and 5.0-runtime.
mysql-test/t/skip_grants.test:
Merge 5.0 and 5.0-runtime.
NULL value handling
mysql-test/r/ndb_partition_error.result:
Fix for bug#15447 Partitions: NULL is treated as zero
test case
mysql-test/r/partition.result:
Fix for bug#15447 Partitions: NULL is treated as zero
test case
mysql-test/t/ndb_partition_error.test:
Fix for bug#15447 Partitions: NULL is treated as zero
test case
mysql-test/t/partition.test:
Fix for bug#15447 Partitions: NULL is treated as zero
test case
sql/partition_element.h:
Fix for bug#15447 Partitions: NULL is treated as zero
added null value flag to partition_element object
sql/partition_info.h:
Fix for bug#15447 Partitions: NULL is treated as zero
added null value flag to partition_info object
added has_null partition id variable
upgrade.result, upgrade.test:
Adding test case.
table.cc:
Don't try to open a table with old-formatted name,
if the table name contains "@" character.
This is to avoid mixing two different names to each other.
Thanks Monty for suggesting this fix.
sql/table.cc:
Bug#17142 Crash if create with encoded name
Don't try to open a table with old-formatted name,
if the table name contains "@" character.
This is to avoid mixing two different names to each other.
mysql-test/t/upgrade.test:
Adding test case.
mysql-test/r/upgrade.result:
Adding test case.
into mysql.com:/home/bk/w3023-mysql-5.1-new
configure.in:
Auto merged
mysql-test/r/rpl_row_create_table.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.h:
Auto merged
BitKeeper/etc/ignore:
auto-union
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
- Use tmp sh file both in system and popen
client/mysqltest.c:
Introduce common functions to handle unix emulation on windows using a temporary sh file.
Use it both in my_popen and my_system.
mysql-test/r/mysqltest.result:
Update test result
mysql-test/t/mysqltest.test:
Fix "windows paths" in three places that doesn't automatically get fixed
Uset the output file mysqltest.sql instead of con.sql as con is not an allowed filename on Windows
Use system for util functions
into mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
libmysql/libmysql.c:
Auto merged
mysql-test/r/binary.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
support-files/mysql.spec.sh:
Manual merge. (use local)
Recommit with post-review fixes.
mysql-test/r/log_tables.result:
update result
mysql-test/t/log_tables.test:
add a test
sql/log.cc:
Fix NULL handling in log tables
storage/csv/ha_tina.cc:
Explicitly check fo NULLs, when writing a row.
We should not hope, that the null field was
cleaned up.
Though usually we do call Field::reset() or
restore_row(), before calling Field::set_null(),
this depency is neither documented nor enforced
by other means.
mysql-test/t/log_tables-master.opt:
New BitKeeper file ``mysql-test/t/log_tables-master.opt''
