mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52879 commits 2793 branches 343 tags 1.7 GiB
Commit graph

52879 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.mysql.com
457283d5ab Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-02-22 11:44:31 +01:00
mkindahl@dl145h.mysql.com
924ff2621e Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-21 09:04:25 +01:00
mkindahl@dl145h.mysql.com
802158bda5 Fixing result after merge. 2008-02-21 06:29:35 +01:00
aelkin/andrei@mysql1000.(none)
49915eb88a Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
 2008-02-20 23:25:01 +02:00
aelkin/andrei@mysql1000.(none)
7e93d94ce5 Bug #31316 Report server id clashes in SHOW SLAVE STATUS 
"Server_IO_State" field

Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.

Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with 
deploying rli->report().

The test for the bug covers only --replicate-same-server-id error reporting.
 2008-02-20 23:18:01 +02:00
mkindahl@dl145h.mysql.com
759d2f6658 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-20 19:49:26 +01:00
mkindahl@dl145h.mysql.com
a71f298f2a Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-20 19:27:06 +01:00
mkindahl@dl145h.mysql.com
06375e2130 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
 2008-02-20 19:25:18 +01:00
sven@riska.(none)
80dc1ee7f4 Removed the unused function int THD::binlog_flush_transaction_cache() 2008-02-20 15:22:14 +01:00
sven@riska.(none)
444da164df WL#4078: Document binary format of binlog entries 
Minor update with corrections and notes on the binlog format.
This only affects comments, not code.
 2008-02-20 14:52:21 +01:00
tomas@poseidon.ndb.mysql.com
39c20516b7 Upon the sql command flush logs, we need to ensure that all outstanding 
ndb data to be logged has made it to the binary log to get a deterministic
behavior on the rotation of the log.
 2008-02-20 12:52:04 +01:00
bar@bar.myoffice.izhnet.ru
d5011e8561 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b32510 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b32510v2
 2008-02-20 14:38:52 +04:00
msvensson@pilot.mysql.com
ec1f9b3305 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-02-20 08:42:03 +01:00
tomas@poseidon.bredbandsbolaget.se
50d95649f7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-19 20:56:14 +01:00
mkindahl@dl145h.mysql.com
482997ea65 Removing deliberately generated errors for rpl_bug33931 test 
and moving test to replication suite.
 2008-02-19 19:59:48 +01:00
mkindahl@dl145h.mysql.com
a8f0320ce5 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-19 16:12:23 +01:00
mkindahl@dl145h.mysql.com
e8e74a734f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-19 14:47:29 +01:00
mkindahl@dl145h.mysql.com
446c3768f5 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-19 11:07:14 +01:00
sven@riska.(none)
4cf7508380 Fixed broken result file. 2008-02-18 15:48:17 +01:00
mkindahl@dl145h.mysql.com
896fceec81 Updating result files. 2008-02-18 15:16:39 +01:00
mkindahl@dl145h.mysql.com
d277f9344f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
 2008-02-15 17:51:35 +01:00
mkindahl@dl145h.mysql.com
c5273c1759 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-15 17:49:05 +01:00
sven@riska.(none)
ec9c79138f Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  riska.(none):/home/sven/bktip/5.1-new-rpl
 2008-02-15 14:34:13 +01:00
sven@riska.(none)
b19d948e8a Problem: After I moved rpl/t/rpl_variables.test into t/variables.test, 
t/variables.test fails on embedded server. Moved out that part again, to
a new test called t/variables-notembedded.test.
 2008-02-15 12:54:04 +00:00
mats@kindahl-laptop.dnsalias.net
c4b58c971c Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b34458-mysql-5.1-rpl
 2008-02-15 13:10:13 +01:00
mats@kindahl-laptop.dnsalias.net
89e2fe8c05 Bug #34458 Extreneous use of templates in server code 
Patch to remove white-space left over after removing anonymous
namespace.
 2008-02-15 13:06:28 +01:00
