diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | 11fe627e3f0ecf45abdb49f3b92cca88b12465e7 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /mysql-test/std_data | |
| parent | c805d9bc0b127e1126eeb7814d5ff5d66a539b47 (diff) | |
| parent | ba192d38bda55ac8b2cf3ccc5a6338e053ccddb1 (diff) | |
| download | mariadb-git-11fe627e3f0ecf45abdb49f3b92cca88b12465e7.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46
Still two test failures to be solved: main.myisam and main.subselect.
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/binlog_savepoint.000001 | bin | 0 -> 1014 bytes | |||
| -rw-r--r-- | mysql-test/std_data/bug46565.ARZ | bin | 0 -> 8670 bytes | |||
| -rw-r--r-- | mysql-test/std_data/bug46565.frm | bin | 0 -> 8554 bytes | |||
| -rw-r--r-- | mysql-test/std_data/bug48265.frm | bin | 0 -> 8554 bytes | |||
| -rw-r--r-- | mysql-test/std_data/bug48449.frm | 12 | ||||
| -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 |
8 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/std_data/binlog_savepoint.000001 b/mysql-test/std_data/binlog_savepoint.000001 Binary files differnew file mode 100644 index 00000000000..5109042a184 --- /dev/null +++ b/mysql-test/std_data/binlog_savepoint.000001 diff --git a/mysql-test/std_data/bug46565.ARZ b/mysql-test/std_data/bug46565.ARZ Binary files differnew file mode 100644 index 00000000000..f26b31218a1 --- /dev/null +++ b/mysql-test/std_data/bug46565.ARZ diff --git a/mysql-test/std_data/bug46565.frm b/mysql-test/std_data/bug46565.frm Binary files differnew file mode 100644 index 00000000000..5c0180bdc1e --- /dev/null +++ b/mysql-test/std_data/bug46565.frm diff --git a/mysql-test/std_data/bug48265.frm b/mysql-test/std_data/bug48265.frm Binary files differnew file mode 100644 index 00000000000..0a731964996 --- /dev/null +++ b/mysql-test/std_data/bug48265.frm diff --git a/mysql-test/std_data/bug48449.frm b/mysql-test/std_data/bug48449.frm new file mode 100644 index 00000000000..b6a717427aa --- /dev/null +++ b/mysql-test/std_data/bug48449.frm @@ -0,0 +1,12 @@ +TYPE=VIEW +query=select `test`.`t2`.`a` AS `a` from `test`.`t2` +md5=5e6eaf216e7b016fcedfd4e1113517af +updatable=1 +algorithm=0 +definer_user=root +definer_host=localhost +suid=2 +with_check_option=0 +timestamp=2010-01-01 15:00:00 +create-version=1 +source=select * from t2 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 |