diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:01:58 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-10-08 12:01:58 +0300 |
| commit | 1ead85e6783e303c2d024aebe4c5a04e0aa6560f (patch) | |
| tree | 5f3cf2f56cc441edc81b2cf5fc056128ab764b41 /mysql-test/std_data | |
| parent | 118d532134a1700bdb7ba29ce41712994f023692 (diff) | |
| download | mariadb-git-1ead85e6783e303c2d024aebe4c5a04e0aa6560f.tar.gz | |
Fixes after merge
mysql-test/std_data/trunc_binlog.000001:
Rename: mysql-test/std_data/trunc_binlog.001 -> mysql-test/std_data/trunc_binlog.000001
client/mysqltest.c:
Fixed merge problem
mysql-test/mysql-test-run.sh:
Fixed merge problem
mysql-test/r/distinct.result:
Fix after merge
mysql-test/r/drop_temp_table.result:
Fix after merge
mysql-test/r/join_outer.result:
Fix after merge
mysql-test/r/mysqldump.result:
Fix after merge
mysql-test/r/null_key.result:
Fix after merge
mysql-test/r/order_by.result:
Fix after merge
mysql-test/r/rpl_alter.result:
Fix after merge
mysql-test/r/rpl_loaddata.result:
Fix after merge
mysql-test/r/rpl_loaddata_rule_m.result:
Fix after merge
mysql-test/r/rpl_trunc_binlog.result:
Fix after merge
mysql-test/r/select_safe.result:
Fix after merge
mysql-test/t/insert.test:
Fix after merge
mysql-test/t/mysqlbinlog.test:
Fix after merge
mysql-test/t/rpl000009.test:
Fix after merge
mysql-test/t/rpl_alter.test:
Fix after merge
mysql-test/t/rpl_loaddata_rule_m.test:
Fix after merge
mysql-test/t/rpl_trunc_binlog.test:
Fix after merge
sql-common/client.c:
Fix after merge
sql/item_subselect.cc:
Fix after merge
sql/repl_failsafe.cc:
Fix after merge
sql/slave.cc:
Fix after merge
sql/sql_insert.cc:
Fix after merge
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/trunc_binlog.000001 (renamed from mysql-test/std_data/trunc_binlog.001) | bin | 119 -> 119 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/mysql-test/std_data/trunc_binlog.001 b/mysql-test/std_data/trunc_binlog.000001 Binary files differindex 2c2b4ec6ce4..2c2b4ec6ce4 100644 --- a/mysql-test/std_data/trunc_binlog.001 +++ b/mysql-test/std_data/trunc_binlog.000001 |