summaryrefslogtreecommitdiff
path: root/mysql-test/r/upgrade.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-04-09 15:35:07 +0200
committerSergei Golubchik <sergii@pisem.net>2013-04-09 15:35:07 +0200
commit87a9d60ec625c8f1e8563de648105b36add9e940 (patch)
treec652d83dd0ae47c0f2910183ff21508e9668e34a /mysql-test/r/upgrade.result
parentb9f42f4b7a08d4f6d46ecaba3595b38af0a6525d (diff)
downloadmariadb-git-87a9d60ec625c8f1e8563de648105b36add9e940.tar.gz
revert
" revision-id: sanja@askmonty.org-20110511110948-4kdevwzomvk56y1w committer: sanja@askmonty.org branch nick: work-maria-5.1-CREATE-merge timestamp: Wed 2011-05-11 14:09:48 +0300 Bugfix: New table creation/renaming block added if old encoded table present " the old behavior was less inconsistent than the new one. In the new one the error message was sometimes different (under LOCK TABLES e.g.), and there were race conditions (if this CREATE happened when a concurrent ALTER has renamed the old table away but haven't put the new table in place) The old one was like "(when using old table names) for DML #mysql50# prefix is optional, for DDL it's required".
Diffstat (limited to 'mysql-test/r/upgrade.result')
-rw-r--r--mysql-test/r/upgrade.result8
1 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/r/upgrade.result b/mysql-test/r/upgrade.result
index 4f52fd1e246..d565bb2dbd6 100644
--- a/mysql-test/r/upgrade.result
+++ b/mysql-test/r/upgrade.result
@@ -41,18 +41,20 @@ t-1
t1
drop database `mysqltest1`;
drop database `mysqltest-1`;
-drop table if exists `txu@0023p@0023p1`;
-drop table if exists `txu#p#p1`;
create table `txu#p#p1` (s1 int);
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
+show tables;
+Tables_in_test
+txu#p#p1
+txu@0023p@0023p1
select * from `txu#p#p1`;
s1
1
drop table `txu#p#p1`;
+drop table `txu@0023p@0023p1`;
#
# Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1
#