4 commits

Author	SHA1	Message	Date
unknown	f320b01a80	Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work	2006-09-12 16:43:57 +02:00
unknown	bba3a1be5d	Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 ... into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint sql/share/errmsg.txt: Auto merged storage/innobase/Makefile.am: Auto merged storage/innobase/handler/ha_innodb.cc: SCCS merged	2006-09-12 14:49:41 +02:00
unknown	0c7b78bbed	Fix for a compile problem in Windows. ... sql/CMakeLists.txt: Compile problem for Windoows storage/innobase/handler/ha_innodb.cc: Removed some dead code (Marko approved)	2006-09-07 12:34:12 -07:00
unknown	b098f25d87	Moves Innodb handler to the Innodb storage directory. ... storage/innobase/handler/ha_innodb.h: Rename: sql/ha_innodb.h -> storage/innobase/handler/ha_innodb.h libmysqld/Makefile.am: Removed Innodb specific mention sql/Makefile.am: Updated to remove innodb storage/innobase/CMakeLists.txt: Added include directory storage/innobase/Makefile.am: Updated to add in handler storage/innobase/handler/ha_innodb.cc: Adjusted include files, also disabled replication code which was not being used. storage/innobase/plug.in: Added additional Makefile storage/innobase/handler/Makefile.am: New BitKeeper file ``storage/innobase/handler/Makefile.am''	2006-09-07 08:23:58 -07:00