1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Commit Graph

12966 Commits

Author SHA1 Message Date
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
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
42d549a9dd corrected results 2006-07-06 10:20:49 +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
acurtis@xiphis.org
4eee50de16 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/p2-bug8706.3-merge-5.0
2006-07-05 17:26:16 -07: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
cmiller@zippy.(none)
91b8b26411 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-07-05 16:16:09 -04:00
mikael@dator5.(none)
854cdc9b35 BUG#20770: Added some more test cases 2006-07-05 16:06:51 -04: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
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
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
mikael@dator5.(none)
8b319bb5c2 BUG#20770: DATA DIRECTORY and INDEX DIRECTORY error when ALTER TABLE ADD/DROP/REORGANIZE partition
Also some error in handling options for subpartitions.
2006-07-05 12:57:23 -04: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
ingo@mysql.com
b21acbe089 After merge fix 2006-07-05 16:23:18 +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
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
8c45fc2925 Bug #20077 Cluster to only support partition by key, needs to error on others 2006-07-05 01:50:16 +02: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
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
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
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
ingo@mysql.com
b2f58e94b1 After merge fix 2006-07-04 12:34:23 +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
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
cmiller@zippy.(none)
90aa83d5e0 Additional patch from Bug#16206. BEGIN/COMMIT behavior changed 5.0 -> 5.1 . 2006-07-03 13:49:25 -04:00
cmiller@zippy.(none)
6110a83a0e Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
2006-07-03 11:35:58 -04:00
gluh@mysql.com
d2b378d57f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-07-03 13:19:18 +05:00
mikael@dator5.(none)
d5bb513021 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into  dator5.(none):/home/pappa/bug17138
2006-07-01 19:47:24 -04:00
dlenev@mysql.com
eb3ae6eb79 Merge mysql.com:/home/dlenev/mysql-5.0-bg18437-3
into  mysql.com:/home/dlenev/mysql-5.1-bg18437
2006-07-02 02:12:53 +04:00
dlenev@mysql.com
d4450e6696 Fix for bug#18437 "Wrong values inserted with a before update trigger on
NDB table".

SQL-layer was not marking fields which were used in triggers as such. As
result these fields were not always properly retrieved/stored by handler
layer. So one might got wrong values or lost changes in triggers for NDB,
Federated and possibly InnoDB tables.
This fix solves the problem by marking fields used in triggers
appropriately.

Also this patch contains the following cleanup of ha_ndbcluster code:

We no longer rely on reading LEX::sql_command value in handler in order
to determine if we can enable optimization which allows us to handle REPLACE
statement in more efficient way by doing replaces directly in write_row()
method without reporting error to SQL-layer.
Instead we rely on SQL-layer informing us whether this optimization
applicable by calling handler::extra() method with
HA_EXTRA_WRITE_CAN_REPLACE flag.
As result we no longer apply this optimzation in cases when it should not
be used (e.g. if we have on delete triggers on table) and use in some
additional cases when it is applicable (e.g. for LOAD DATA REPLACE).

Finally this patch includes fix for bug#20728 "REPLACE does not work
correctly for NDB table with PK and unique index".
  
This was yet another problem which was caused by improper field mark-up.
During row replacement fields which weren't explicity used in REPLACE
statement were not marked as fields to be saved (updated) so they have
retained values from old row version. The fix is to mark all table
fields as set for REPLACE statement. Note that in 5.1 we already solve
this problem by notifying handler that it should save values from all
fields only in case when real replacement happens.
2006-07-02 01:51:10 +04:00
konstantin@mysql.com
1c4dffc8ca Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-07-01 22:13:42 +04:00
sergefp@mysql.com
775ec4fb85 Post-merge fix 2006-07-01 09:28:41 +04:00
mikael@dator5.(none)
55109a802d Merge dator5.(none):/home/pappa/bug20583
into  dator5.(none):/home/pappa/bug17138
2006-07-01 00:28:04 -04:00