diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 10:21:14 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-12 10:21:14 +0200 |
| commit | 3039a7c2130e3608b9adf60792fd936ef2e20b81 (patch) | |
| tree | d1aab05d4cfb065956acd153684896275e8f569f | |
| parent | 3cd1861a81f5c858014c8bbb67440daaffb05cce (diff) | |
| download | mariadb-git-3039a7c2130e3608b9adf60792fd936ef2e20b81.tar.gz | |
fix upgrade.test - update from 5.6
| -rw-r--r-- | mysql-test/r/upgrade.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/upgrade.test | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mysql-test/r/upgrade.result b/mysql-test/r/upgrade.result index ec63cc0d98c..f2c8886c915 100644 --- a/mysql-test/r/upgrade.result +++ b/mysql-test/r/upgrade.result @@ -48,10 +48,14 @@ insert into `txu#p#p1` values (1); select * from `txu@0023p@0023p1`; ERROR 42S02: Table 'test.txu@0023p@0023p1' doesn't exist create table `txu@0023p@0023p1` (s1 int); -ERROR 42S01: Table '#mysql50#txu@0023p@0023p1' already exists +insert into `txu@0023p@0023p1` values (2); +select * from `txu@0023p@0023p1`; +s1 +2 select * from `txu#p#p1`; s1 1 +drop table `txu@0023p@0023p1`; drop table `txu#p#p1`; # # Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1 diff --git a/mysql-test/t/upgrade.test b/mysql-test/t/upgrade.test index a8c875ef764..400ce07b7fd 100644 --- a/mysql-test/t/upgrade.test +++ b/mysql-test/t/upgrade.test @@ -41,9 +41,11 @@ create table `txu#p#p1` (s1 int); insert into `txu#p#p1` values (1); --error 1146 select * from `txu@0023p@0023p1`; ---error ER_TABLE_EXISTS_ERROR create table `txu@0023p@0023p1` (s1 int); +insert into `txu@0023p@0023p1` values (2); +select * from `txu@0023p@0023p1`; select * from `txu#p#p1`; +drop table `txu@0023p@0023p1`; drop table `txu#p#p1`; --echo # |