mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36047 commits 2778 branches 343 tags 1.6 GiB
Commit graph

36047 commits

This branch
This branch
All branches
Author SHA1 Message Date
joerg@trift2.
26b7bc8eab Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into trift2.:/M51/merge-5.1
 2006-07-06 15:52:39 +02:00
tomas@poseidon.ndb.mysql.com
a9348557b2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 15:52:38 +02:00
tomas@poseidon.ndb.mysql.com
deb1884cef corrected result file 
- missing order by
 2006-07-06 15:51:13 +02:00
ingo@chilla.local
44ed4b8ecb After merge fixes. 2006-07-06 15:38:47 +02:00
tomas@poseidon.ndb.mysql.com
bcd8fab178 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 15:23:23 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix 
- don't invalidate tables that are in state RETRIEVING
 2006-07-06 15:18:00 +02:00
guilhem@gbichot3.local
3365337cef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-06 14:46:52 +02:00
guilhem@gbichot3.local
dd84ef1b8a Merge gbichot3.local:/home/mysql_src/mysql-5.0-20524 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-06 14:42:47 +02:00
guilhem@mysql.com
140b488c96 Fix for BUG#20524 "auto_increment_* not observed when inserting 
a too large value": the bug was that if MySQL generated a value for an
auto_increment column, based on auto_increment_* variables, and this value
was bigger than the column's max possible value, then that max possible
value was inserted (after issuing a warning). But this didn't honour
auto_increment_* variables (and so could cause conflicts in a master-master
replication where one master is supposed to generated only even numbers,
and the other only odd numbers), so now we "round down" this max possible
value to honour auto_increment_* variables, before inserting it.
 2006-07-06 14:37:09 +02:00
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-07-06 13:18:00 +02:00
jonas@perch.ndb.mysql.com
200deaa99e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 12:11:14 +02:00
tomas@poseidon.ndb.mysql.com
4d0d6cff98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 12:11:13 +02:00
dlenev@mysql.com
d6f47c31b6 After merge fixes for patch solving bug#18437 "Wrong values inserted with a 
before update trigger on NDB table".

Two main changes:
- We use TABLE::read_set/write_set bitmaps for marking fields used by
  statement instead of Field::query_id in 5.1.
- Now when we mark columns used by statement we take into account columns 
  used by table's triggers instead of marking all columns as used if table
  has triggers.
 2006-07-06 13:33:23 +04:00
tomas@poseidon.ndb.mysql.com
e2db01e3bc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-06 10:29:00 +02:00
tomas@poseidon.ndb.mysql.com
42d549a9dd corrected results 2006-07-06 10:20:49 +02:00
ingo@chilla.local
3a252caa86 Merge chilla.local:/home/mydev/mysql-5.1--main 
into  chilla.local:/home/mydev/mysql-5.1-ateam
 2006-07-06 10:10:12 +02:00
jonas@perch.ndb.mysql.com
88f816a0fd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-07-06 09:40:04 +02:00
jonas@perch.ndb.mysql.com
f5ec695c18 ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
mskold@linux.site
0c5c9e174b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-06 09:08:39 +02:00
ngrishakin@ndb15.mysql.com
8d82e2c63a Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new-ndb
 2006-07-06 04:37:53 +02:00
ngrishakin@mysql.com
9323799bb4 ndb_dd_advance test cases 2006-07-06 04:37:03 +02:00
tomas@poseidon.ndb.mysql.com
55a9bab25e Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- flush gci needs to be reset on disconnect as cluster may reconnect after --initial with a smaller gci
 2006-07-06 01:33:53 +02:00
ngrishakin@mysql.com
58c27909e0 .del-ndb_dd_advance.result~165b282a93715547: 
Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test
 2006-07-05 23:50:29 +02:00
ngrishakin@ndb15.mysql.com
1e84c7997c Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1
 2006-07-05 23:12:49 +02:00
tomas@poseidon.ndb.mysql.com
25ea9964dc disabled ndb_autodiscover3 again 2006-07-05 23:12:48 +02:00
joerg@trift2.
bf3f0b3806 Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2006-07-05 21:47:09 +02:00
tomas@poseidon.ndb.mysql.com
1d5969c8bd 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 21:47:08 +02:00
tomas@poseidon.ndb.mysql.com
06ac56e61c Bug #20843 tests fails randomly with assertion in completeClusterFailed 
- reenabled test as this now seems fixed
 2006-07-05 21:44:11 +02:00
mats@mysql.com
8f5689fd4f Switching to use INSERT DELAYED, which it should be, for rpl_insert. 2006-07-05 21:17:00 +02:00
tomas@poseidon.ndb.mysql.com
f822477297 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:31:32 +02:00
tomas@poseidon.ndb.mysql.com
f413bc2fe8 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
tomas@poseidon.ndb.mysql.com
4f2becc9d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 20:23:23 +02:00
tomas@poseidon.ndb.mysql.com
aacb705613 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails 
- updated error message to more correctly reflect the issue
 2006-07-05 20:20:39 +02:00
joerg@mysql.com
c9dc1184fd Extend the Perl script running the test suite to produce a "Logging:" line (like the shell script does). 2006-07-05 20:17:04 +02:00
tomas@poseidon.ndb.mysql.com
62eba085d5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 18:52:43 +02:00
tomas@poseidon.ndb.mysql.com
26e39baca1 added warning on cluster reconnect and binlog usage, that data may be missing 2006-07-05 18:36:18 +02:00
pekka@clam.ndb.mysql.com
38d63c303a ndb - ndb api : try to catch autoincr 'error 0' 2006-07-05 17:36:19 +02:00
tomas@poseidon.ndb.mysql.com
7b876a71d0 Bug #20843 tests fails randomly with assertion in completeClusterFailed 2006-07-05 17:36:18 +02:00
mats@romeo.(none)
a3ae339829 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/b20821-mysql-5.1-new-rpl
 2006-07-05 17:11:36 +02:00
mats@mysql.com
fd92d8072a BUG#20821 (INSERT DELAYED fails to write some rows to binlog): 
Reverting to old behaviour of writing the query before all rows
have been written.
 2006-07-05 16:58:56 +02:00
mskold@linux.site
75a6a16a19 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/marty/MySQL/mysql-5.1
 2006-07-05 16:30:14 +02:00
joerg@trift2.
1746d41862 Merge mysql.com:/M50/tmp_merge_kent into mysql.com:/M51/merge-kent-5.1 2006-07-05 16:30:13 +02:00
tomas@poseidon.ndb.mysql.com
cdec019fd3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-05 16:30:12 +02:00
tomas@poseidon.ndb.mysql.com
04ae971576 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it. 
- remove some event code to get rid of some bugs
 2006-07-05 16:26:08 +02:00
ingo@mysql.com
b21acbe089 After merge fix 2006-07-05 16:23:18 +02:00
mskold@mysql.com
7c650824dc Bug #19645 Data Node hangs in phase 100: post review fix, removed test printout 2006-07-05 15:32:17 +02:00
mskold@mysql.com
d951bc61ff Bug #19645 Data Node hangs in phase 100: distribute API_FAIL_REQ so all nodes have the same view of what API's are connected 2006-07-05 15:04:47 +02:00
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