innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
causes system crash.
mysql-test/r/sp.result:
Added test case for BUG#9674.
mysql-test/t/sp.test:
Added test case for BUG#9674.
sql/item.cc:
Returning a pointer to a local variable is not a good idea.
Better to use parameter which is there for exactly this purpose.
mysql-test/r/sp.result:
Added test case for BUG#6129.
mysql-test/t/sp.test:
Added test case for BUG#6129.
sql/sp_pcontext.h:
Only need one handler counter.
sql/sql_yacc.yy:
Count handlers correctly.
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_dynrec.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/kill.result:
Auto merged
mysql-test/t/kill.test:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
innobase/fil/fil0fil.c:
At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
mysql-test/r/sp.result:
Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
mysql-test/t/sp.test:
Added testcase for BUG#6129: Check that sql_mode is really set in mysql.proc.
Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
innobase/row/row0sel.c:
Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
innobase/row/row0sel.c:
Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
correct result after bugfix
sql/sql_class.cc
initialize net.query_cache_query
mysql-test/r/flush_block_commit.result:
correct result after bugfix
sql/sql_class.cc:
initialize net.query_cache_query
sql/sql_yacc.yy:
oops
sql/field.h:
Field_bit_as_char::size_of() added - we use it in the ::new_key_field().
sql/sql_table.cc:
We have to set pack_flag for bit fields in the mysql_prepare_table()
as we use it in the create_length_to_internal_length().
mysql-test/r/flush_block_commit.result:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
mysql-test/t/flush_block_commit.test:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
mysql-test/r/sp.result:
Added test case for BUG#7185.
mysql-test/t/sp.test:
Added test case for BUG#7185.
sql/sql_yacc.yy:
Allow non-reserved words as stored procedure names.
if foreign_key_checks=0. (Bug #9802)
innobase/dict/dict0dict.c:
dict_foreign_add_to_cache(): Add flag check_types.
If the flag is FALSE, ignore character set mismatch.
innobase/dict/dict0load.c:
dict_load_foreign(), dict_load_foreigns(): Add flag check_types.
If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0dict.h:
dict_foreign_add_to_cache(): Add flag check_types.
If the flag is FALSE, differences in character sets will be ignored.
innobase/include/dict0load.h:
dict_load_foreigns(): Add flag check_types.
If the flag is FALSE, differences in character sets will be ignored.
innobase/row/row0mysql.c:
row_table_add_foreign_constraints(), row_rename_table_for_mysql():
Pass trx->check_foreigns to dict_load_foreigns()
sql/ha_innodb.cc:
ha_innobase::rename_table(): Clear trx->check_foreign if necessary.
when CREATE but not when ALTER
sql/sql_parse.cc:
Return more consistent error message for alter/drop procedure/function
when no current database and no qualified name.
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
Add some more dump
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Impl. 2 new dump
1) to query nf handling state
2) that impl. sending of arbitrary signal...
to be used with extreme care
ndb/src/kernel/main.cpp:
enable critical and warnings in out file
ndb/src/mgmsrv/MgmtSrvr.cpp:
call handleStopReply on nfCompleteRep instead
ndb/src/mgmsrv/MgmtSrvr.hpp:
call handleStopReply on nfCompleteRep instead
- If number of records in table is 4, the calculated cost for using "index" and "range" become so close so that any rounding errors becomes visible.
- Added one more record to the tables for heap test and expoect "range" to be selected
- Decrease number of records in t1 for range and expect "index" to be choosen.
mysql-test/r/heap.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_btree.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/heap_hash.result:
Add one more record to table t1 and expect explain to use "range"
mysql-test/r/range.result:
Update results
mysql-test/t/heap.test:
Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_btree.test:
Add one more record to table t1 and expect explain to use "range"
mysql-test/t/heap_hash.test:
Add one more record to table t1 in order for optimizer to select use of "range" deterministic
mysql-test/t/range.test:
Remove one record from table t1 to avoid that cost for "index" and "range" are so close that rounding error become visible.
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
sql/share/Makefile.am:
using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
all-local is the standard way to add something to all: (thanks Konstantin)
configure.in:
Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
sql/sql_table.cc:
When optimizing a table, if we fall back to mysql_alter_table()
(for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
into mdk10.(none):/home/reggie/bk/mysql-5.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/mysqld.cc:
Auto merged
