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
queues. Supports table and record lock queues via the same interface.
There is only "get previous" method because currently there is no need
for "get next" - it would be unused. Feel free to add one if needed.
Approved by: Heikki
* lock0lock.c: remove lock_get_type() and include include/lock0priv.ic
* lock0priv.h: include lock0priv.ic and add lock_get_type() prototype
* Makefile.am: add lock0priv.ic to noinst_HEADERS
* lock0priv.ic: introduce this new file containing the body of
lock_get_type()
This move is necessary in order to use lock_get_type() from other lock/
source files (it's going to be used in lock/lock0iter.c).
Approved by: Heikki
and adapt some things.
Note that ha_innodb.cc depends on mysql_tmpfile() being declared in
<mysql/plugin.h>. Until the function is declared there, you can
uncomment the buggy definition of mysql_tmpfile in ha_innodb.cc.
Remove storage/innobase/*/Makefile.am. The whole compilation is driven by
storage/innobase/Makefile.am and storage/innobase/plug.in.
plug.in: Declare InnoDB as a dynamic plugin.
ha_innodb.h: Remove the declarations of many global variables. The variables
are no longer directly referenced outside of storage/innobase.
trx_t: Add the field trx->duplicates.
trx_create(): Initialize the fields trx->active_trans and trx->duplicates.
innobase_query_is_update(): Remove. Consult trx->duplicates instead.
in Makefile.am in r1353 by marko (shame on him):
ChangeSet@2007-03-30 06:57:58+02:00, msvensson@pilot.blaudden
Add missing \ causing CMakelists.txt etc not to be included in dist
ChangeSet@1.2372, 2006-12-31 02:29:11+01:00, kent@mysql.com +79 -0
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Added GPL copyright text
dict_col_copy_type_noninline(): Remove the return statement.
Some compilers do not allow return expressions of void type.
innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
on Windows.
Makefile.am (EXTRA_DIST): Add plug.in
This was submitted by Marko to MySQL AB and merged to the MySQL tree by
Brian Aker in the following two changesets:
ChangeSet
2006/09/07 08:23:58-07:00 brian@zim.(none)
Moves Innodb handler to the Innodb storage directory.
ChangeSet
2006/09/07 16:17:16-07:00 brian@zim.(none)
Warning fixes for Windows, and an include fix for Windows for Innodb.
storage/innobase/CMakeLists.txt
2006/09/07 16:17:13-07:00 brian@zim.(none) +6 -1
Fixed includes for Windows
ChangeSet
2006/08/23 13:59:16-07:00 brian@zim.(none)
This patch removes need for a innodb to have its own configure.
univ.i: Replace ../ib_config.h with config.h.
Makefile.i, Makefile.am: Change directory paths.
configure.in: Delete.
plug.in: New file, included from the top-level configure.in.
setup.sh: Replace configure.in with plug.in.
