mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36267 commits 2791 branches 343 tags 1.7 GiB
Commit graph

36267 commits

This branch
This branch
All branches
Author SHA1 Message Date
guilhem@mysql.com
a43c4b0265 Fix for BUG#20188 "REPLACE or ON DUPLICATE KEY UPDATE in 
auto_increment breaks binlog":
if slave's table had a higher auto_increment counter than master's (even
though all rows of the two tables were identical), then in some cases,
REPLACE and INSERT ON DUPLICATE KEY UPDATE failed to replicate
statement-based (it inserted different values on slave from on master).
write_record() contained a "thd->next_insert_id=0" to force an adjustment
of thd->next_insert_id after the update or replacement. But it is this
assigment introduced indeterminism of the statement on the slave, thus
the bug. For ON DUPLICATE, we replace that assignment by a call to
handler::adjust_next_insert_id_after_explicit_value() which is deterministic
(does not depend on slave table's autoinc counter). For REPLACE, this
assignment can simply be removed (as REPLACE can't insert a number larger
than thd->next_insert_id).
We also move a too early restore_auto_increment() down to when we really know
that we can restore the value.
 2006-07-05 14:41:35 +02:00
tomas@poseidon.ndb.mysql.com
1b7da4b8ed extra logging and asserts to try to track down the spurious completeCluster failure assetion 
corrected error in invalidation of dict cache which may be causing the valgrind warning at times
 2006-07-05 14:20:14 +02:00
ingo@mysql.com
4c00805951 Merge mysql.com:/home/mydev/mysql-4.1-bug19835 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:24:50 +02:00
ingo@mysql.com
5025bf32b2 Merge mysql.com:/home/mydev/mysql-4.1-bug17877 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:23:21 +02:00
ingo@mysql.com
a21071d912 Merge mysql.com:/home/mydev/mysql-4.1-bug14400 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:20:10 +02:00
ingo@mysql.com
20a152d5c3 Merge mysql.com:/home/mydev/mysql-4.1-bug11824 
into  mysql.com:/home/mydev/mysql-5.0-ateam
 2006-07-05 11:11:40 +02:00
ngrishakin@ndb15.mysql.com
f72ec8a5fb Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
 2006-07-05 04:48:44 +02:00
knielsen@devsrv-b.mysql.com
94bd61e221 Merge bk-internal:/home/bk/mysql-5.1 
into  mysql.com:/data0/knielsen/tmp-5.1
 2006-07-05 01:56:39 +02:00
tomas@poseidon.ndb.mysql.com
0a75f5fe0a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 01:56:38 +02:00
tomas@poseidon.ndb.mysql.com
35938c56f3 Bug #20077 Cluster to only support partition by key, needs to error on others 2006-07-05 01:52:38 +02:00
tomas@poseidon.ndb.mysql.com
8c45fc2925 Bug #20077 Cluster to only support partition by key, needs to error on others 2006-07-05 01:50:16 +02:00
patg@govinda.patg.net
760b8615ec Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-07-04 13:50:09 -07:00
knielsen@rt.int.sifira.dk
b1c686ccca Merge rt.int.sifira.dk:/usr/local/mysql/mysql-5.1-pristine 
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.1
 2006-07-04 22:42:29 +02:00
knielsen@rt.int.sifira.dk
5ebc51cc70 Fix hardcoded /tmp path (which causes problems when running multiple 
tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.
 2006-07-04 22:37:32 +02:00
ingo@mysql.com
40c103478d Merge mysql.com:/home/mydev/mysql-4.0-bug14400 
into  mysql.com:/home/mydev/mysql-4.1-bug14400
 2006-07-04 19:10:13 +02:00
knielsen@mysql.com
ff0041e8a6 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 19:10:08 +02:00
tomas@poseidon.ndb.mysql.com
d3b52bd475 Bug #20077 Cluster to only support partition by key, needs to error on others 2006-07-04 18:29:21 +02:00
tomas@poseidon.ndb.mysql.com
980852eed3 Bug #20742 Assertion in drop of ndb binlog events after node restart 2006-07-04 17:58:20 +02:00
tomas@poseidon.ndb.mysql.com
6512316c3a Bug #20742 Assertion in drop of ndb binlog events after node restart 
- make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event
 2006-07-04 17:37:44 +02:00
andrey@lmy004.
2527b0f13a fix test. this should remove the problem of 
fix for bug#20624  events_logs_tests.test fails randomly
 2006-07-04 17:30:39 +02:00
jonas@mc01.ndb.mysql.com
d0146162e5 ndb - ps_7ndb as discovered by pb 
fix race in scan close
 2006-07-04 16:54:07 +02:00
ingo@chilla.local
8d014f1f54 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-07-04 15:25:52 +02:00
pekka@clam.ndb.mysql.com
0f8ec3a8e8 ndb - bug#20847 fix (4.1) 2006-07-04 15:11:11 +02:00
knielsen@mysql.com
7892dca173 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/data0/knielsen/tmp-5.0
 2006-07-04 14:10:53 +02:00
pekka@clam.ndb.mysql.com
225f070788 pekka - checkout:get (4.1) 2006-07-04 13:51:35 +02:00
mskold@linux.site
9509145a9d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
 2006-07-04 12:57:24 +02:00
ingo@chilla.local
cda8bce6c5 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-07-04 12:57:24 +02:00
tomas@poseidon.ndb.mysql.com
59958be558 disabled ndb_autodiscover3 2006-07-04 12:57:23 +02:00
jonas@perch.ndb.mysql.com
795eafbce3 Merge tomas@poseidon:mysql-5.0-main 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-04 12:47:08 +02:00
tomas@poseidon.ndb.mysql.com
0b2024ac88 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-04 12:47:07 +02:00
ingo@mysql.com
b2f58e94b1 After merge fix 2006-07-04 12:34:23 +02:00
joerg@mysql.com
be5f48268c When building RPMs, use the Perl script to run the tests, to automatically check SSL. 2006-07-04 12:30:08 +02:00
knielsen@rt.int.sifira.dk
7062993817 Merge mysqldev@production:my/mysql-5.0-release 
into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
 2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
 2006-07-04 12:08:57 +02:00
tomas@poseidon.ndb.mysql.com
412082ebdd Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-07-04 11:56:44 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0 Bug #20784 Uninitialized memory in update on table with PK not on first column 
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
 2006-07-04 11:43:06 +02:00
tomas@poseidon.ndb.mysql.com
8a2694e25f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-07-04 11:21:19 +02:00
ingo@mysql.com
d8546d07f8 Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-07-04 10:02:11 +02:00
jonas@perch.ndb.mysql.com
5e68b4ab68 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-07-04 09:56:27 +02:00
jonas@perch.ndb.mysql.com
2f22f5aa21 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-04 09:38:46 +02:00
mskold@linux.site
f5fb7ef27a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1-extra
 2006-07-04 09:17:32 +02:00
cmiller@zippy.(none)
267aeffca3 Renumber events to make tests pass. This must be a result of removing extraneous 
COMMITs -- the numbers collapse to fill the gaps.
 2006-07-03 23:17:53 -04:00
cmiller@zippy.(none)
5db7673f88 Removed extraneous COMMITs, from Bug#16206. 2006-07-03 19:03:47 -04:00
cmiller@zippy.(none)
8caedc5efd Removed bdb test where the binlog format is indeterminate and updated a test 
where it isn't.  Removed a test where the merge was incorrect (and a test 
duplicated.)
 2006-07-03 18:29:01 -04:00
lars@mysql.com
ad119661a7 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
 2006-07-03 23:07:50 +02:00
aivanov@mysql.com
163c4d747c BUG#19209 "Test 'rpl_openssl' hangs on Windows" 
Disabling 'rpl_openssl'.
 2006-07-04 01:07:49 +04:00
tomas@poseidon.ndb.mysql.com
904100ee73 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-03 22:58:10 +02:00
tnurnberg@mysql.com
b3e368df19 Bug#20783: Valgrind uninitialised warning in test case ctype_uca 
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
  
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.
 2006-07-03 21:41:15 +02:00
aivanov@mysql.com
92fd2d1c2e BUG#19209 "Test 'rpl_openssl' hangs on Windows" 
Enabling rpl_openssl.test for Windows to check that
 currently it still hangs (because I can't reproduce
 this on my machine).
 2006-07-03 23:28:19 +04:00
kent@mysql.com
caa3fcf673 client.c: 
Define 'mysql_get_ssl_cipher' even if no SSL built in, it is referenced in libmysql.def
 2006-07-03 20:08:38 +02:00