diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2008-03-31 11:57:18 +0300 |
commit | f07915534b2dc82693732ee86557f92cef8de438 (patch) | |
tree | 4420a1a039bb96e9b7dc7d13253c4481680ab92d /mysql-test/std_data | |
parent | 3d3c7fbe35e7939a92cf52afe90093d4083429c1 (diff) | |
parent | 3afa15b53cd928ae6579ae65be82307a7b8d1de3 (diff) | |
download | mariadb-git-f07915534b2dc82693732ee86557f92cef8de438.tar.gz |
Merge bk-internal:/home/bk/mysql-5.1
into magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/share/errmsg.txt:
merged 5.1-main to 5.1-bugteam
Diffstat (limited to 'mysql-test/std_data')
-rw-r--r-- | mysql-test/std_data/bug35469.dat | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug35469.dat b/mysql-test/std_data/bug35469.dat new file mode 100644 index 00000000000..afcd9e9cc95 --- /dev/null +++ b/mysql-test/std_data/bug35469.dat @@ -0,0 +1,3 @@ +"1", "string1" +"2", "string2" +"3", "string3" |