--- mysql-test/r/innodb_bug46000.result.orig 2009-10-07 03:21:43.000000000 +0900 +++ mysql-test/r/innodb_bug46000.result 2009-10-28 14:08:55.000000000 +0900 @@ -8,10 +8,10 @@ Error 1005 Can't create table 'test.bug46000' (errno: -1) create table bug46000(id int) engine=innodb; create index GEN_CLUST_INDEX on bug46000(id); -ERROR HY000: Can't create table '#sql-temporary' (errno: -1) +ERROR HY000: Got error 1005 from storage engine show errors; Level Code Message Error 1005 Cannot Create Index with name 'GEN_CLUST_INDEX'. The name is reserved for the system default primary index. -Error 1005 Can't create table '#sql-temporary' (errno: -1) +Error 1030 Got error 1005 from storage engine create index idx on bug46000(id); drop table bug46000; --- mysql-test/t/innodb_bug46000.test.orig 2009-10-07 03:21:12.000000000 +0900 +++ mysql-test/t/innodb_bug46000.test 2009-10-28 14:08:37.000000000 +0900 @@ -20,7 +20,7 @@ # This 'create index' operation should fail. --replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/ ---error ER_CANT_CREATE_TABLE +--error ER_GET_ERRNO create index GEN_CLUST_INDEX on bug46000(id); --replace_regex /'[^']*test.#sql-[0-9a-f_]*'/'#sql-temporary'/