This change allows us to use the stmt_binlog function in the code without ifdefs
(We should avoid having ifdefs in the .cc and .c files)
sql/handler.h:
Removed compiler warnings
Fixed wrong table flags type in ndbcluster that caused previous commit to fail
client/mysqltest.c:
Portability fix
mysys/my_bitmap.c:
Remove compiler warning
mysys/my_handler.c:
Remove compiler warning
mysys/thr_lock.c:
Remove compiler warning
plugin/fulltext/plugin_example.c:
Remove compiler warning
sql/ha_ndbcluster.h:
Fixed wrong of handler flags (caused previous commit to fail)
sql/ha_ndbcluster_binlog.cc:
Remove compiler warning
sql/handler.cc:
Indentation cleanups
sql/mysql_priv.h:
Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
sql/mysqld.cc:
Changed log_output_options to ulong to remove compiler warning (and wrong test on 64 bit machines)
Split initialization of variables of different types to remove compiler warning
sql/set_var.cc:
Fixed indentation
sql/set_var.h:
sys_var_log_output now takes a pointer to ulong
storage/archive/archive_test.c:
Remove compiler warning
is_injective -> table_flag() HA_HAS_OWN_BINLOGGING
(Faster and easier to understand)
Allow cluster_binlogging also in mixed replication mode.
mysql-test/t/rpl_truncate_7ndb.test:
Ensure that test is only run with mixed or row based replication
sql/ha_ndbcluster.cc:
Enforce row based replication if a cluster table is used
sql/ha_ndbcluster.h:
Remove is_injective() (Is now a table flag)
sql/ha_ndbcluster_binlog.cc:
Use cluster binlogging also in mixed binary logging
(Using a cluster table will enforce row based replication in mixed mode, so this should be ok)
sql/handler.cc:
is_injective -> HA_HAS_OWN_BINLOGGING
sql/handler.h:
is_injective -> HA_HAS_OWN_BINLOGGING
mysql-test/include/have_binlog_format_mixed_or_row.inc:
New BitKeeper file ``mysql-test/include/have_binlog_format_mixed_or_row.inc''
mysql-test/r/rpl_truncate_7ndb_2.result:
New BitKeeper file ``mysql-test/r/rpl_truncate_7ndb_2.result''
mysql-test/t/rpl_truncate_7ndb_2-master.opt:
New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2-master.opt''
mysql-test/t/rpl_truncate_7ndb_2.test:
New BitKeeper file ``mysql-test/t/rpl_truncate_7ndb_2.test''
into clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
have to push this to be able to push 5.0
storage/ndb/include/kernel/signaldata/DictLock.hpp:
Rename: ndb/include/kernel/signaldata/DictLock.hpp -> storage/ndb/include/kernel/signaldata/DictLock.hpp
storage/ndb/src/kernel/blocks/dbdict/DictLock.txt:
Rename: ndb/src/kernel/blocks/dbdict/DictLock.txt -> storage/ndb/src/kernel/blocks/dbdict/DictLock.txt
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
debug
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/src/ndbapi/ndberror.c:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/ndbapi/testDict.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
storage/ndb/test/src/NdbRestarter.cpp:
bug#18781 post-merge 5.0->5.1 fixes (one more to come)
sql/handler.cc:
Generating table maps from all locks that can be available: THD::extra_lock,
THD::lock, and THD::locked_tables.
sql/sql_class.h:
Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
Removing select_insert::lock.
sql/sql_insert.cc:
Adding member Open_tables:state::extra_lock to hold the extra lock used by select_create.
Removing select_insert::lock.
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
support-files/mysql.server.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
into mysql.com:/home/my/mysql-5.1
mysql-test/extra/rpl_tests/rpl_log.test:
Auto merged
mysql-test/r/rpl_ndb_log.result:
Auto merged
mysql-test/r/rpl_row_log.result:
Auto merged
mysql-test/r/rpl_row_log_innodb.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/mysql_priv.h:
SCCS merged
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
mysql-test/r/partition_error.result:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/partition.result:
Auto merged
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
mysql-test/r/show_check.result:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_delete.cc:
Auto merged
mysql-test/extra/rpl_tests/rpl_log.test:
Change table_id's to # to make test portable
mysql-test/r/rpl_ndb_log.result:
Update test result to use table_id: #
mysql-test/r/rpl_row_log.result:
Update test result to use table_id: #
mysql-test/r/rpl_row_log_innodb.result:
Update test result to use table_id: #
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
sql/mysql_priv.h:
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
sql/sql_insert.cc:
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
sql/sql_parse.cc:
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
sql/sql_table.cc:
Need to flag when a copy is needed to not overwrite a create_info
object connected to the lex structure
storage/ndb/test/ndbapi/test_event_merge.cpp:
test multiple tables and getGCIEventOperations
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
fix getGCIEventOperations when merge events is on
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
fix getGCIEventOperations when merge events is on
mysql-test/extra/rpl_tests/rpl_log.test:
Fix for bug #20601: rpl_ndb_log.test failure
- replace insignificant columns to make tests repeatable
mysql-test/r/rpl_ndb_log.result:
Fix for bug #20601: rpl_ndb_log.test failure
- result adjusted
mysql-test/r/rpl_row_log.result:
Fix for bug #20601: rpl_ndb_log.test failure
- result adjusted
mysql-test/r/rpl_row_log_innodb.result:
Fix for bug #20601: rpl_ndb_log.test failure
- result adjusted
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/sql_mode.result:
Auto merged
mysql-test/t/sql_mode.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
mysql-test/r/partition_error.result:
result fix
sql/log.cc:
use open_slow_log() instead of open_query_log() for slow query log
sql/log.h:
after merge fix
sql/set_var.cc:
after merge fix
use open_slow_log() instead of open_query_log() for slow query log
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
support-files/mysql.server.sh:
Support getting additional arguments, which need to be passed on to the server.
This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments.
So if the IM would be used, additional arguments cause the start to fail (voluntarily).
This feature is needed so that tools like RPM can start the server in an "isolated" way,
see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade".
support-files/mysql.spec.sh:
Call "mysql_upgrade" during an RPM upgrade.
"mysql_upgrade" needs a server to run, as it issues SQL commands.
(This had been neglected previously.)
It also needs to connect as "root", but in an RPM upgrade the password is unknown.
To allow this, the server is started "--skip-grant-tables".
Normally, this would open big security holes, so it is also started "--skip-networking",
and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
New test cases
mysql-test/r/partition_error.result:
New test cases
mysql-test/r/partition_mgm.result:
New test cases
mysql-test/t/partition_error.test:
New test cases
mysql-test/t/partition_mgm.test:
New test cases
