Commit 28bb6893 authored by unknown's avatar unknown
Browse files

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

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


sql/ha_innodb.cc:
  Auto merged
parents c1085da6 b6a09ac0

mysql-test/r/lowercase_table3.result

+1 −1
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/lowercase_table3.test

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ flush tables; 
#



CREATE TABLE t1 (a int) ENGINE=INNODB;

--error 1016

--error 1146

SELECT * from T1;

drop table t1;

sql/ha_innodb.cc

+2 −2
Original line number Diff line number Diff line
@@ -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);