mats@kindahl-laptop.dnsalias.net
25dc9eb10b Bug #34458 Extreneous use of templates in server code 
Replacing a template function with a normal static function.
The template parameter, which previously was the class to
find a binlogging function in, is now passed as a pointer to
the actual binlogging function instead.

The patch requires change of indention, but that is submitted
as a separate patch.
 2008-02-15 12:56:44 +01:00
bar@bar.myoffice.izhnet.ru
fd97a07758 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27877
 2008-02-15 14:58:58 +04:00
mkindahl@dl145h.mysql.com
a1a94e238f Adding waits to events_scheduling to prevent the test from 
failing on heavily loaded systems.
 2008-02-15 10:24:13 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
416001d8ed Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
 2008-02-14 21:38:30 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
871eb3e5ad bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables 
changes for an assert and an updated results file.
 2008-02-14 16:28:32 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
f5fe34dcd1 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
 2008-02-14 13:55:11 +02:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in 
BUG#24387, which is closed since long.
 2008-02-14 09:53:01 +01:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf correct merge error 2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005 correct manual merge 2008-02-13 23:10:47 +01:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6 correction of merge 2008-02-13 20:52:01 +01:00
sven@riska.(none)
95fab95f9b BUG#32991: Races in mysqldump.test (or mysqldump.test fails sporadically) 
This is *not* a fix to the bug. I'm only disabling the failing part of
mysqldump.test until the bug is fixed. Whoever fixes it, please re-enable
the test.
 2008-02-13 17:39:23 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
22072c5c57 Bug #33931 assertion at write_ignored_events_info_to_relay_log if init_slave_thread() fails 
and
bug#33932  assertion at handle_slave_sql if init_slave_thread() fails

the asserts were caused by 
  bug33931: having thd deleted at time of executing err: code plus
            a missed initialization;
  bug33932: initialization of slave_is_running member was missed;

fixed with relocating mi members initialization and removing delete thd
It is safe to do as deletion happens later explicitly in the caller of
init_slave_thread().

Todo: at merging the test is better to be moved into suite/bugs for 5.x (when x>0).
 2008-02-13 14:09:41 +02:00
mkindahl@dl145h.mysql.com
32853b9fa5 Removing non-deterministic tests from events_scheduling test. 2008-02-13 12:41:54 +01:00
tomas@poseidon.ndb.mysql.com
f9a38a9e4e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 12:36:57 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9 The test rpl_row_charset and it dependent rpl_ndb_charset is 
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.

This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
 2008-02-13 11:37:06 +01:00
tomas@poseidon.bredbandsbolaget.se
cc6c696330 Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 08:07:24 +01:00
mkindahl@dl145h.mysql.com
a3fe485dfe Various fixes to fix memory leaks after merging replication 
tree with main.
 2008-02-12 18:21:17 +01:00
sven@riska.(none)
5fb3cc65c3 Moved mysql-test/suite/rpl/rpl_variables.test into 
mysql-test/t/variables.test, because:
 - mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
so should not be in the rpl suite.
 - mysql-test/t/variables.test is the place for testing variable-related
problems and features.
 - I will soon commit a patch containing a test case that tests
replication of variables. It would be good if I could call the test case
mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.
 2008-02-12 17:22:04 +01:00
tomas@poseidon.ndb.mysql.com
5cdbd24da0 corrected really strange test 2008-02-12 14:50:36 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
139e6acd2d Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug34427-rpl_vars_warn_slave_err 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
 2008-02-12 12:47:04 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
0eba2cf0bf Merge mysql1000.dsl.inet.fi:/home/andrei/MySQL/FIXES/5.0/bug32790-assert_mdel_norm_tables 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/pushed.mysql-5.0-rpl-bug33329-extra_rollback
 2008-02-12 12:38:55 +02:00
tomas@poseidon.ndb.mysql.com
f042355aea Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-12 11:25:06 +01:00