diff options
| author | gluh@gluh.mysql.r18.ru <> | 2005-02-14 18:23:10 +0300 |
|---|---|---|
| committer | gluh@gluh.mysql.r18.ru <> | 2005-02-14 18:23:10 +0300 |
| commit | 29510ce02932416c0833338aecd2a2b42dc541a3 (patch) | |
| tree | 3e419fd5e6260a29af21b3bcd53e7fc71cbd9719 | |
| parent | 71174327df7a9361672fe23cf2f5559e31098599 (diff) | |
| download | mariadb-git-29510ce02932416c0833338aecd2a2b42dc541a3.tar.gz | |
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
Can't repeat information_schema test failure
Fix for lowercase_table3 only
| -rw-r--r-- | mysql-test/r/lowercase_table3.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/lowercase_table3.test | 2 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/lowercase_table3.result b/mysql-test/r/lowercase_table3.result index 8182d07c26b..995a2c0d08a 100644 --- a/mysql-test/r/lowercase_table3.result +++ b/mysql-test/r/lowercase_table3.result @@ -6,5 +6,5 @@ drop table t1; flush tables; CREATE TABLE t1 (a int) ENGINE=INNODB; SELECT * from T1; -ERROR HY000: Can't open file: 'T1.ibd' (errno: 1) +ERROR 42S02: Table 'test.T1' doesn't exist drop table t1; diff --git a/mysql-test/t/lowercase_table3.test b/mysql-test/t/lowercase_table3.test index a394cde7237..9841059a26b 100644 --- a/mysql-test/t/lowercase_table3.test +++ b/mysql-test/t/lowercase_table3.test @@ -32,6 +32,6 @@ flush tables; # CREATE TABLE t1 (a int) ENGINE=INNODB; ---error 1016 +--error 1146 SELECT * from T1; drop table t1; diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 69e509f1656..f4055115918 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1861,7 +1861,7 @@ ha_innobase::open( my_free((char*) upd_buff, MYF(0)); my_errno = ENOENT; - DBUG_RETURN(1); + DBUG_RETURN(HA_ERR_NO_SUCH_TABLE); } if (ib_table->ibd_file_missing && !thd->tablespace_op) { @@ -1878,7 +1878,7 @@ ha_innobase::open( my_free((char*) upd_buff, MYF(0)); my_errno = ENOENT; - DBUG_RETURN(1); + DBUG_RETURN(HA_ERR_NO_SUCH_TABLE); } innobase_prebuilt = row_create_prebuilt(ib_table); |