into mysql.com:/home/jimw/my/mysql-5.0-build
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
acinclude.m4:
Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
Add test to get type of 'struct rlimit'
Switch order of including stdlib.h and declaration being tested to
match how it will be used in regular code.
configure.in:
Call MYSQL_TYPE_STRUCT_RLIMIT macro
sql/mysqld.cc:
Use STRUCT_RLIMIT for getting type of struct rlimit.
post review fix.
don't init hash value on restart operations
make sure that lock mode is correct in entire que.
ndb/test/ndbapi/testOperations.cpp:
Test case also for abort case.
(abort if not lock owner still fails!)
into mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
post merge 4.1->5.0
ndb/src/ndbapi/ndberror.c:
post merge 4.1->5.0
ndb/test/ndbapi/testOIBasic.cpp:
post merge 4.1->5.0
ndb/include/kernel/signaldata/TuxMaint.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
merge from 4.1
ndb/test/ndbapi/testOIBasic.cpp:
merge from 4.1
In mysql_make_view when joining subquery lists, take into account that both lists
can have length > 1 (see also fix for BUG#8490)
(note to bk trigger: this commit is about BUG#10107)
sql/sql_view.cc:
Fix for BUG#10107: In mysql_make_view, when joining subquery lists, take into account
that both lists can have length > 1 (see also fix for BUG#8490)
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
mysql-test/r/create.result:
MEMORY, not HEAP
mysql-test/r/ps_1general.result:
order changed in SHOW STORAGE ENGINES
mysql-test/r/variables.result:
MEMORY, not HEAP
sql/handler.cc:
the array of storage engine names is searched in index order, so we must put the preferred name
before the alias so that the preferred name is printed by MySQL instead of the alias.
sql/log.cc:
TC_LOG::open(): don't try to open if the index (relevant only for binlog TC log)
could not be opened.
sql/set_var.cc:
--log-update is deprecated and replaced by --log-bin so don't show log_update in SHOW VARIABLES.
to insert view's subqueries into select_lex->slave(->next)* chain.
In case a join has several such views, don't add the same subqueries several times
(this forms a loop on the above chain which breaks many parts of the code)
mysql-test/r/view.result:
Testcase for BUG#8490
mysql-test/t/view.test:
Testcase for BUG#8490
mysql-test/r/sp.result:
New test case for BUG#9004.
Also updated some other results, since formerly "invisible" (but correct)
warnings now are visible.
mysql-test/t/sp.test:
New test case for BUG#9004.
sql/sql_error.cc:
Don't reset warnings while executing a stored routine.
sql/sql_parse.cc:
Don't reset warnings while executing a stored routine.
