Always logging statements of the form "DELETE FROM x" statement-based.
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Result change.
mysql-test/t/disabled.def:
Enabling test ps_7ndb
sql/sql_delete.cc:
Always logging statements of the form "DELETE FROM x" statement-based,
not only when delete_all_rows() actually worked.
mysql-test/extra/rpl_tests/rpl_row_blob.test:
New blobs test for RBR
mysql-test/t/rpl_row_blob_innodb.test:
Innodb wrapper for rbr blob test
mysql-test/t/rpl_row_blob_myisam.test:
MyISAM wrapper for rbr blob test
mysql-test/r/rpl_row_blob_myisam.result:
MyISAM result for rbr blob test
mysql-test/r/rpl_row_blob_innodb.result:
Innodb result for rbr blob test
into mysql.com:/opt/local/work/mysql-5.1-merge
include/config-win.h:
Auto merged
mysys/hash.c:
Auto merged
mysql-test/r/rpl_stm_sp.result:
Auto merged
mysql-test/t/rpl_stm_sp.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
mysql-test/r/information_schema.result:
Manual merge.
mysql-test/t/information_schema.test:
Manual merge.
sql/lock.cc:
Manual merge.
Put options in standard order: help first, then lexically,
then variables.
client/mysqlbinlog.cc:
Put options in standard order: help first, then lexically,
then variables.
Add a link to extra/yassl/include/openssl to inlude when compiling with yassl
Similiar to readline)
config/ac-macros/yassl.m4:
Link extra/yassl/include/openssl dir to include/
include/Makefile.am:
Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)
into mysql.com:/opt/local/work/mysql-5.0-merge
mysys/hash.c:
Auto merged
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_acl.cc:
Manual merge.
sql/sql_base.cc:
Manual merge.
when high concurrency": remove HASH::current_record and make it
an external search parameter, so that it can not be the cause of a
race condition under high concurrent load.
The bug was in a race condition in table_hash_search,
when column_priv_hash.current_record was overwritten simultaneously
by multiple threads, causing the search for a suitable grant record
to fail.
No test case as the bug is repeatable only under concurrent load.
include/hash.h:
- remove current_record from HASH, instead modify hash_first,
hash_next to accept HASH_SEARCH_STATE as an IN/OUT parameter
mysys/hash.c:
- remove HASH::current_record
- change declarations of functions that use HASH in read-only mode
to accept const HASH * instead of HASH *.
- implement hash_search; move the old implementation of hash_search
to hash_first
mysys/testhash.c:
- adjust the test case to changed function declarations
sql/lock.cc:
- adjust to changed declarations of hash_search, hash_next
sql/sql_acl.cc:
- adjust to changed declarations of hash_search, hash_next
sql/sql_base.cc:
- adjust to changed declarations of hash_search, hash_nex
sql/sql_cache.cc:
- adjust to a changed declaration of hash_replace
the bug is fixed.
mysql-test/t/rpl_row_sp000.test:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
mysql-test/r/rpl_row_sp000.result:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
mysql-test/r/rpl_stm_sp.result:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
mysql-test/t/rpl_stm_sp.test:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
the bug is fixed.
mysql-test/r/rpl_sp.result:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
mysql-test/t/rpl_sp.test:
BUG#14931: Temporarily add synchronization to avoid sporadic failures until
the bug is fixed.
include/my_sys.h:
sort_dynamic()
mysys/my_once.c:
MY_ZEROFILL support in my_once_alloc
plugin/fulltext/Makefile.am:
no lib prefix for modules. really build .so
scripts/mysql_create_system_tables.sh:
remove obsolete syntax (and warnings)
sql/sql_parse.cc:
don't call add_to_status/bzero in a loop
enable view prepared mode during getting metedata for I_S table
mysql-test/r/information_schema.result:
Fix for bug#15533 crash, information_schema, function, view
test case
mysql-test/t/information_schema.test:
Fix for bug#15533 crash, information_schema, function, view
test case
(MySQL plugin interface: status variables)
adding SHOW_FUNC, removing SHOW_some_specific_value,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
changing to use SHOW_FUNC instead of ha_update_statistics
sql/ha_innodb.h:
cleanup of SHOW STATUS code, as a preparation for WL#2935
removing ha_update_statistics().
sql/handler.cc:
cleanup of SHOW STATUS code, as a preparation for WL#2935
removing ha_update_statistics().
sql/handler.h:
cleanup of SHOW STATUS code, as a preparation for WL#2935
removing ha_update_statistics().
sql/mysqld.cc:
cleanup of SHOW STATUS code, as a preparation for WL#2935
adding SHOW_FUNC, removing SHOW_some_specific_variable,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
changing to use SHOW_FUNC instead of ha_update_statistics
sql/set_var.cc:
cleanup of SHOW STATUS code, as a preparation for WL#2935
adding SHOW_FUNC, removing SHOW_some_specific_variable,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
sql/sql_show.cc:
cleanup of SHOW STATUS code, as a preparation for WL#2935
adding SHOW_FUNC, removing SHOW_some_specific_variable,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
changing to use SHOW_FUNC instead of ha_update_statistics
sql/structs.h:
cleanup of SHOW STATUS code, as a preparation for WL#2935
adding SHOW_FUNC, removing SHOW_some_specific_variable,
only generic SHOW_LONG/SHOW_CHAR/etc are recognized.
the mysqlslap lock directory to value of --tmpdir.
mysql-test/mysql-test-run.pl:
Set mysqlslap --lock-directory to avoid conflicts between parallel tests.
