diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-07 19:40:59 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-03-07 19:40:59 +0300 |
| commit | d2452095a5526d219056ba623960bf3a39c3f566 (patch) | |
| tree | 395144ff597d9d1ea027cb0f57f50c5a6e6ab90c /mysql-test/std_data | |
| parent | 0c01d8d86c681d57373bf4dd41d555a5f643cec8 (diff) | |
| parent | 897863813e458d2b6acdaa4dee8619a7e11a8968 (diff) | |
| download | mariadb-git-d2452095a5526d219056ba623960bf3a39c3f566.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/having.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in storage/federated/ha_federated.cc
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/bug49823.CSM | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | mysql-test/std_data/bug49823.CSV | 1 | ||||
| -rw-r--r-- | mysql-test/std_data/bug49823.frm | bin | 0 -> 8776 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/std_data/bug49823.CSM b/mysql-test/std_data/bug49823.CSM Binary files differnew file mode 100644 index 00000000000..ee345049d99 --- /dev/null +++ b/mysql-test/std_data/bug49823.CSM diff --git a/mysql-test/std_data/bug49823.CSV b/mysql-test/std_data/bug49823.CSV new file mode 100644 index 00000000000..ffc319e2446 --- /dev/null +++ b/mysql-test/std_data/bug49823.CSV @@ -0,0 +1 @@ +"2010-02-26 13:32:26","root[root] @ localhost []",2,1,"Query","SELECT 1" diff --git a/mysql-test/std_data/bug49823.frm b/mysql-test/std_data/bug49823.frm Binary files differnew file mode 100644 index 00000000000..527807da1c9 --- /dev/null +++ b/mysql-test/std_data/bug49823.frm |