joerg@debian.(none)
68b98fe255
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-20 08:16:47 +01:00
stewart@mysql.com
f43058b8a8
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/new
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/2868
2006-01-20 15:52:19 +11:00
stewart@mysql.com
d88e576612
WL#2868 Fix backup trigger handling
...
BACKUP previous set up triggers using DICT.
This lead to all kind of trouble.
An smaller alternative to using SUMA for backup
is to just make BACKUP handle triggers to TUP directly.
This way all triggers will be totally local,
and error handling is much simpler.
--- old impl.
Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
Master sends ALTER_TRIG_REQ (online) to local DICT
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends DROP_TRIGGER to local DICT
Master sends STOP_BACKUP_REQ to all participants
--- new impl.
Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends START_BACKUP_REQ to all paricipants
Participand sends CREATE_TRIG_REQ for all tables to local TUP
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends STOP_BACKUP_REQ to all participants
Participant sends DROP_TRIGGER to local TUP
Changes:
All trigger handling is _local_
This implies, that abort (e.g due to node failure) can be _local_
fix testBackup test so that it will run successfully with the (now correct)
backup trigger code.
2006-01-20 15:42:00 +11:00
jmiller@mysql.com
f07a80f7fb
Updated with feedback omer provided
2006-01-20 04:00:10 +01:00
cps@outpost.site
fb25dc11c8
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into outpost.site:/home/cps/mysql/devel/test-6
2006-01-20 00:42:57 +03:00
cps@outpost.site
c08d4aa703
Fix the tree: plugin-related changes, necessary for
...
CSV storage engine to be statically compiled.
Derived from antony's patch.
2006-01-20 00:40:56 +03:00
knielsen@mysql.com
113b1e4e6c
Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
...
into mysql.com:/usr/local/mysql/tmp5.1
2006-01-19 21:50:57 +01:00
pekka@mysql.com
c68df5c14a
Merge mysql.com:/space/pekka/ndb/version/my51
...
into mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-19 19:33:51 +01:00
serg@serg.mylan
2dee3a7216
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-01-19 19:33:51 +01:00
joerg@debian.(none)
d535cb33d0
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-19 19:33:51 +01:00
paul@snake-hub.snake.net
9d3f0364a4
mysqlslap.c:
...
Fix incorrect option description.
2006-01-19 12:33:51 -06:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
d9fb7c20d7
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 13:33:50 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
082e9a8132
WL #2747 : After push fixes
2006-01-19 13:32:58 -05:00
joerg@debian.(none)
a3ec446600
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-19 15:05:59 +01:00
msvensson@neptunus.(none)
a5de6fbdbe
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
2006-01-19 15:05:58 +01:00
holyfoot@mysql.com
53a379d041
Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb
2006-01-19 18:05:57 +04:00
sergefp@mysql.com
09004c2a03
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-19 17:05:57 +03:00
bar@mysql.com
55b30563fb
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.12448
2006-01-19 18:05:57 +04:00
joerg@debian.(none)
9f98246eae
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-19 15:05:57 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
9a6bad5951
Added two test cases that needs fixing
2006-01-19 09:05:56 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
826aae1885
Fixes for broken tree
2006-01-19 08:58:32 -05:00
jonas@perch.ndb.mysql.com
7256328d48
bug#16455 - ndb crash when running of of rope pool
2006-01-19 14:08:05 +01:00
pekka@mysql.com
17cec85f5f
ndb - wl#2972 rbr blobs ndb api support
2006-01-19 14:01:32 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5a63dacdfa
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-19 07:41:58 -05:00
msvensson@neptunus.(none)
96b1f9150c
Merge neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
...
into neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020
2006-01-19 11:43:19 +01:00
msvensson@neptunus.(none)
199d800942
Bug#15020 "Can't find files" message incorrect for error 24
2006-01-19 11:35:27 +01:00
holyfoot@deer.(none)
c03d025002
Embedded-server related tests fixes
2006-01-19 13:25:12 +04:00
bar@mysql.com
fd4ab36123
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/home/bar/mysql-5.1-new.12448
2006-01-19 10:58:49 +04:00
cps@outpost.site
a306382651
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-prepush
2006-01-19 07:04:39 +03:00
cps@outpost.site
ce2eb6d8cb
WL1019: complete patch. Reapplied patch to the clean
...
tree to get rid of multiple typos in CS comments and
unify the patch.
2006-01-19 05:56:06 +03:00
paul@snake-hub.snake.net
8cefc4ce5b
mysqlslap.c:
...
Put options in standard order: --help first, then lexically.
Rename --number-of-query to --number-of-queries.
2006-01-18 20:27:07 -06:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
f7196b8de9
BUG #16596
...
Moved init to lex_start
2006-01-18 16:18:42 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
5f147aa4e6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
2006-01-18 16:11:35 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
07e5c13e89
Bug fix
2006-01-18 16:09:25 -05:00
andrey@lmy004.
0322cb1df8
- fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON)
...
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.
- this changeset introduces also fix for bug#16432 (Events: error re interval
misrepresents the facts)
the code of event_timed::set_interval() was refactored anyway so it is meaningful to
fix the bug in the same changeset.
2006-01-18 20:41:22 +01:00
sergefp@mysql.com
6e5fb44453
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-18 21:35:44 +03:00
pekka@mysql.com
b6ed13a36b
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-01-18 19:35:16 +01:00
sergefp@mysql.com
c379f6b0ba
WL#2985: Merge
2006-01-18 21:29:48 +03:00
joerg@debian.(none)
8e39ce06e8
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-18 18:53:04 +01:00
holyfoot@mysql.com
6e42f6ee75
Merge bk@192.168.21.1:mysql-5.1-new
...
into mysql.com:/home/hf/work/mysql-5.1.15910
2006-01-18 21:53:03 +04:00
tomas@poseidon.ndb.mysql.com
9c1234a5cf
fixed startup suma bug when ndb api connects during node restart
2006-01-18 16:45:17 +01:00
holyfoot@deer.(none)
9e338cf4c8
bug #15910 (Wrong value on error message)
2006-01-18 19:27:10 +04:00
joerg@debian.(none)
9e7bb86eee
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-18 14:59:24 +01:00
pekka@mysql.com
cd55dea8fb
ndb - wl#2972 (5.1) omit trigger check post!=pre if recipient is SUMA
2006-01-18 14:21:24 +01:00
mskold@mysql.com
1fb4202c6b
Disabled fast/drop index temporarily
2006-01-18 12:44:08 +01:00
sergefp@mysql.com
55380631cc
Manual merge
2006-01-18 14:09:08 +03:00
joerg@debian.(none)
e8db372838
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into debian.(none):/M51/mysql-5.1
2006-01-18 11:15:44 +01:00
pekka@mysql.com
18a060e798
ndb - wl#2972 (5.1, related) un-initialized var in Suma
2006-01-18 10:59:41 +01:00
mskold@mysql.com
08d8691b40
disabled.def:
...
Disabled failing tests
mysql_priv.h:
Removed compiler warning
2006-01-18 10:56:07 +01:00
mskold@mysql.com
b516d5bdea
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-01-18 10:29:27 +01:00