into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
mysql-test/suite/binlog/r/binlog_killed.result:
Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
mysql-test/suite/rpl/t/rpl_dual_pos_advance.test:
Auto merged
mysql-test/suite/rpl/t/rpl_temporary.test:
manual merge
sql/log.cc:
manual merge
In BUG#30244 added FOUND_ROWS() as an unsafe function, but that
works only in mixed mode under 5.1. There is a workaround that
can be used in statement-based mode either under 5.0 or 5.1
where the result of FOUND_ROWS() is stored into a user vari-
able and used that way instead. This will replicate correctly
even under statement-based replication, since it will write
a User_var entry to the binary log. For some other cases, the
value has to be passed explicitly.
This patch adds tests to demonstrate that the workarounds docu-
mented for statement-based replication works as advertised, and
does more extensive tests for cases that does not work under sta-
tement-based replication actually work under mixed mode by switch-
ing to row-based replication.
mysql-test/include/reset_master_and_slave.inc:
New BitKeeper file ``mysql-test/include/reset_master_and_slave.inc''
mysql-test/suite/rpl/r/rpl_found_rows.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_found_rows.result''
mysql-test/suite/rpl/t/rpl_found_rows.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_found_rows.test''
non-deterministic tests refining.
This particular patch tested on two archs.
mysql-test/suite/binlog/t/binlog_killed.test:
deploying synchronization of killing with reaching the explected state
of the prey's connection.
Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result
ndb_auto_increment.test, ndb_auto_increment.result:
Bug #31956 auto increment bugs in MySQL Cluster: Adapted test cases
ha_ndbcluster.cc:
Bug #31956 auto increment bugs in MySQL Cluster: Merging from 5.0
ndb_auto_increment.test:
Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test
sql/ha_ndbcluster.cc:
Bug #31956 auto increment bugs in MySQL Cluster: Merging from 5.0
mysql-test/suite/ndb/t/ndb_auto_increment.test:
Bug #31956 auto increment bugs in MySQL Cluster: Adapted test cases
mysql-test/suite/ndb/r/ndb_auto_increment.result:
Bug #31956 auto increment bugs in MySQL Cluster: Adapted test cases
non-deterministic tests execution on some platforms.
mysql-test/suite/binlog/r/binlog_killed.result:
results changed
mysql-test/suite/binlog/t/binlog_killed.test:
correcting the prev test's cleanup;
increasing time to wait by to be killed query;
adding the masking out error due to Bug@32140 wrong error code caught when an SF() call is interruped with KILL query
into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
mysql-test/suite/ndb/r/ndb_insert.result:
Auto merged
mysql-test/suite/ndb/t/ndb_insert.test:
Auto merged
sql/ha_ndbcluster.cc:
Using local, will merge manually
sql/ha_ndbcluster.h:
Merge
sql/mysqld.cc:
Merge
refining tests as they appear to be non-deterministic.
mysql-test/suite/binlog/r/binlog_killed.result:
results changed
mysql-test/suite/binlog/t/binlog_killed.test:
restructuring the test to deliver more deterministic outcome.
order-by for update and delete did not guaratee the order of scanning.
--error are masked with zero in order to catch more info if killing
really will happen to be non-deterministic on some platform (witnessed
something like that on dl145j)
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
important guard added
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Actually, the failure happened with 3innodb as well. Most probably
the reason is in failing to delete a binlog file on __NT__ so that
that master increments the index of the binlog file.
The test results hide valueable warning that windows could generate
about that.
The scope of this fix is to make sure we have such warning and
to lessen chances for binlog file being held at time of closing.
The dump thread is getting a good chance to leave and
release the file for its successful deletion.
We shall watch over the two tests as regression is not excluded.
In that case we would have an extra info possibly explaining why
__NT__ env can not close/delete the file.
However, regardless of that reason, there is alwasy workaround to mask out
non-deterministic binlog index number.
mysql-test/extra/rpl_tests/rpl_truncate_helper.test:
enable warnings for other than DROP queries;
wait for slave's full stop which ensures io thread left and that
will be regarded by dump thread to leave and close the binlog file;
relocating reset master to the end of the test so that the caller of
this helper should start with the binlog name which has not yet been
affected/reset since its creation.
mysql-test/suite/rpl/r/rpl_truncate_2myisam.result:
results changed
mysql-test/suite/rpl/r/rpl_truncate_3innodb.result:
results changed
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
tests/mysql_client_test.c:
Auto merged
Marking statements containing USER() or CURRENT_USER() as unsafe, causing
them to switch to using row-based logging in MIXED mode and generate a
warning in STATEMENT mode.
mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result:
Result change.
mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test:
Adding test to check that USER() and CURRENT_USER() cause a switch
to row-based logging.
sql/sql_yacc.yy:
Setting statements containing USER() or CURRENT_USER() to be unsafe.
destination. Removing wrong (local temp) tests.
mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt:
Rename: mysql-test/t/binlog_killed_simulate-master.opt -> mysql-test/suite/binlog/t/binlog_killed_simulate-master.opt
BitKeeper/deleted/.del-binlog_killed_bug27571.test:
Delete: mysql-test/t/binlog_killed_bug27571.test
BitKeeper/deleted/.del-binlog_killed_bug27571-master.opt:
Delete: mysql-test/t/binlog_killed_bug27571-master.opt
mysql-test/suite/binlog/r/binlog_killed.result:
results changed
mysql-test/suite/binlog/t/binlog_killed.test:
binlog offset made 5.1 specific
mysql-test/suite/binlog/t/binlog_killed_simulate.test:
binlog offset + guard to run the test with stmt/mixed format
mysql-test/suite/binlog/r/binlog_killed_simulate.result:
new results file
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Result file change.
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Include file show_slave_status.inc should be used for portable SHOW SLAVE STATUS.
The rpl_trigger test case indicated a problem with idempotency support when run
under row-based replication, which this patch fixes.
However, despite this, the test is not designed for execution under row-based
replication and hence rpl_trigger.test is not executed under row-based
replication.
The problem is that the test expects triggers to be executed when the slave
updates rows on the slave, and this is (deliberately) not done with row-based
replication.
sql/log_event.cc:
Adding function to print symbolic name of handler errors for debug purposes.
Ignoring some more error messages to provide full idempotency support for
update and delete operations.
mysql-test/suite/rpl/r/rpl_idempotency.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_idempotency.result''
mysql-test/suite/rpl/t/rpl_idempotency.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_idempotency.test''
into mysql.com:/usr/clones/rpl-push
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_update.cc:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
mysql-test/suite/rpl/t/rpl_bug31076.test:
manual merge
into koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571
client/mysql.cc:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/suite/binlog/r/binlog_killed.result:
Auto merged
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
mysql-test/suite/rpl/r/rpl_sp_effects.result:
manual merge ul
mysql-test/suite/rpl/t/rpl_sp_effects.test:
manual merge
sql/slave.cc:
leaving for manual merge
sql/sql_delete.cc:
leaving for manual merge
sql/sql_insert.cc:
leaving for manual merge
sql/sql_load.cc:
leaving for manual merge
sql/sql_update.cc:
leaving for manual merge
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_regexp.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/ctype_ucs.result:
After merge fix
mysql-test/t/ctype_ucs.test:
After merge fix
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
client/mysql.cc:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/suite/rpl/r/rpl_bug31076.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_regexp.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_xmlfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
sql/sql_yacc.yy:
Reverting Rafal's changes: TRANSACTIONAL_SYM was removed in a mistake.
mysql-test/r/ctype_ucs.result:
After merge fix
mysql-test/suite/rpl/t/rpl_bug31076.test:
After merge fix.
mysql-test/t/ctype_ucs.test:
After megre fix
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Auto merged
mysql-test/suite/funcs_1/r/memory__datadict.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Auto merged
mysql-test/r/partition.result:
Ensure test for bug number 27816 is in the merged tree.
mysql-test/t/partition.test:
Ensure test for bug number 27816 is in the merged tree.
Bug#31857 funcs_1: a_processlist_priv_no_prot and b_processlist_priv_ps fail
Reason for the changes is:
WL4007 Deprecate RENAME DATABASE: replace with ALTER DATABASE <name> UPGRADE
mysql-test/suite/funcs_1/datadict/datadict_priv.inc:
1. Adjustment to new server response (ER_PARSE_ERROR instead of ER_DBACCESS_DENIED_ERROR)
2. Add missing subtest with ALTER DATABASE ... UPGRADE ...
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
Updated results
Bug#31408 funcs_1: <engine>_trig_03e test fail
Modification:
The TRIGGER PRIVILEGE is now needed for getting informations about TRIGGERs.
Therefore after REVOKE TRIGGER privilege the
- SHOW TRIGGERS
- SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
result sets are now empty.
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Updated results
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Updated results
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Updated results
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Updated results
mysql-test/suite/rpl/t/rpl_row_until.test:
- Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
commands after wich we want to show the slaves status
mysql-test/suite/rpl/t/rpl_stm_until.test:
- Add a "wait_for_slave_to_stop.inc" after the two "stop slave"
commands after wich we want to show the slaves status
mysql-test/suite/ndb/r/ndb_update_no_read.result:
New BitKeeper file ``mysql-test/suite/ndb/r/ndb_update_no_read.result''
mysql-test/suite/ndb/t/ndb_update_no_read.test:
New BitKeeper file ``mysql-test/suite/ndb/t/ndb_update_no_read.test''
replication):
Incremental patch to enable idempotency support for update events again.
The final handling of errors will be done in BUG#31609, and until then
the handling of errors should be consistent between the different types
of changes.
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
Result change.
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
Result change.
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
Changing test to assume idempotency handling of update event.
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
Changing test to assume idempotency handling of update event.
sql/log_event.cc:
Incremental patch to enable idempotency support for the update events again.
The real error handling will be implemented in BUG#31609.
Non-determinism in the tests was due to results of SBR are different from those gained
with row binlog format.
Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
to run the test on in mixed and stmt binlog format.
ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
favoring reentrant reading from binlog rule
which means that a Write_rows_log_event overwrites a slave's row
if the one has the same primary key.
If future we might have skipping error due to applying of row-based events.
The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.
mysql-test/suite/rpl/r/rpl_skip_error.result:
new results
mysql-test/suite/rpl/t/rpl_skip_error-slave.opt:
wrong error code that can not happen in the test removed.
mysql-test/suite/rpl/t/rpl_skip_error.test:
enforcing the test is to skip only errors due to SBR.
The current test does not check anything for RBR as ignorable ER_DUP_ENTRY
does make sense only for SBR.
into kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/slave.cc:
Auto merged
If a temporary error occured inside a group on an event that was not the first
event of the group, the slave could get stuck because the retry counter is reset
whenever an event was executed successfully.
This patch only reset the retry counter when an entire group has been successfully
executed, or failed with a non-transient error.
sql/slave.cc:
Adding debug printouts to every place where Relay_log_info::trans_retries
is changed and to has_temporary_error() to print the error when returning.
Adding debug variable all_errors_are_temporary_errors to make all errors
for slave thread temporary errors.
Adding code so that the Relay_log_info::trans_retries is only reset when
an entire group was sucessfully executed, or a non-temporary error occured.
mysql-test/suite/rpl/r/rpl_temporary_errors.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_temporary_errors.result''
mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt''
mysql-test/suite/rpl/t/rpl_temporary_errors.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_temporary_errors.test''
When replicating an update pair (before image, after image) under row-based
replication, and the before image is not found on the slave, the after image
was not discared, and was hence read as a before image for the next row.
Eventually, this lead to an after image being read outside the block of rows
in the event, causing an assertion to fire.
This patch fixes this by reading the after image in the event that the row
was not found on the slave, adds some extra debug assertion to catch future
errors earlier, and also adds a few non-debug checks to prevent reading
outside the block of the event.
include/my_base.h:
Adding error code HA_ERR_CORRUPT_EVENT.
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result:
Result change.
mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test:
Adding test to try to use row-based replication to replicate an
update of a row that doesn't exist on the slave. We should get
an apropriate error and the slave should stop.
sql/log_event.cc:
Adding debug printouts. Adding code to Update_rows_log_event::do_exec_row()
so that the after image is read (and ignored) in the event of an error in
finding the row. This is necessary so that the second pair of images is
read correctly for the next update pair.
Changing logic for ignoring errors to not include update events, since
a "key not found" error or a "record changed" error is not idempotent
for updates, just for deletes and inserts.
sql/log_event.h:
Adding debug assertions to check that row reading is within the events block of rows.
is possible):
When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
flag was not set correctly, which caused the slave to not recognize that it was
inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
and XID events. It also adds checks if inside a group before decreasing the
slave skip counter to zero.
Begin_query_log_event was not marked that it could not end a group, which is now
corrected.
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
Correcting slave skip counter to get the correct behaviour.
mysql-test/suite/rpl/r/rpl_slave_skip.result:
Result change.
mysql-test/suite/rpl/t/rpl_slave_skip.test:
Adding tests to check that skipping works for transactions:
- Skipping one group with BEGIN first
- Skipping two groups with BEGIN first
- Skipping one group without BEGIN first but with AUTOCOMMIT=0
- LOAD DATA INFILE under statement-based replication
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Result change.
sql/log_event.cc:
Adding checks if we're in a group when the slave skip counter is 1.
In that case, we should keep going.
Adding helping member function Log_event::continue_group() denoting
that this event cannot end a group, and if the skip counter indicates
that the group ends after this event, it should not decrease the skip
counter.
Query_log_event will change the OPTION_BEGIN flag for BEGIN, COMMIT, and
ROLLBACK, even when skipping because of a positive skip count, and
Xid_log_event will also affect the OPTION_BEGIN flag, even when being
skipped.
Begin_load_query_log_event cannot end a group, so it is marked to
continue the group.
sql/log_event.h:
Adding helper function Log_event::continue_group().
sql/rpl_rli.h:
Adding Relay_log_info::get_flag() to get the value of a
replication flag.
sql/slave.cc:
Adding debug output and changing debug message.
mysql-test/suite/rpl/data/rpl_bug28618.dat:
New BitKeeper file ``mysql-test/suite/rpl/data/rpl_bug28618.dat''
mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_slave_skip-slave.opt''
into magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
mysql-test/r/derived.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_date.test:
Auto merged
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
mysql-test/suite/ndb/r/ps_7ndb.result:
Auto merged
sql/field.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
mysql-test/r/type_date.result:
merge 5.0-opt -> 5.1-opt
into four.local.lan:/WORK2/merge/mysql-5.1-31556
mysql-test/suite/funcs_2/r/innodb_charset.result:
Auto merged
mysql-test/suite/funcs_2/r/memory_charset.result:
Auto merged
mysql-test/suite/funcs_2/r/myisam_charset.result:
Auto merged
mysql-test/suite/funcs_2/r/ndb_charset.result:
Auto merged
Bug#31556 Test failure: "select hex(ascii(a)) ... order by a" results in different order
mysql-test/suite/funcs_2/r/innodb_charset.result:
Updated result
mysql-test/suite/funcs_2/r/memory_charset.result:
Updated result
mysql-test/suite/funcs_2/r/myisam_charset.result:
Updated result
mysql-test/suite/funcs_2/r/ndb_charset.result:
Updated result
updated result files
mysql-test/suite/funcs_1/r/innodb__datadict.result:
updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
updated result file
mysql-test/suite/rpl/include/rpl_mixed_check_select.inc:
Added ORDER BY for SELECT
mysql-test/suite/rpl/include/rpl_mixed_check_view.inc:
Added ORDER BY for VIEW
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Added ORDER BY for SELECT
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Updated result file
Bug#31169 Test case does not check whether configuration contains feature tested
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Add check for partitioning feature.
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
Add check for partitioning feature.
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
manual merge from 5.0
mysql-test/r/innodb.result:
results changed
mysql-test/r/multi_update.result:
results changed
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
manual merge: results re-recorded
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/manual/r/rpl_replication_delay.result:
results recorded for 5.1
mysql-test/t/innodb.test:
removing bug27716 regression test as one exists in binlog suite already.
mysql-test/t/multi_update.test:
manual merge plus refining for execution in both binlog_format.
sql/log_event.cc:
bloody manual merge;
the fact that an event is artificial is encode with setting timestamp argument to zero.
rli's last_master_timestamp won't be updated in stmt_done in such case.
sql/rpl_rli.cc:
simulation and the real fixing code.
Don't update last_master_timestamp with zero.
sql/sql_delete.cc:
manual merge
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
mysql-test/t/multi_update.test:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
manual merge use local; another file has to be changed in 5_1.
mysql-test/r/innodb.result:
manual merge use local to re-record the results
mysql-test/r/multi_update.result:
manual merge use local to re-record the results
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
manual merge use local to re-record the results
mysql-test/t/innodb.test:
restoring bug#27716 snippet
sql/log_event.cc:
trasfering simulation to another file: rpl_rli.cc
into kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/rpl_record.cc:
Manual merge.
Bug#31411 funcs_1: ndb_<every test> fail because of changed server error number
= Adjust the files with expected results
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Updated result
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Updated result
Refactoring code to add parameter to pack() and unpack() functions with
purpose of indicating if data should be packed in little-endian or
native order. Using new functions to always pack data for binary log
in little-endian order. The purpose of this refactoring is to allow
proper implementation of endian-agnostic pack() and unpack() functions.
Eliminating several versions of virtual pack() and unpack() functions
in favor for one single virtual function which is overridden in
subclasses.
Implementing pack() and unpack() functions for some field types that
packed data in native format regardless of the value of the
st_table_share::db_low_byte_first flag.
The field types that were packed in native format regardless are:
Field_real, Field_decimal, Field_tiny, Field_short, Field_medium,
Field_long, Field_longlong, and Field_blob.
Before the patch, row-based logging wrote the rows incorrectly on
big-endian machines where the storage engine defined its own
low_byte_first() to be FALSE on big-endian machines (the default
is TRUE), while little-endian machines wrote the fields in correct
order. The only known storage engine that does this is NDB. In effect,
this means that row-based replication from or to a big-endian
machine where the table was using NDB as storage engine failed if the
other engine was either non-NDB or on a little-endian machine.
With this patch, row-based logging is now always done in little-endian
order, while ORDER BY uses the native order if the storage engine
defines low_byte_first() to return FALSE for big-endian machines.
In addition, the max_data_length() function available in Field_blob
was generalized to the entire Field hierarchy to give the maximum
number of bytes that Field::pack() will write.
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
Sorting by columns that produces deterministic order.
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
Result change.
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
Result change.
mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result:
Result change.
mysql-test/suite/rpl/t/disabled.def:
Enabling tests.
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test:
Adding missing sync_slave_with_master causing slave to keep tables
after shutdown.
mysql-test/suite/rpl_ndb/t/disabled.def:
Enabling tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb-slave.opt:
Adding --new option
mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test:
Adding have_log_bin.
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb-slave.opt:
Adding --new option
mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test:
Adding have_log_bin
mysql-test/t/partition.test:
Adding have_archive, since that is used in the test.
sql/field.cc:
Eliminating all two-argument pack() and unpack() functions and moving
functionality into the four-argument version. The four argument version
is introduced so that it is possible to avoid using the storage engine
default when writing and reading the packed format (the unpacked format
still uses the storage engine's default). This is used by row-based
replication to write the fields in a storage engine- and endian-agnostic
format.
Packing integral and floating-point numbers in little-endian format
(if requested).
Using pad_char for the field instead of spaces (0x20) when unpacking.
Adding some Doxygen documentation.
---
Adding max_data_length() to denote the maximum number of bytes that
pack() will write.
Adding casts to remove warnings for debug printouts.
sql/field.h:
Eliminating all virtual pack() and unpack() functions except the four-
argument version, which now is the function that shall be overridden.
The two-argument versions are convenience functions, to prevent changes
to code that uses these.
Adding code to pack integer numbers and floating-point numbers in
little-endian format, if requested.
---
Adding max_data_length() to denote the maximum number of bytes that
pack() will write.
sql/log.cc:
Removing debug printout causing crash when starting NDB on Solaris.
sql/log_event.cc:
Adding missing #ifndef causing compile failure. Adding debug printouts.
sql/rpl_record.cc:
Debriding code. Using new pack() and unpack() functions to always pack
fields little-endian. Adding debug printouts.
---
Using max_data_length() when packing field into row.
Adding casts to debug printouts.
sql/sql_show.cc:
Adding code that causes crash on Solaris machines since printf() cannot
handle NULL values for strings properly.
mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result:
New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb2ndb.result''
mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result:
New BitKeeper file ``mysql-test/suite/rpl_ndb/r/rpl_ndb_myisam2ndb.result''
Problem: rpl_stm_mystery22 is unstable.
Reason: At one place, the test case *should* wait until the SQL thread on the
slave receives an error, but instead it waits until the SQL thread stops. The
SQL thread may stop before the error flag is set, so that when the test case
continues to execute, the error flag is not set.
Fix: Introduce the subroutine mysql-test/include/wait_for_slave_sql_error.inc,
which waits until there is an error in the sql thread of the slave.
Re-commit: fixed one logical error and two smaller things noted by Mats.
mysql-test/suite/rpl/t/rpl_stm_mystery22.test:
Use the new wait_for_slave_sql_error.inc instead of wait_for_slave_to_stop.
There may be a delay from when the slave stops to when Last_SQL_Errno is set,
so it is not safe to merely wait until the slave stops.
mysql-test/include/wait_for_slave_sql_error.inc:
New BitKeeper file ``mysql-test/include/wait_for_slave_sql_error.inc''
This is a subroutine that waits until the sql thread on the slave receives an
error, as indicated by Last_SQL_Errno in "SHOW SLAVE STATUS".
Back porting NDB test case
mysql-test/suite/rpl_ndb/t/rpl_ndb_extraColMaster.test:
Back porting NDB test case
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraColMaster.result:
Back porting NDB test case
Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
Many files:
merged and cleanup of test cases
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.test~523b0954869c4423:
Delete: mysql-test/suite/rpl/t/rpl_row_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_stm_extraColmaster_ndb.test~5ac81fa1ec366ba:
Delete: mysql-test/suite/rpl/t/rpl_stm_extraColmaster_ndb.test
BitKeeper/deleted/.del-rpl_row_extraColmaster_ndb.result~a2c64bae75b49d2:
Delete: mysql-test/suite/rpl/r/rpl_row_extraColmaster_ndb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
merged and cleanup of test cases
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_innodb.test:
merged and cleanup of test cases
mysql-test/suite/rpl/t/rpl_extraColmaster_myisam.test:
merged and cleanup of test cases
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
merged and cleanup of test cases
Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated expected results
Attention:
The update does not prevent that the test has to be disabled.
Reason: Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
mysql-test/suite/funcs_1/t/disabled.def:
Disable ndb__datadict because of
Bug#31421 funcs_1: ndb__datadict fails, discrepancy between scripts and expected results
which will be fixed later.
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
libmysql/libmysql.c:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/suite/rpl_ndb/t/rpl_ndb_charset.test:
Updated test to run for both row and mixed replication testing
mysql-test/suite/rpl_ndb/r/rpl_ndb_charset.result:
Updated results file
mysql-test/extra/rpl_tests/rpl_row_charset.test:
Updated test to specify the engine in the create. In addition had to add BIG SQL for NDB
mysql-test/suite/rpl/r/rpl_row_charset.result:
Updated results file
mysql-test/suite/rpl/t/rpl_row_charset_innodb.test:
Created a wrapper to test innodb storage engine as well
mysql-test/suite/rpl/t/rpl_row_charset_innodb-master.opt:
Option file to ensure innodb on master
mysql-test/suite/rpl/t/rpl_row_charset_innodb-slave.opt:
Option file to ensure innodb on slave
mysql-test/suite/rpl/r/rpl_row_charset_innodb.result:
New results file for innodb test case
use mysqltest builtins instead of --exec. Fixes a failing test too :)
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
use mysqltest builtins instead of --exec. Fixes a failing test too :)
2. Cleanup of test
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated expected results
mysql-test/suite/funcs_1/r/memory_views.result:
Updated expected results
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated expected results
mysql-test/suite/funcs_1/r/ndb_views.result:
Updated expected results
mysql-test/suite/funcs_1/views/views_master.inc:
1. Fix for Bug#31237
Typical changes:
- Move LIMIT .... from CREATE VIEW statement to the SELECT checking the VIEW content
- Partially refine the SELECT on the VIEW to get a reproducible result
2. Cleanup of test
- replace error numbers by names
- remove comments and workarounds dedicated to now fixed bugs
- minor fixes or improvements in comments
- remove trailing spaces
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
sql/ha_ndbcluster_cond.cc:
Auto merged
mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanFilter.hpp:
Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
ul, add code (4294) in post-merge
storage/ndb/include/ndbapi/Ndb.hpp:
SCCS merged
Report claims that Seconds_behind_master behaves unexpectedly.
Code analysis shows that there is an evident flaw in that treating of FormatDescription event is wrong
so that after FLUSH LOGS on slave the Seconds_behind_master's calculation slips and incorrect
value can be reported to SHOW SLAVE STATUS.
Even worse is that the gap between the correct and incorrect deltas grows with time.
Fixed with prohibiting changes to rpl->last_master_timestamp by artifical events (any kind of).
suggestion as comments is added how to fight with lack of info on the slave side by means of
new heartbeat feature coming.
The test can not be done ealily fully determistic.
sql/log_event.cc:
changing timestamp is affirmed only by non-artificial events. Artifical FD won't change it anymore.
The simulation code is off unless server is started with the args from the opt-file.
The simulation code assumes that it will execute specific schedule generated by rpl_replication_delay.test.
sql/slave.cc:
Comments are changed to announce a new possibility to cope with
Seconds_behind_master jumping due to EOF special treatment (reset of the timestamp)
mysql-test/suite/manual/r/rpl_replication_delay.result:
result are not deterministic though there are comments saying the most probable expected
value for Seconds_behind_master
mysql-test/suite/manual/t/rpl_replication_delay-slave.opt:
bug emulation
mysql-test/suite/manual/t/rpl_replication_delay.test:
specic test for bug#29309. It's hard to make it reliable as it deals with timestamps.
(a way to automate the test like this is to have I_S table for show slave status' fields)
A possible way to check results is to run
grep -i 'show\|seconds' < suite/manual/r/rpl_replication_delay.reject and to get the lines like these:
show slave status /* Second_behind reports 0 */;;
Seconds_Behind_Master 0
show slave status /* bug emulated: reports slave threads starting time about 3*3 not 3 secs */;;
Seconds_Behind_Master 9
show slave status /* reports the correct diff with master query time about 3+3 secs */;;
Seconds_Behind_Master 6
Due to time discreteness of time the reported numbers may slightly vary. That's why the test is not reliable.
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
mysql-test/suite/ndb/r/ndb_update.result:
Auto merged
mysql-test/suite/ndb/t/ndb_update.test:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/ha_ndbcluster.h:
Merge
Add the cleanup by dropping the database 'track' in test "rpl_bug31076".
mysql-test/suite/rpl/r/rpl_bug31076.result:
Fix bug#31150 "Test case does not cleanup":
Drop the database 'track' which was newly created for this test.
mysql-test/suite/rpl/t/rpl_bug31076.test:
Fix bug#31150 "Test case does not cleanup":
Drop the database 'track' which was newly created for this test.
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into trift2.:/MySQL/M51/push-5.1
This is mysql-5.1.22-rc.
mysql-test/r/innodb_mysql.result:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_select.cc:
Manual merge - the 31001 bug is already fixed.
mysql-test/include/mix1.inc:
Manual merge - should not have conflicted at all.
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
Makefile.am:
Auto merged
configure.in:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/memory__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Use most current version of test results.
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Use most current version of test results.
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into trift-lap.fambruehe:/MySQL/M51/antony-5.1
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Auto merged
mysql-test/suite/funcs_1/r/innodb_views.result:
Auto merged
mysql-test/suite/funcs_1/r/memory_views.result:
Auto merged
mysql-test/suite/funcs_1/r/myisam_views.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_func_view.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Auto merged
mysql-test/suite/funcs_1/r/ndb_views.result:
Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
Auto merged
sql/ha_partition.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
configure.in:
Version is updated already.
sql/ha_partition.cc:
Manual merge of 5.1.22 changes into main.
in following tests.
mysql-test/suite/rpl/r/rpl_bug31076.result:
Result file change.
mysql-test/suite/rpl/t/rpl_bug31076.test:
Dropping database so that following tests don't see it.
Row-based replication crashes when replicating from pre-5.1.22 to 5.1.22
due to an uninitialized variable.
sql/log_event.cc:
Initializing m_null_bits to null so that it can be detected that it
was not initialized later.
mysql-test/suite/rpl/r/rpl_bug31076.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_bug31076.result''
mysql-test/suite/rpl/t/rpl_bug31076.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_bug31076.test''
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test:
calling included file with testing bug#27417,23333. bug#28960 is not an rbr bug.
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
moved SF() with side effects bugs to a separate includable file.
This test verifies STMT format whereas binlog_row test is reposible for
ROW format.
mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test:
sourced part for bugs with SF() etc having side effects of midifying
non-transactional tables.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed due to
1. tt table made temporary is it's supposed to;
2. show master status is turned into binlog pos masking-out macro
3. merge defect for select_insert::abort()
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
masking-out binlog postions in the results via
source include/show_binlog_events.inc;
sql/sql_insert.cc:
merging defect in not applied hunk for select_insert::abort() is fixed
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
follow-up of the previous manual resolve. The snippet is moved into the heading
file.
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
results changed
mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test:
removing explicit offsets from report;
appending bug#27417,23333,28960 related snippet, addressing left TODO:s.
mysql-test/suite/rpl/r/rpl_packet.result:
results changed
mysql-test/suite/rpl/t/rpl_packet.test:
fixing row/stmt compatibility with #-ing out unneeded values
into trift2.:/MySQL/M51/push-5.1
config/ac-macros/misc.m4:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
Merge with 5.0-opt.
mysql-test/r/binlog_unsafe.result:
Merge with 5.0-opt.
mysql-test/r/events_bugs.result:
Merge with 5.0-opt.
mysql-test/r/events_trans.result:
Merge with 5.0-opt.
mysql-test/r/sp.result:
Merge with 5.0-opt.
mysql-test/r/sp_gis.result:
Merge with 5.0-opt.
mysql-test/r/xml.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_incident.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
Merge with 5.0-opt.
mysql-test/suite/rpl/r/rpl_udf.result:
Merge with 5.0-opt.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_gis.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_row_format.result:
Merge with 5.0-opt.
mysql-test/suite/ndb/r/ndb_single_user.result:
Merge with 5.0-opt.
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
mysql-test/suite/ndb/r/ndb_lock_table.result:
Added a new test case for bug30996
mysql-test/suite/ndb/t/ndb_lock_table.test:
Added a new test case for bug30996
sql/ha_ndbcluster.cc:
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
sql/ha_ndbcluster.h:
New functions and merged variables
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
Fix test results for pushbuild
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
Fix test results for pushbuild
storage/innobase/handler/ha_innodb.cc:
resolve a VSC++ typecast compile warning.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/log_event_old.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/suite/rpl/t/disabled.def:
Manual merge
mysql-test/suite/rpl_ndb/t/disabled.def:
Manual merge
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/sql_yacc.yy:
Manual merge
"Rows not deleted from innodb partitioned tables if --innodb_autoinc_lock_mode=0"
Due to a previous bugfix which initializes a previously uninitialized
variable, ha_partition::get_auto_increment() may fail to operate
correctly when the storage engine reports that it is only reserving
one value and one or more partitions have a different 'next-value'.
Currently, only affects Innodb's new-style auto-increment code which
reserves larger blocks of values and has less inter-thread contention.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
Fix results - previous results shows symptoms of Bug30919
sql/ha_partition.cc:
Bug30919
ha_partition::write_row()
Do not insert a row if a failure occurred while generating
auto-increment value.
ha_partition::get_auto_increment()
If there is an empty 'intersection' of auto-increment values, perform
a second pass before failing because partitions may have different
auto-increment 'next-value' attributes.
storage/innobase/handler/ha_innodb.cc:
Bug30919
Only set *first_value if it is less than autoinc value. This allows
a higher value to be hinted when operating as a partitioned table.
mysql-test/suite/rpl/r/rpl_innodb_bug30919.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30919.result''
mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug30919.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30919.test''
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
Bug#28430
"Failure in replication of innodb partitioned tables on row/mixed format"
Bug#30888
"Innodb table + stored procedure + row deletion = server crash"
Apply Oracle patch from Sunny
Include tests cases by Omer
Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
it already performs same check.
Make autoinc_lock_mode variable read-only for duration of running mysqld process.
storage/innobase/handler/ha_innodb.cc:
Bug30907/28430
"Regression: "--innodb_autoinc_lock_mode=0" (off) not same as older releases"
"Failure in replication of innodb partitioned tables on row/mixed format"
Apply Oracle patch from Sunny
Ensure that innobase_read_and_init_auto performs table autoinc lock when lock_mode = 0
No need for "if" guard around row_unlock_table_autoinc_for_mysql() because
it already performs same check.
Make autoinc_lock_mode variable read-only for duration of running mysqld process.
storage/innobase/row/row0sel.c:
Bug30888
"Innodb table + stored procedure + row deletion = server crash"
Remove endian-specific code.
Fix function row_search_autoinc_read_column() to handle any integer size up to 8 bytes.
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug28430.result''
mysql-test/suite/rpl/r/rpl_innodb_bug30888.result:
New BitKeeper file ``mysql-test/suite/rpl/r/rpl_innodb_bug30888.result''
mysql-test/suite/rpl/t/rpl_innodb-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt''
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430.test''
mysql-test/suite/rpl/t/rpl_innodb_bug30888.test:
New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug30888.test''
- Updated row help count information
- Added missing 'order by' clauses (altrady fixed in build tree)
- Fixed isses with ndb_storeproc06/10 tests (added use database)
- Corrected use of wrong engine in ndb tests (already fixed in build tree)
- Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree)
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Correction of wrong engine used for ndb test
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_cursors.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_10.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
Updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
Updated result file
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Updated test file enforcing 'use database' after connect
mysql-test/suite/funcs_1/views/views_master.inc:
Adding order by clauses in missing places
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/Makefile.am:
Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
test case for endian test
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
into ibm.opbmk:/home/alik/Documents/MySQL/devel/5.1-rt-bug25843
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
of statement breaks binlog.
There were two problems discovered by this bug:
1. Default (current) database is not fixed at the creation time.
That leads to wrong output of DATABASE() function.
2. Database attributes (@@collation_database) are not fixed at
the creation time. That leads to wrong resultset.
Binlog breakage and Query Cache wrong output happened because of
the first problem.
The fix is to remember the current database at the PREPARE-time and
set it each time at EXECUTE.
mysql-test/include/query_cache_sql_prepare.inc:
The first part of the test case for BUG#25843.
mysql-test/r/query_cache_ps_no_prot.result:
Update result file.
mysql-test/r/query_cache_ps_ps_prot.result:
Update result file.
mysql-test/suite/rpl/r/rpl_ps.result:
Update result file.
mysql-test/suite/rpl/t/rpl_ps.test:
The second part of the test case for BUG#25843.
sql/mysql_priv.h:
Added mysql_opt_change_db() prototype.
sql/sp.cc:
1. Polishing;
2. sp_use_new_db() has been removed;
3. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sp.h:
sp_use_new_db() has been removed.
This function has nothing to do with a) sp and b) *new* database.
It was merely "switch the current database if needed".
sql/sp_head.cc:
1. Polishing.
2. Use mysql_opt_change_db() instead of sp_use_new_db().
sql/sql_class.cc:
Move THD::{db, db_length} into Statement.
sql/sql_class.h:
Move THD::{db, db_length} into Statement.
sql/sql_db.cc:
Introduce mysql_opt_change_db() as a replacement (and inspired by)
sp_use_new_db().
sql/sql_prepare.cc:
1. Remember the current database in Prepared_statement::prepare().
2. Switch/restore the current database in Prepared_statement::execute().
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
client/mysql.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
mysql-test/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
Auto merged
into sita.local:/Users/tsmith/m/bk/maint/51
sql/field.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/slave.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
sql/log_event.cc:
Manual merge
sql/log_event.h:
Manual merge
sql/log_event_old.h:
Manual merge
sql/rpl_record.cc:
Manual merge
sql/slave.cc:
Manual merge
Bug#21422 GRANT/REVOKE possible inside stored function, probably in a trigger
Bug#17244 GRANT gives strange error message when used in a stored function
GRANT/REVOKE statements are non-transactional (no explicit transaction
boundaries) in nature and hence are forbidden inside stored functions and
triggers, but they weren't being effectively forbidden. Furthermore, the
absence of implict commits makes changes made by GRANT/REVOKE statements to
not be rolled back.
The implemented fix is to issue a implicit commit with every GRANT/REVOKE
statement, effectively prohibiting these statements in stored functions
and triggers. The implicit commit also fixes the replication bug, and looks
like being in concert with the behavior of DDL and administrative statements.
Since this is a incompatible change, the following sentence should be
added to the Manual in the very end of the 3rd paragraph, subclause
13.4.3 "Statements That Cause an Implicit Commit": "Beginning with
MySQL 5.0.??, the GRANT and REVOKE statements cause an implicit commit."
Patch contributed by Vladimir Shebordaev
mysql-test/r/sp-error.result:
Test case result for Bug#17244
mysql-test/t/sp-error.test:
Test case for Bug#17244
sql/sp_head.cc:
Set that a procedure with GRANT/REVOKE command has a (implicit or explicit)
commit.
sql/sql_parse.cc:
End active transaction in SQLCOM_GRANT and SQLCOM_REVOKE, and thus effectively
prohibit these statements in stored functions and triggers. An implicit commit
also fixes a bug in replication, when GRANT or REVOKE would disappear from the
binary log in case of a subsequent ROLLBACK, since they were considered
transactional statements.
mysql-test/suite/rpl/r/rpl_binlog_grant.result:
Add test case result for Bug#21975
mysql-test/suite/rpl/t/rpl_binlog_grant.test:
Add test case for Bug#21975
ChangeSet@1.2509, 2007-08-28
http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
Character sets depend on
configuration
mysql-test/suite/funcs_1/README.txt:
Improved README
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Additions for the NDB variant (currently not in use)
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Write a comment about Bug#30689 into the test protocols.
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
Fix for a not reported bug.
The missing revoke usage and drop user harmed the next test.
mysql-test/suite/funcs_1/r/a_processlist_priv_no_prot.result:
Updated results
mysql-test/suite/funcs_1/r/b_processlist_priv_ps.result:
Updated results
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/ndb__datadict.result:
Updated results as far as they could be corrected.
Attention:
This test failed even before the current bug fixes.
The updated expected results are now better than before,
but they do not prevent that the test fails.
It looks like one script is "damaged" and treats
this NDB test different than expected within the
file with expected results.
The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in
statement based replication.
Added code to declare them as such and switch the statement they're in
to row based logging for mixed mode.
sql/item_create.cc:
Bug #30244: row_count/found_rows does not replicate well
- add the functions to the set of "unsafe functions"
for statement based replication
mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result:
BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/r/rpl_row_unsafe_funcs.result
mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test:
BitKeeper file /home/kgeorge/mysql/work/B30244-5.1-opt/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
ChangeSet@1.2509, 2007-08-28
http://lists.mysql.com/commits/33239
Fixes for the funcs_1 datadict test bugs
#30418 "datadict" tests (all engines) fail:
Dependency on the host name for ordering
#30420 "datadict" tests (all engines) fail:
Release build has help tables loaded
#30438 "{memory,myisam,ndb}__datadict" tests fail:
Use "InnoDB" without checking
#30440 "datadict" tests (all engines) fail:
Character sets depend on
configuration
There are more post merge fixes needed.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Post merge fix for
ChangeSet@1.2509, 2007-08-28
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated results
mysql-test/suite/funcs_1/t/ndb__datadict.test:
Adjusted script
into four.local.lan:/WORK2/merge/mysql-5.1-build-datadict
It is to be expected that a post merge fix is needed.
mysql-test/suite/funcs_1/README.txt:
Auto merged
mysql-test/suite/funcs_1/t/innodb__datadict.test:
Auto merged
mysql-test/suite/funcs_1/t/memory__datadict.test:
Auto merged
mysql-test/suite/funcs_1/t/myisam__datadict.test:
Auto merged
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
Manual merge
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Manual merge
mysql-test/suite/funcs_1/r/memory__datadict.result:
Manual merge
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Manual merge
Bug#30418 "datadict" tests (all engines) fail: Dependency on the host name
for ordering
Bug#30420 "datadict" tests (all engines) fail: Release build has help tables loaded
Bug#30438 "{memory,myisam,ndb}__datadict" tests fail: Use "InnoDB" without checking
Bug#30440 "datadict" tests (all engines) fail: Character sets depend on configuration
Attention: Only the build team can check if Bug#30440 is really fixed.
mysql-test/suite/funcs_1/README.txt:
Update README
mysql-test/suite/funcs_1/datadict/datadict_master.inc:
1. Exclude the help tables from the INFORMATION_SCHEMA.TABLES
and the INFORMATION_SCHEMA.STATISTICS selects.
2. Replace error numbers with error names
3. Sort some results with mysqltest builtin function
4. Some other minor changes
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated expected results
mysql-test/suite/funcs_1/t/innodb__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/memory__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/t/myisam__datadict.test:
Add $OTHER_ENGINE_TYPE variable which is used in data_dict_master.inc.
mysql-test/suite/funcs_1/r/datadict_help_tables_build.result:
File with expected results
mysql-test/suite/funcs_1/r/datadict_help_tables_dev.result:
File with expected results
mysql-test/suite/funcs_1/t/datadict_help_tables_build.test:
Additional test checking the information about the help tables within
INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
as compensation for the removed checks within datadict_master.inc.
Variant for use during build tests (non empty help tables)
mysql-test/suite/funcs_1/t/datadict_help_tables_dev.test:
Additional test checking the information about the help tables within
INFORMATION_SCHEMA.TABLES/INFORMATION_SCHEMA.STATISTICS
as compensation for the removed checks within datadict_master.inc.
Variant for use during development tests (empty help tables)
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/ndb/r/ndb_restore.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
extra/yassl/include/openssl/crypto.h:
Auto merged
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/include/yassl_int.hpp:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
extra/yassl/src/yassl_int.cpp:
Auto merged
vio/viossl.c:
Auto merged
mysql-test/suite/rpl/t/rpl_ssl.test:
Merge 5.0->5.1
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/partition_pruning.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
Auto merged
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_relayspace.test:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Auto merged
mysql-test/t/select.test:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/time.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
manual merge (use remote)
mysql-test/suite/rpl/t/disabled.def:
Manual merge - both rpl_innodb_mixed_ddl and rpl_innodb_mixed_dml
are fixed, and should be run as part of the rpl suite.
Update some tests in the "parts" suite, so they're skipped if the
requisite plugins are not present in the mysqld.
mysql-test/suite/parts/t/partition_char_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_datetime_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_decimal_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_float_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_int_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/partition_special_innodb.test:
Skip if mysqld doesn't include InnoDB support
mysql-test/suite/parts/t/rpl_partition.test:
Skip if mysqld doesn't include partition support
Bug #30316: Some "parts" tests fail because the server uses "--secure-file-priv"
Bug #30341: Test suite "parts" needs to be adapted to the new rules disallowing many functio
Bug #30408: Suite "parts" needs bug numbers updated
Bug #30411: Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Bug #30581: partition_value tests use disallowed CAST() function
Included are some general fixes to allow the "parts" test suite to be run
successfully. This includes disabling a few tests or parts of tests,
cleaning up the test cases and their results, etc. Basically, these tests
have not been run for some time, and had suffered some bit rot.
The bugs were fixed as a single changeset, because in some ways they depend
on each other. I couldn't be sure I'd updated all the error codes (for
bugs 30408 and 30411) without also adapting to the new allowed functions
rules (bug 30341), and vice versa.
mysql-test/include/partition_layout.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/part_blocked_sql_funcs_main.inc:
Add ASCII(), ORD() and WEEKOFYEAR() as blocked functions (they depend
too much on character set, etc.).
Remove DATEDIFF() as a blocked function (it is implemented in terms
of TO_DAYS() and the minus operator).
mysql-test/suite/parts/inc/part_supported_sql_funcs_main.inc:
Remove ASCII(), ORD() and WEEKOFYEAR(), which are not allowed functions.
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING on non-integer fields, due to
Bug 30577.
Test MOD() with an integer field instead of floating point (it has a
hybrid result type, like FLOOR() and CEILING(), but makes sense to use
with an integer field).
Add DATEDIFF() as an allowed function, because it is implemented in
terms of TO_DAYS() and the minus operator.
mysql-test/suite/parts/inc/partition_alter3.inc:
Remove use of disallowed CAST() function in partitioning
mysql-test/suite/parts/inc/partition_blocked_sql_funcs.inc:
The blocked functions are actually blocked now, so expect errors.
This is a result of the fix for bug 18198.
mysql-test/suite/parts/inc/partition_date.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_datetime.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
mysql-test/suite/parts/inc/partition_decimal.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_directory.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_double.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_enum.inc:
Remove use of CAST(), which is disallowed.
Remove test which relies on CAST().
mysql-test/suite/parts/inc/partition_float.inc:
Remove uses of CAST() in partitioning functions - it is not allowed.
Disable testing of FLOOR() and CEILING(), due to Bug 30577.
mysql-test/suite/parts/inc/partition_layout_check1.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_layout_check2.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_methods1.inc:
Ensure that the contents of $MYSQLTEST_VARDIR are not in the result file
mysql-test/suite/parts/inc/partition_set.inc:
Remove test which relies on CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_supported_sql_funcs.inc:
Fix Bug #30576: part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Move data files into std_data/parts/*, so they can be used with LOAD
DATA INFILE '../std_data_ln/parts/*' while --secure-file-priv is in
force.
mysql-test/suite/parts/inc/partition_syntax.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_time.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_timestamp.inc:
Remove use of CAST(), which is disallowed.
mysql-test/suite/parts/inc/partition_value.inc:
Disable this entire test file, because it relies on using CAST() as
a partitioning function, which is disallowed. See Bug 30581,
"partition_value tests use disallowed CAST() function".
mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result:
Update test case results
mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result:
Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_innodb.result:
Update test case results
mysql-test/suite/parts/r/part_supported_sql_func_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_alter3_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_alter3_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_basic_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_basic_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_datetime_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_datetime_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_decimal_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_decimal_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_float_myisam.result:
Update test case results
mysql-test/suite/parts/r/partition_syntax_innodb.result:
Update test case results
mysql-test/suite/parts/r/partition_syntax_myisam.result:
Update test case results
mysql-test/suite/parts/t/disabled.def:
Mark several more tests as disabled: partition_value_myisam,
partition_value_innodb, part_supported_sql_func_ndb,
rpl_ndb_dd_partitions, and partition_float_innodb
mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_ch1.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_ch1.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_date.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_date.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_float.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_float.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_int.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_int.inc
mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc:
Rename: mysql-test/suite/parts/inc/part_supported_sql_funcs_int_time.inc -> mysql-test/std_data/parts/part_supported_sql_funcs_int_time.inc
mysql-test/suite/parts/inc/partition_alter_1.inc:
Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_check.inc:
Correct expected error codes, which changed due to bug 29245.
mysql-test/suite/parts/inc/partition_syntax_1.inc:
Correct expected error codes, which changed due to bug 29245.
Bug#29020 Event results not correctly replicated to slave in RBR: partially.
mysql-test/suite/rpl/r/rpl_invoked_features.result:
Updated result file.
mysql-test/suite/rpl/t/disabled.def:
removed test cases: rpl_invoked_features and rpl_innodb_mixed_* (alreade were commented out)
mysql-test/suite/rpl/t/rpl_invoked_features.test:
Added comments, implemented the waiting via include/wait_condition, minor fixes.
sql/field.cc:
- always pack in little endian, irrespective of starage engine native format
- always unpack as if it is atored in little endian, and unpack it to storage engine native format
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-rpl
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_record.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/log_event.cc:
Manual merge.
sql/log_event.h:
Manual merge.
sql/log_event_old.h:
Manual merge.
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves).
mysql-test/suite/rpl/r/rpl_timezone.result:
repush of Bug 29536 for 5.1.22 tree: test case
mysql-test/suite/rpl/t/rpl_timezone.test:
repush of Bug 29536 for 5.1.22 tree: test case
sql/field.cc:
re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
(so it apples to errors as well).
sql/time.cc:
re-push of Bug 29536 for 5.1.22: move setting of the flag before the operation
(so it apples to errors as well).
A test case was waiting for a fixed number of seconds for a specific
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead
(or timeout).
mysql-test/suite/rpl/t/rpl_relayspace.test:
recommit of Bug 25228 for 5.1.22: fixed test case
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/rpl_record.cc:
Auto merged
sql/rpl_rli.h:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
using TPC-B):
Problem: A RBR event can contain incomplete row data (only key value and
fields which have been changed). In that case, when the row is unpacked
into record and written to a table, the missing fields get incorrect NULL
values leading to master-slave inconsistency.
Solution: Use values found in slave's table for columns which are not given
in the rows event. The code for writing a single row uses the following
algorithm:
1. unpack row_data into table->record[0],
2. try to insert record,
3. if duplicate record found, fetch it into table->record[0],
4. unpack row_data into table->record[0],
5. write table->record[0] into the table.
Where row_data is the row as stored in the data area of a rows event.
Thus:
a) unpacking of row_data happens at the time when row is written into
a table,
b) when unpacking (in step 4), only columns present in row_data are
overwritten - all other columns remain as they were found in the table.
Since all data needed for the above algorithm is stored inside
Rows_log_event class, functions which locate and write rows are turned
into methods of that class.
replace_record() -> Rows_log_event::write_row()
find_and_fetch_row() -> Rows_log_event::find_row()
Both methods take row data from event's data buffer - the row being
processed is pointed by m_curr_row. They unpack the data as needed into
table's record buffers record[0] or record[1]. When row is unpacked,
m_curr_row_end is set to point at next row in the data buffer.
Other changes introduced in this changeset:
- Change signature of unpack_row(): don't report errors and don't
setup table's rw_set here. Errors can happen only when setting default
values in prepare_record() function and are detected there.
- In Rows_log_event and derived classes, don't pass arguments to
the execution primitives (do_...() member functions) but use class
members instead.
- Move old row handling code into log_event_old.cc to be used by
*_rows_log_event_old classes.
Also, a new test rpl_ndb_2other is added which tests basic replication
from master using ndb tables to slave storing the same tables using
(possibly) different engine (myisam,innodb).
Test is based on existing tests rpl_ndb_2myisam and rpl_ndb_2innodb.
However, these tests doesn't work for various reasons and currently are
disabled (see BUG#19227).
The new test differs from the ones it is based on as follows:
1. Single test tests replication with different storage engines on slave
(myisam, innodb, ndb).
2. Include file extra/rpl_tests/rpl_ndb_2multi_eng.test containing
original tests is replaced by extra/rpl_tests/rpl_ndb_2multi_basic.test
which doesn't contain tests using partitioned tables as these don't work
currently. Instead, it tests replication to a slave which has more or
less columns than master.
3. Include file include/rpl_multi_engine3.inc is replaced with
include/rpl_multi_engine2.inc. The later differs by performing slightly
different operations (updating more than one row in the table) and
clearing table with "TRUNCATE TABLE" statement instead of "DELETE FROM"
as replication of "DELETE" doesn't work well in this setting.
4. Slave must use option --log-slave-updates=0 as otherwise execution of
replication events generated by ndb fails if table uses a different
storage engine on slave (see BUG#29569).
sql/log_event.cc:
- Initialization of new Rows_log_event members.
- Fixing some typos in documentation.
In Rows_log_event::do_apply_event:
- Set COMPLETE_ROWS_F flag (when master and slave have the same number of
columns and all colums are present in the row)
- Move initialization of tables write/read sets here, outside the rows
processing loop (and out of unpack_row() function).
- Remove calls to do_prepare_row() - no longer needed.
- Add code managing m_curr_row and m_curr_row_end pointers.
- Change signatures of row processing methods of Rows_log_event and it
descendants - now most arguments are taken from class members.
- Remove do_prepare_row() methods which are no longer used.
- The auto_afree_ptr template is moved to rpl_utility.h (so that it can
be used in log_event_old.cc).
- Removed copy_extra_fields() function - no longer used.
In Rows_log_event::write_row (former replace_record):
- The old code is moved to log_event_old.cc.
- Use prepare_record() and non-destructive unpack_current_row() to fill record
with data.
- In case a record being inserted already exists on slave and row data is
incomplete use the record found and non-destructive unpack_current_row() to
combine new column values with existing ones.
- More debug info added.
In Rows_log_event::find_row (former find_and_fetch_row function):
- The old code is moved to log_event_old.cc.
- Unpacking of the row is moved here.
- In case of search using PK, the key data is prepared here.
- More debug info added.
- Remove initialization of Rows_log_event::m_after_image buffer which is no
longer used.
- Use new row unpacking methods in Update_rows_log_event::do_exec_row() to
create before and after image.
Note: all existing code used by Rows_log_event::do_apply_event() has been moved
to log_event_old.cc to be used by *_rows_log_event_old classes.
sql/log_event.h:
- Add new COMPLETE_ROWS_F flag in Rows_log_event.
- Add Rows_log_event members describing the row being processed.
- Add a pointer to key buffer which is used in derived classes.
- Add new methods: find__row(), write_row() and unpack_current_row().
- Change signatures of do_...() methods (replace method arguments by
class members).
- Remove do_prepare_row() method which is no longer used.
- Update method documentation.
- Add Old_rows_log_event class, which contains the old row processing code, as
a friend of Rows_log_event so that it can access all members of an event
instance.
sql/log_event_old.cc:
Move here old implementation of Rows_log_event::do_apply_event() and
helper methods.
sql/log_event_old.h:
- Define new class Old_rows_log_event encapsulating old version of
Rows_log_event::do_apply_event() and the helper methods.
- Add the Old_rows_log_event class as a base for *_old versions of RBR event
classes, ensure that the old version of do_apply_event() is called.
- For *_old classes, declare the helper methods used in the old version of
do_apply_event().
sql/rpl_record.cc:
- Make unpack_row non-destructive for columns not present in the row.
- Don't fill read/write set here as it is done outside these functions.
- Move initialization of a record with default values to a separate
function prepare_record().
sql/rpl_record.h:
- Change signature of unpack_row().
- Declare function prepare_record().
sql/rpl_utility.cc:
Make tabe_def::calc_field_size() a const method.
sql/rpl_utility.h:
Make table_def::calc_field_size() a const method.
Move auto_afree_ptr template here so that it can be re-used (currently
in log_event.cc and log_event_old.cc). Similar with DBUG_PRINT_BITSET
macro.
mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test:
Modification of rpl_ndb_2multi_eng test. Tests with partitioned tables
are removed and a setup with slave having different number of columns
than master is added.
mysql-test/include/rpl_multi_engine2.inc:
Modification of rpl_multi_engine3.inc which operates on more rows and
replaces "DELETE FROM t1" with "TRUNCATE TABLE t1" as the first form
doesn't replicate in NDB -> non-NDB setting (BUG#28538).
mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result:
Results of the test.
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other-slave.opt:
Test options. --log-slave-updates=0 is compulsory as otherwise non-NDB
slave applying row events from NDB master will fail when trying to log
them.
mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test:
Test replication of NDB table to slave using other engine. The main test
is in extra/rpl_tests/rpl_ndb_2multi_basic.test. It is included here
several times with different settings of default storage engine on slave.
mysql-test/suite/rpl/include/rpl_mixed_ddl.inc:
updated main test for DDL
mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
updated main test for DML
mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
updated result file
mysql-test/suite/rpl/t/disabled.def:
updated disabled.def
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
sql/field.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/set_var.cc:
Auto merged
into trift2.:/MySQL/M51/push-5.1
Includes manual merges.
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
Auto merged
sql/field.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event_old.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/status.result:
Manual merge of two incompatible fixes to test "status".
mysql-test/t/status.test:
Manual merge of two incompatible fixes to test "status".
sql/log_event.cc:
Manual merge.
sql/log_event.h:
Manual merge.
Updated test case to correst inconsistant results on different OS per #bug30559
mysql-test/suite/ndb/t/ndb_dd_ddl.test:
Updated test case to correst inconsistant results on different OS per #bug30559
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
Updated test case to correst inconsistant results on different OS per #bug30559
