Commit e5d06603 authored by monty@narttu.mysql.fi's avatar monty@narttu.mysql.fi
Browse files

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

into  mysql.com:/home/my/mysql-5.0
parents 325b8835 9a590831

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1341,3 +1341,6 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

debian/control

debian/defs.mk

include/abi_check

libmysql/libmysql.c

+15 −0
Original line number Diff line number Diff line
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), 
}





/*

  Free all memory and resources used by the client library



  NOTES

    When calling this there should not be any other threads using

    the library.



    To make things simpler when used with windows dll's (which calls this

    function automaticly), it's safe to call this function multiple times.

*/





void STDCALL mysql_server_end()

{

  if (!mysql_client_init)

    return;



#ifdef EMBEDDED_LIBRARY

  end_embedded_server();

#endif

mysql-test/r/innodb_mysql.result

+8 −0
Original line number Diff line number Diff line
@@ -661,4 +661,12 @@ UPDATE t3 SET a = 'us' WHERE a = 'uk'; 
SELECT * FROM t3 WHERE a = 'uk';

a

DROP TABLE t1,t2,t3;

create table t1 (a int) engine=innodb;

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;

drop table t2;

ERROR 42S02: Unknown table 't2'

create table t2 (a int);

drop table t2;

End of 5.0 tests

mysql-test/t/innodb_mysql.test

+14 −0
Original line number Diff line number Diff line
@@ -636,4 +636,18 @@ SELECT * FROM t3 WHERE a = 'uk'; 


DROP TABLE t1,t2,t3;



#

# Test bug when trying to drop data file which no InnoDB directory entry

#



create table t1 (a int) engine=innodb;

copy_file $MYSQLTEST_VARDIR/master-data/test/t1.frm $MYSQLTEST_VARDIR/master-data/test/t2.frm;

--error 1146

select * from t2;

drop table t1;

--error 1051

drop table t2;

create table t2 (a int);

drop table t2;



--echo End of 5.0 tests

sql/ha_innodb.cc

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ convert_error_code_to_mysql( 


 	} else if (error == (int) DB_TABLE_NOT_FOUND) {



    		return(HA_ERR_KEY_NOT_FOUND);

    		return(HA_ERR_NO_SUCH_TABLE);



  	} else if (error == (int) DB_TOO_BIG_RECORD) {