aelkin/elkin@koti.dsl.inet.fi
904db2cf96
bug#27571
...
tests fixing: refreshing the results file.
2007-11-06 20:09:45 +02:00
aelkin/elkin@koti.dsl.inet.fi
ba8fc4fed1
results from 5.0 is not needed
2007-11-06 16:32:55 +02:00
aelkin/elkin@koti.dsl.inet.fi
fdff4ff141
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
2007-11-06 16:28:09 +02:00
aelkin/elkin@koti.dsl.inet.fi
a179cf1540
bug#27571
...
fixing tests
2007-11-06 16:25:32 +02:00
aelkin/elkin@koti.dsl.inet.fi
84d4f588cb
bug#27571
...
removing extra tests (on 5.1 that's been already done)
2007-11-06 15:11:59 +02:00
aelkin/elkin@koti.dsl.inet.fi
9598a15284
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
...
into koti.dsl.inet.fi:/home/elkin/MySQL/merge-5.1
2007-11-06 14:03:58 +02:00
aelkin/elkin@koti.dsl.inet.fi
122005894f
bug#27571
...
commit is specific for 5.0 to eliminated non-deterministic tests.
Those tests run only in 5.1 env where there is a necessary devices such
as processlist table of info_schema.
2007-11-06 13:53:26 +02:00
aelkin/elkin@koti.dsl.inet.fi
355c6a2deb
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
2007-11-06 13:27:48 +02:00
aelkin/elkin@koti.dsl.inet.fi
fe60ebdc25
bug#27571
...
non-deterministic tests refining.
This particular patch tested on two archs.
2007-11-06 13:08:37 +02:00
aelkin/elkin@koti.dsl.inet.fi
d9045a7668
bug#27571
...
non-deterministic tests execution on some platforms.
2007-11-06 11:53:47 +02:00
aelkin/elkin@koti.dsl.inet.fi
3f7bf58884
bug#27571 asynchronous setting mysql_query
::error and Query_log_e::error_code
...
refining tests as they appear to be non-deterministic.
2007-11-05 22:10:25 +02:00
skozlov/ksm@virtop.localdomain
82a2cd5da3
Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
2007-11-03 00:35:47 +03:00
skozlov/ksm@mysql.com/virtop.localdomain
6c67d11f20
WL#3949. Added an option for support "combinations" of mysqld arguments for a suite
2007-11-03 00:32:17 +03:00
aelkin/elkin@koti.dsl.inet.fi
b22f5077a4
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug31554-rpl_truncate
2007-11-02 14:05:51 +02:00
aelkin/elkin@koti.dsl.inet.fi
4b9b015457
Bug #31554 rpl.rpl_truncate_2myisam test failure: wrong master binlog file name
...
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.
2007-11-02 14:00:38 +02:00
msvensson@pilot.mysql.com
8f8fa8c0ec
Merge bk-internal:/home/bk/mysql-5.1-rpl
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
2007-11-02 09:46:53 +01:00
jmiller/jbmiller@mysql.com/ndbqa01.mysql.com
9e9ff4b420
rpl_extraSlave_Col.test:
...
Corrected issues found in preparing to push code
2007-10-31 14:01:01 -05:00
jmiller/jbmiller@ndbqa01.mysql.com
9f87735289
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql.com:/usr/clones/rpl-push
2007-10-31 09:52:05 -05:00
aelkin/elkin@koti.dsl.inet.fi
68a52c42f9
bug#27571 merging. Fixing offsets and moving tests to the corrent
...
destination. Removing wrong (local temp) tests.
2007-10-31 11:48:49 +02:00
jmiller/root@ndbqa01.mysql.com
1a7bf0c630
Merge mysql.com:/usr/clones/mysql-5.1-new-rpl
...
into mysql.com:/usr/clones/rpl-push
2007-10-30 10:02:37 -05:00
aelkin@dl145j.mysql.com
c2b0410ca1
manual merge
2007-10-30 14:08:37 +01:00
aelkin/elkin@koti.dsl.inet.fi
01f86563cb
Manual merge 5.0-rpl -> 5.1-rpl.
...
involved bug#12691, bug#27571
2007-10-30 13:49:42 +02:00
aelkin/elkin@koti.dsl.inet.fi
e65d20b5f4
Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
...
into koti.dsl.inet.fi:/home/elkin/MySQL/5.1-merge-bug27571
2007-10-30 11:31:03 +02:00
aelkin/elkin@koti.dsl.inet.fi
f974872f5c
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_flags
2007-10-30 10:32:20 +02:00
bar@bar.myoffice.izhnet.ru
628b462881
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-merge
2007-10-30 12:21:44 +04:00
bar@bar.myoffice.izhnet.ru
70488d7dfe
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
2007-10-30 12:03:34 +04:00
aelkin/elkin@koti.dsl.inet.fi
27436f0ba3
Bug #27571 asynchronousity in setting mysql_query
::error and
...
Query_log_event::error_code
A query can perform completely having the local var error of mysql_$query
zero, where $query in insert, update, delete, load,
and be binlogged with error_code e.g KILLED_QUERY while there is no
reason do to so.
That can happen because Query_log_event consults thd->killed flag to
evaluate error_code.
Fixed with implementing a scheme suggested and partly implemented at
time of bug@22725 work-on. error_status is cached immediatly after the
control leaves the main rows-loop and that instance always corresponds
to `error' the local of mysql_$query functions. The cached value
is passed to Query_log_event constructor, not the default thd->killed
which can be changed in between of the caching and the constructing.
2007-10-29 15:20:59 +02:00
gluh@eagle.(none)
e3f7762226
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-29 12:38:32 +04:00
mats@kindahl-laptop.dnsalias.net
87fd52cd8c
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.0-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b12691-mysql-5.0-rpl
2007-10-26 19:18:02 +02:00
mats@kindahl-laptop.dnsalias.net
83cfdff638
BUG#12691 (Exec_master_log_pos corrupted with SQL_SLAVE_SKIP_COUNTER):
...
Adding code to keep skipping events while inside a transaction. Execution
will start just after the transaction has been skipped.
2007-10-26 18:52:58 +02:00
msvensson@pilot.mysql.com
6d1f99b7d6
Bug#28772 rpl_row_until fails in pushbuild
2007-10-26 16:11:20 +02:00
aelkin/elkin@koti.dsl.inet.fi
c1f751ba9b
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug30594-rpl.rpl_skip_error_is_nondeterministic
2007-10-25 19:28:38 +03:00
joerg@trift2.
00ca6476be
Mimic a rename which Daniel already did in 6.0,
...
to get rid of a name clash among *deleted* files on case-insignificant file systems.
2007-10-25 13:17:44 +02:00
sven@murkla.(none)
af7da8cd64
WL#4078: Document binary format of binlog entries
...
Documented some binlog events using doxygen. More will be done later.
Also fixed typos in other comments and added remarks about dubious code.
Only comments are affected, there is no change to the actual code.
2007-10-25 11:58:18 +02:00
mats@kindahl-laptop.dnsalias.net
71bd1522e0
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl
2007-10-24 16:54:18 +02:00
mats@kindahl-laptop.dnsalias.net
b9de3ce2a9
BUG#31702 (Missing row on slave causes assertion failure under row-based
...
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.
2007-10-24 16:02:37 +02:00
gluh@mysql.com/eagle.(none)
97e0180b2b
result fix
2007-10-24 12:49:58 +05:00
bar@bar.myoffice.izhnet.ru
e89e78d101
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
2007-10-24 12:09:24 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
5cfd557fad
Bug#31081 server crash in regexp function
...
Additional fix for valgrind warning
2007-10-24 12:08:33 +05:00
bar@bar.myoffice.izhnet.ru
811e64de62
Merge mysql.com:/home/bar/mysql-work/mysql-5.0
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
2007-10-24 10:49:46 +05:00
gluh@mysql.com/eagle.(none)
b2aeda7699
result fix
2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 20:11:39 +05:00
gluh@eagle.(none)
53b1c3a299
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 20:09:36 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18
after merge fix
2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
gluh@eagle.(none)
331ee71261
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 18:47:18 +05:00
holyfoot/hf@hfmain.(none)
d0f53297f6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 17:24:57 +05:00
kaa@polly.(none)
173108956a
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:24:56 +04:00
holyfoot/hf@hfmain.(none)
f71a1441ee
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 17:09:32 +05:00