Commit graph

29750 commits

Author SHA1 Message Date
sergefp@mysql.com
b729baedcf Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5-push
2006-01-23 12:29:25 +03:00
jonas@perch.ndb.mysql.com
68d55c5e18 ndb - fix typo 2006-01-23 09:57:04 +01:00
jonas@perch.ndb.mysql.com
e2b1046b48 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-23 09:32:32 +01:00
jonas@perch.ndb.mysql.com
87202d31db bug#13556 - (ndb) - incorrect parsing in tablespace code
end_ptr to my_strtoll10 is in/out parameter
2006-01-23 09:31:03 +01:00
knielsen@mysql.com
33997ddaad Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-23 09:17:08 +01:00
jonas@perch.ndb.mysql.com
b4ca22e685 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-23 09:12:22 +01:00
holyfoot@mysql.com
09359dce59 Merge bk@192.168.21.1:mysql-5.1-new into mysql.com:/home/hf/work/5.1.emb 2006-01-23 11:59:31 +04:00
holyfoot@deer.(none)
0b8ebc2454 Fixes about the embedded-server in 5.1 2006-01-23 11:58:14 +04:00
pekka@mysql.com
ecdc2c9193 ndb - wl#2972 injector cleanup accessed blob event ops via Ndb => crash 2006-01-23 07:27:49 +01:00
brian@zim.tangent.org
58e21e823c Small cleanups to remove old or un-needed methods. 2006-01-22 13:51:42 -08:00
pekka@mysql.com
f79075e9d6 ndb - wl#2972 fix tinyblob 2006-01-22 13:28:43 +01:00
pekka@mysql.com
ddc419afb2 ndb - wl#2972 injector saw blob table drop event => crash 2006-01-22 10:37:57 +01:00
sergefp@mysql.com
d422e5e68b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-21 14:14:20 +03:00
pekka@mysql.com
f2c82402ca Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-rbr
2006-01-21 11:57:15 +01:00
jmiller@mysql.com
0890238a0f rpl_foreign_key_innodb.result, rpl_foreign_key.test:
had to add order by
2006-01-20 23:39:13 +01:00
jmiller@mysql.com
53784ff246 Updated test 2006-01-20 23:28:52 +01:00
knielsen@mysql.com
95a9e12e54 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-01-20 22:29:40 +01:00
knielsen@mysql.com
aa52986bc0 Disable partitioning test on servers compiled without partitioning. 2006-01-20 22:28:14 +01:00
andrey@lmy004.
7740652961 fix for bug#16431 (Events: An event which alters itself disappears)
WL#1034 (Internal CRON)
2006-01-20 22:24:58 +01:00
sergefp@mysql.com
72ffbf5db8 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:14 +03:00
sergefp@mysql.com
ace241ba08 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:13 +03:00
sergefp@mysql.com
941ec86a4b Update test result to include final DROP TABLE stmt 2006-01-20 19:38:12 +03:00
sergefp@mysql.com
2e458b0928 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/psergey/mysql-5.1-ppruning-r5
2006-01-20 19:38:11 +03:00
SergeyV@selena.
b4055d2486 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  selena.:H:/MYSQL/src/#00000-mysql-5.1
2006-01-20 18:40:02 +03:00
SergeyV@selena.
32e68098a9 Post review updates for win32 port of mysqlslap 2006-01-20 18:20:03 +03:00
andrey@lmy004.
b9a0a5dd57 fix for bug#16548 (Events: can't alter clause for preserve)
WL #1034 (Internal CRON)
2006-01-20 16:12:44 +01:00
knielsen@mysql.com
78b722b58c Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:04 +01:00
knielsen@mysql.com
585f5b284b Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 14:50:03 +01:00
tomas@poseidon.ndb.mysql.com
996f4a3ccb option to run mysql-test-run without binlog
calculate ndbcluster slave port
2006-01-20 14:50:02 +01:00
knielsen@mysql.com
08ef3d2b9d Fix formatting. 2006-01-20 13:51:18 +01:00
knielsen@mysql.com
c9c276d9a4 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 13:26:41 +01:00
knielsen@mysql.com
8de62c574b Merge mysql.com:/usr/local/mysql/mysql-5.1-new
into  mysql.com:/usr/local/mysql/tmp5.1
2006-01-20 13:24:18 +01:00
knielsen@mysql.com
c346208a40 Portability compilation fixes. 2006-01-20 13:23:24 +01:00
knielsen@mysql.com
ae8697820c Back out errorneous Windows fix. 2006-01-20 13:17:55 +01:00
tomas@poseidon.ndb.mysql.com
cfc336a051 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-20 13:07:59 +01:00
tomas@poseidon.ndb.mysql.com
bbb5af9c7b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
2006-01-20 12:56:39 +01:00
tomas@poseidon.ndb.mysql.com
826d0066ee fix so that ndb builds --without-ndb-binlog 2006-01-20 12:55:07 +01:00
jonas@perch.ndb.mysql.com
7a00b864f8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1.4
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-20 11:05:02 +01:00
joerg@mysql.com
5788197dfc Merge mysql.com:/M51/merge-5.1 into mysql.com:/M51/mysql-5.1 2006-01-20 10:45:30 +01:00
tomas@poseidon.ndb.mysql.com
ee90c6d301 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-20 09:10:58 +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
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