summaryrefslogtreecommitdiff
path: root/mysql-test/std_data
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-10-07 15:42:26 +0300
committermonty@narttu.mysql.fi <>2003-10-07 15:42:26 +0300
commit6056cfadfcb07cda12f6dc01ec9c1ab07067ac69 (patch)
treed89c080ef636608e316f1166b1628cd1d902deec /mysql-test/std_data
parent0091fa2e3266da6a17b0615a4696c25a4d36d664 (diff)
parent446d40e880c0e6ab6ac56b0082d4883ef5c7d467 (diff)
downloadmariadb-git-6056cfadfcb07cda12f6dc01ec9c1ab07067ac69.tar.gz
Merge with 4.0.16
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r--mysql-test/std_data/rpl_loaddata2.dat2
-rw-r--r--mysql-test/std_data/trunc_binlog.001bin0 -> 119 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/std_data/rpl_loaddata2.dat b/mysql-test/std_data/rpl_loaddata2.dat
index b883d9dcd58..04d84f1f45e 100644
--- a/mysql-test/std_data/rpl_loaddata2.dat
+++ b/mysql-test/std_data/rpl_loaddata2.dat
@@ -4,5 +4,5 @@
##
>2003-03-22,2161,%c%,%asdf%
##
->2003-04-22,2416,%a%,%bbbbb%
+>2003-03-22,2416,%a%,%bbbbb%
##
diff --git a/mysql-test/std_data/trunc_binlog.001 b/mysql-test/std_data/trunc_binlog.001
new file mode 100644
index 00000000000..2c2b4ec6ce4
--- /dev/null
+++ b/mysql-test/std_data/trunc_binlog.001
Binary files differ