andrey@lmy004.
3f4e1f5c69
WL#3337 (Event scheduler new architecture)
...
event_scheduler_ng.cc/h is no more
2006-07-12 10:37:30 +02:00
andrey@lmy004.
0d517461f0
WL#3337 (Event scheduler new architecture)
...
More small fixes to the API : use LEX_STRING instead of LEX_STRING* and if error
then return bool(true) instead of error code.
Merged functions. Reduced usage of sp_name.
Fixed a lot of function documentation errors.
Added function documentation wherever needed.
Removed some unused defines and error codes.
Next to come is batch rename of Event_scheduler_ng to Event_scheduler.
2006-07-11 18:28:15 +02:00
andrey@lmy004.
2f7555b308
Remove trailing whitespace.
...
After merge fixes.
2006-07-10 23:54:46 +02:00
andrey@lmy004.
2319aac01e
Manual merge
2006-07-10 14:42:29 +02:00
andrey@lmy004.
e3d0524bbd
WL#3337 (Event scheduler new architecture)
...
This patch introduces specialized Event data objects
Event_basic as parent.
Event_queue_element used for queue storage
Event_timed used for SHOW EVENTS/ I_S.EVENTS / SHOW CREATE EVENT
Event_job_data using during execution.
Methods were moved out of Event_timed to other classes.
This patch also introduces Events::LOCK_event_metadata.
This patch gives new implementation of Events::dump_internal_status().
Now both the Event_scheduler and Event_queue return information during
their ::dump_internal_status().
Shortened a bit the runtime for executing events test cases.
2006-07-10 13:44:43 +02:00
dlenev@jabberwock.site
c15805f741
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into jabberwock.site:/home/dlenev/mysql-5.1-bg18437
2006-07-08 01:33:50 +04:00
kostja@bodhi.local
72c7fea1a2
Add a test case for Bug#18884 "lock table + global read lock = crash"
...
(the bug itself is not repeatable any more).
2006-07-08 00:26:18 +04:00
dlenev@jabberwock.site
e4a9f06a8b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into jabberwock.site:/home/dlenev/mysql-5.1-bg18437
2006-07-07 23:01:28 +04:00
konstantin/kostja@bodhi.local
45b70962ba
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 20:51:48 +04:00
tomas@poseidon.ndb.mysql.com
e64e6d3caf
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-07 17:52:13 +02:00
tomas@poseidon.ndb.mysql.com
5ab4800fc2
Bug #20897 race condition between drop table and suma drop trigger
...
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
2006-07-07 17:50:45 +02:00
konstantin/kostja@bodhi.local
377e0862ca
Fixes for Windows compilation failures.
2006-07-07 16:14:07 +04:00
dlenev@jabberwock.site
77f640b1a3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into jabberwock.site:/home/dlenev/mysql-5.1-bg18437
2006-07-07 14:11:35 +04:00
konstantin/kostja@bodhi.netgear
a1f7b448e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 13:51:47 +04:00
konstantin/kostja@bodhi.netgear
35b6ad7968
Another post-merge fix.
2006-07-07 13:49:43 +04:00
konstantin@bodhi.netgear
343a5244dc
After merge fixes.
2006-07-07 03:07:45 +04:00
konstantin@bodhi.netgear
4e23f9756d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-07 02:18:02 +04:00
tomas@poseidon.ndb.mysql.com
5e3861cb95
removed alter table partition error test since it cannot be made predictable... name will change of created file
2006-07-07 00:18:01 +02:00
tomas@poseidon.ndb.mysql.com
6a6bd5b182
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 21:30:55 +02:00
konstantin@bodhi.netgear
01bc761690
Merge bodhi.netgear:/opt/local/work/tmp_merge
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-06 22:55:48 +04:00
konstantin@bodhi.netgear
f22a50a93b
Merge bodhi.netgear:/opt/local/work/mysql-5.1-root
...
into bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-06 22:26:47 +04:00
tomas@poseidon.ndb.mysql.com
8f613e9263
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 20:04:48 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
joerg@trift2.
dcf85ebec4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into trift2.:/M51/bug20216-5.1
2006-07-06 17:58:31 +02:00
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
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
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
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
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