mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
2 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
62554f812e |
This is the final commit for Worklog tasks:
* A more dynamic binlog format which allows small changes (1064)
* Log session variables in Query_log_event (1063)
It contains a few bugfixes (which I made when running the testsuite).
I carefully updated the results of the testsuite (i.e. I checked for every one,
if the difference between .reject and .result could be explained).
Apparently mysql-test-run --manager is broken in 4.1 and 5.0 currently,
so I could neither run the few tests which require --manager, nor check
that they pass nor modify their .result. But for builds, we don't run
with --manager.
Apart from --manager, the full testsuite passes, with Valgrind too (no errors).
I'm going to push in the next minutes. Remains: update the manual.
Note: by chance I saw that (in 4.1, in 5.0) rpl_get_lock fails when run alone;
this is normal at it makes assumptions on thread ids. I will fix this one day
in 4.1.
mysql-test/r/rpl000015.result:
result update
mysql-test/r/rpl_change_master.result:
result update
mysql-test/r/rpl_error_ignored_table.result:
result update
mysql-test/r/rpl_flush_log_loop.result:
result update
mysql-test/r/rpl_flush_tables.result:
result update
mysql-test/r/rpl_loaddata.result:
result update
mysql-test/r/rpl_loaddata_rule_m.result:
result update
mysql-test/r/rpl_loaddata_rule_s.result:
result update
mysql-test/r/rpl_log.result:
result update
mysql-test/r/rpl_log_pos.result:
result update
mysql-test/r/rpl_max_relay_size.result:
result update
mysql-test/r/rpl_relayrotate.result:
result update
mysql-test/r/rpl_replicate_do.result:
result update
mysql-test/r/rpl_reset_slave.result:
result update
mysql-test/r/rpl_rotate_logs.result:
result update
mysql-test/r/rpl_session_var.result:
result update
mysql-test/r/rpl_temporary.result:
result update
mysql-test/r/rpl_trunc_binlog.result:
result update
mysql-test/r/rpl_until.result:
result update
mysql-test/r/rpl_user_variables.result:
result update
mysql-test/t/rpl000010-slave.opt:
need to wait 2 events, because now we receive a Format_desc on top of the Rotate,
when replication starts.
mysql-test/t/rpl000015.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_change_master.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_empty_master_crash.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_error_ignored_table.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_flush_log_loop.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_loaddata.test:
position update
mysql-test/t/rpl_loaddata_rule_m.test:
position update
mysql-test/t/rpl_loaddata_rule_s.test:
position update
mysql-test/t/rpl_log.test:
position update
mysql-test/t/rpl_log_pos.test:
position update
mysql-test/t/rpl_max_relay_size.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_openssl.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_redirect.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_relayrotate-slave.opt:
better options for this test
mysql-test/t/rpl_relayrotate.test:
using max() is better for debugging (it shows at which place the slave
SQL thread resumed)
mysql-test/t/rpl_replicate_do.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_reset_slave.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_rotate_logs.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_session_var.test:
100 because password() is longer than 10 chars
mysql-test/t/rpl_trunc_binlog.test:
relay log information is not repeatable in general (if a reconnection
happens because --sleep=10 for example), so we hide these columns.
mysql-test/t/rpl_until.test:
position update
mysql-test/t/rpl_user_variables.test:
position update
sql/log.cc:
Ensure that the Format_desc propagated on next relay logs does not trigger
undue actions (like incrementing some positions or clearing some files).
sql/log_event.cc:
* When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
a transaction (then these were written by the slave itself to its relay log),
it should not increment rli->group* variables, but only rli->event* ones.
* When the slave SQL thread finds a Format_desc not to be ignored (not
the same server id as the slave's), if it has log_pos==0 it must not trigger
"unfinished transaction in master's binlog" (log_pos==0 is always a marker
in the relay log to mean "this event was not at this place in the master's
binlog": it's for fake Rotate events, and for Format_description events which the master had
to send us for replication to start).
* In the Query_log_event on disk, catalog is now terminated by '\0'.
* thd->catalog must be set to 0 when some exec_event() terminate (otherwise
double free).
sql/slave.cc:
* Fixes for a few bugs when ignoring events in the slave SQL thread:
- do not decrement rli->slave_skip_counter if the event is an event
related to the binlog or relay log itself (FORMAT_DESCRIPTION,
ROTATE, STOP) because these events should never be skipped (or the slave
will be confused). Usually the user wants to skip a query, not a Rotate...
- when we (re)connect to the master, we must free description_event_for_queue
(otherwise memory leak when we reconnect).
* Changed a bit the code where we change description_event_for_queue,
to make it look "safer".
* Moved 'created=0' to log.cc where it is safer.
* When the slave SQL thread finds a Rotate/Format_desc/Stop in the middle of
a transaction (then these were written by the slave itself to its relay log),
it should not increment rli->group* variables, but only rli->event* ones.
sql/sql_class.h:
a warning comment
sql/sql_repl.cc:
A mistake: I had passed a char* instead of char**
|
||
|
unknown
|
1a60318560 |
fixed up mysql-test - will not push this yet, as more clean up/testing is to follow
BitKeeper/deleted/.del-README~b8e00a1b57b91f69: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~2bddc2706d0834d0: ***MISSING WEAVE*** mysql-test/r/alt000001.result: mvdir mysql-test/r/ins000001.result: mvdir mysql-test/r/rpl000001.a.result: mvdir mysql-test/r/rpl000001.b.result: mvdir mysql-test/r/rpl000002.result: mvdir mysql-test/r/rpl000003.result: mvdir mysql-test/r/rpl000004.a.result: mvdir mysql-test/r/rpl000004.b.result: mvdir mysql-test/r/rpl000005.result: mvdir mysql-test/r/rpl000006.result: mvdir mysql-test/r/rpl000007.result: mvdir mysql-test/r/rpl000008.result: mvdir mysql-test/r/rpl000009.result: mvdir mysql-test/r/rpl000010.result: mvdir mysql-test/r/rpl000011.result: mvdir mysql-test/r/rpl000012.result: mvdir mysql-test/r/rpl000012.status.result: mvdir mysql-test/r/rpl000013.result: mvdir mysql-test/r/rpl000013.status.result: mvdir mysql-test/r/sel000001.result: mvdir mysql-test/r/sel000002.result: mvdir mysql-test/r/sel000003.result: mvdir mysql-test/r/sel000004.result: mvdir mysql-test/r/sel000005.result: mvdir mysql-test/r/sel000006.result: mvdir mysql-test/r/sel000007.result: mvdir mysql-test/r/sel000008.result: mvdir mysql-test/r/sel000009.result: mvdir mysql-test/r/sel000010.result: mvdir mysql-test/r/sel000011.result: mvdir mysql-test/r/sel000012.result: mvdir mysql-test/r/sel000013.result: mvdir mysql-test/r/sel000014.result: mvdir mysql-test/r/sel000015.result: mvdir mysql-test/r/sel000016.result: mvdir mysql-test/r/sel000017.result: mvdir mysql-test/r/sel000018.result: mvdir mysql-test/r/sel000019.result: mvdir mysql-test/r/sel000020.result: mvdir mysql-test/r/sel000021.result: mvdir mysql-test/r/sel000022.result: mvdir mysql-test/r/sel000023.result: mvdir mysql-test/r/sel000024.result: mvdir mysql-test/r/sel000025.result: mvdir mysql-test/r/sel000026.result: mvdir mysql-test/r/sel000027.result: mvdir mysql-test/r/sel000028.result: mvdir mysql-test/r/sel000029.result: mvdir mysql-test/r/sel000030.result: mvdir mysql-test/r/sel000100.result: mvdir mysql-test/r/shw000001.result: mvdir mysql-test/t/README: mvdir mysql-test/t/err000001.test: mvdir mysql-test/t/rpl000007-slave.opt: mvdir mysql-test/t/rpl000008-slave.opt: mvdir mysql-test/t/rpl000009-slave.opt: mvdir mysql-test/t/rpl000010-slave.opt: mvdir mysql-test/t/rpl000013-slave.opt: mvdir BitKeeper/deleted/.del-start-mysqld~9c8f21a7ab97793a: ***MISSING WEAVE*** BitKeeper/deleted/.del-stop-mysqld~89a1194045f05d1c: ***MISSING WEAVE*** BitKeeper/deleted/.del-translate-tests~3869c1fdf0a5ea1a: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~108667adaeabe3f5: ***MISSING WEAVE*** BitKeeper/deleted/.del-README~c5aaceda4c2b1a8: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-key.master~e6b83af25df0ce5: ***MISSING WEAVE*** mysql-test/std_data/words.dat: Rename: mysql-test/std_data/words -> mysql-test/std_data/words.dat BitKeeper/deleted/.del-simple-select.master~6f3eb98812926caf: ***MISSING WEAVE*** Makefile.am: add mysql-test to distribution configure.in: added mysql-test libmysql/Makefile.am: include hash.h libmysql/Makefile.shared: add hash to libmysqlclient mysql-test/Makefile.am: mysql-test is now in source dist also mysql-test/chew_on_this/select.res: ***MISSING WEAVE*** mysql-test/install_test_db: renamed file, moved to different directory, and fixed up to work on binary dist mysql-test/mysql-test-run: clean-up of test suite, make it work on binary dist mysql-test/t/alt000001.test: moved directory mysql-test/t/ins000001.test: moved directory mysql-test/t/rpl000001.test: moved dir mysql-test/t/rpl000002.test: moved dir mysql-test/t/rpl000003.test: moved dir mysql-test/t/rpl000004.test: moved dir mysql-test/t/rpl000005.test: moved dir mysql-test/t/rpl000006.test: moved dir mysql-test/t/rpl000007.test: moved dir mysql-test/t/rpl000008.test: moved dir mysql-test/t/rpl000009.test: moved dir mysql-test/t/rpl000010.test: moved dir mysql-test/t/rpl000011.test: moved dir mysql-test/t/rpl000012.test: moved dir mysql-test/t/rpl000013.test: moved dir mysql-test/t/sel000001.test: moved dir mysql-test/t/sel000002.test: moved dir BitKeeper/etc/ignore: Added libmysql_r/hash.c scripts/mysql-3.23.29-gamma-pc-linux-gnu-i686.tar.gz to the ignore list mysql-test/t/sel000003.test: moved dir mysql-test/t/sel000004.test: moved dir mysql-test/t/sel000005.test: moved dir mysql-test/t/sel000100.test: moved dir mysql-test/t/shw000001.test: moved dir scripts/make_binary_distribution.sh: fixes to include mysql-test added -debug option to exit after building temp dir before tar.gz removed a bunch of SCCS files |
Renamed from mysql-test/t/3.23/rpl000010-slave.opt (Browse further)