1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Commit Graph

13745 Commits

Author SHA1 Message Date
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
acurtis@xiphis.org
86132d5d8f Bug#8706
"temporary table with data directory option fails"
  myisam should not use user-specified table name when creating
  temporary tables and use generated connection specific real name.
  Test included.
2006-07-05 17:18:59 -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
kroki@mysql.com
acf47bdc37 Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
2006-07-05 12:04:04 +04: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
kroki@mysql.com
821b540f2e Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20570
2006-07-04 23:55:52 +04:00
konstantin@mysql.com
b99e11c8bd A fix and a test case for Bug#17843 "Certain stored procedures fail to
run at startup"

The server returned an error when trying to execute init-file with a 
stored procedure that could return multiple result sets to the client. 
A stored procedure can return multiple result sets if it contains 
PREPARE, SELECT, SHOW and similar statements.
   
The fix is to set client_capabilites|=CLIENT_MULTI_RESULTS in
sql_parse.cc:handle_bootstrap(). There is no "client" really, so 
nothing is ever sent. This makes init-file feature behave consistently: 
the prepared statements that can be called directly in the init-file 
can be used in a stored procedure too.

Re-committed the patch originally submitted by Per-Erik after review.
2006-07-04 23:46:15 +04:00
andrey@lmy004.
2bdd872e5f WL #3337 (Event scheduler new architecture)
Cut Nr. 8.

All tests pass.

Separated Event_scheduler into Event_queue and Event_scheduler.
Added new Event_scheduler_ng which is the new scheduler and is used
system-wide. Will be moved to the event_scheduler.cc in the future.
Using Event_timed in Event_queue as well as cloned during execution.
Next step is to have Event_worker_data which will be used during execution
and will take ::compile()/::execute() out of Event_timed.
2006-07-04 18:44:35 +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
bar@mysql.com
3855520138 WL#2928 Date Translation NRE
(implemented by by Josh Chamas)
2006-07-04 17:40:40 +05: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
gkodinov@mysql.com
ae0a3e0dbb Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B16110
2006-07-04 12:20:45 +03:00
gkodinov@mysql.com
b64089e655 Bug #16110: insert permitted into view col w/o default value
When compiling INSERT statements the check whether columns are provided values
depends on the flag whether a field is used in that query (Field::query_id).
However the check for updatability of VIEW columns (check_view_insertability())
was calling fix_fields() and thus setting the Field::query_id even for the 
view fields that are not referenced in the current INSERT statement.
So the correct check for columns without default values 
( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
columns were mentioned in the INSERT field list and was issuing no 
warnings or errors.
Fixed check_view_insertability() to turn off the flag whether or not to set
Field::query_id (THREAD::set_query_id) before calling fix fields and restore
it when it's done.
2006-07-04 12:10:12 +03: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
holyfoot@deer.(none)
4b48b35680 bug #14807 (GeomFromText() should return MYSQL_TYPE_GEOMETRY)
we didn't have code creating GEOMETRY-type fields from Items (expression results)
So i added this code
2006-07-04 12:56:53 +05: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
holyfoot@deer.(none)
6e11fcacee bug 20317 (test fails in embedded for different number of threads is
running)

I decided to make ps_1general test independent from actual number of
threads running
2006-07-03 14:54:09 +05:00