1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into hundin.mysql.fi:/home/heikki/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
This commit is contained in:
unknown 2005-02-14 17:23:11 +02:00
commit 28bb6893e9
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/lowercase_table3.result
View File

@ -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;

2
mysql-test/t/lowercase_table3.test
View File

@ -32,6 +32,6 @@ flush tables;
#
CREATE TABLE t1 (a int) ENGINE=INNODB;
--error 1016
--error 1146
SELECT * from T1;
drop table t1;

4
sql/ha_innodb.cc
View File

@ -1866,7 +1866,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) {
@ -1883,7 +1883,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);