4 Commits

Author	SHA1	Message	Date
vasil	713f8b7093	branches/5.1: ... Merge changes from MySQL AB.	2008-03-11 16:50:50 +00:00
marko	80f54592c6	Merge changes from MySQL AB, as of the following changeset: ... ChangeSet@1.2567, 2007-07-27 14:44:31+05:00, svoj@june.mysql.com +3 -0 Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines into mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines MERGE: 1.1810.2871.44 One test case in innodb.test fails because of auto-increment changes in r1562:1653: $diff innodb.result innodb.reject 504c504 < 3 test2 this will work --- > 4 test2 this will work	2007-07-31 05:56:17 +00:00
marko	bdf65e705e	Merge changes from MySQL AB, and remove two compilation warnings. ... ha_innodb.cc: innodb_mutex_show_status(): Add (ulong) casts to ulonglong expressions being passed to fprintf %lu. The warnings were apparently introduced by MySQL AB developers. mysql_declare_plugin(innobase): Add PLUGIN_LICENSE_GPL. have_innodb.inc: Merge changes from MySQL AB.	2006-10-09 09:08:50 +00:00
osku	c307820962	Import 5.0 code.	2005-10-27 07:29:40 +00:00