joerg@trift-lap.fambruehe
f723388b18
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:03:02 +02:00
msvensson@pilot.blaudden
2ac94c30f4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 17:01:02 +02:00
joerg@debian.(none)
94008df3e0
Merge debian.(none):/M51/mysql-5.1
...
into debian.(none):/M51/push-5.1
2007-04-23 11:21:15 +02:00
joerg@debian.(none)
4c00b6fd26
Merge debian.(none):/M51/mysql-5.1
...
into debian.(none):/M51/push-5.1
2007-04-20 11:58:56 +02:00
mats@romeo.(none)
875de0e571
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-04-20 10:46:34 +02:00
marty@linux.site
b80c1c3dc2
Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug #25296 Truncate table converts NDB disk based tables to in-memory tables: Check table storage before creating columns
2007-04-18 17:38:55 +02:00
joerg@trift2.
30dd22503e
Merge trift2.:/MySQL/M50/fix-ndb-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-04-18 16:52:05 +02:00
joerg@trift2.
5fc30d25ea
sql/ha_ndbcluster.cc
...
Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.
2007-04-18 16:41:38 +02:00
tomas@whalegate.ndb.mysql.com
38f9729c2a
Bug #27076 Cluster does not honor SQL_LOG_BIN flag
...
- both for data schema operations
- also make sure schema events vet the right server id when injected into the binlog
- use same mechanism to signal server_id in bug#17095, and reserve some "id's" for flagging special conditions on the event, in this case do not log it
- enable printing of server ids in the testcases to show that we cot it right
2007-04-18 16:02:20 +02:00
jamppa@bk-internal.mysql.com
b465b30847
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-17 15:45:35 +02:00
monty@mysql.com/narttu.mysql.fi
72d135bec5
Clear field_alloc when it's moved to result set (allows us to always call free_root on field_alloc)
...
Change to use remove_file instead of 'system rm' in a lot of tests. (Should fix some windows test problems)
Removed memory leak in mysql_test if sync_with_master fails.
Do not terminate ndb_cluster_binary_log before the util thread has finnished. This should fix a shutdown bug where a thread is accessing injector_mutex after it's freed.
Patch may fix Bug#27622 "mysqld shutdown, util thread continues, while binlog thread exits"
2007-04-16 17:08:29 +03:00
tomas@whalegate.ndb.mysql.com
f9a900f80e
Bug #27758 Restoring NDB backups makes table usable in SQL nodes
...
- parse indexname using "split" instead of sscanf, as not to break at space
- test case with space in key
- enclose names in printout
2007-04-12 11:07:30 +02:00
mats@romeo.(none)
fcd6ea611b
BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be
...
skipped):
Post-merge changes.
2007-04-12 10:05:55 +02:00
tomas@whalegate.ndb.mysql.com
537af12420
correct merge error
2007-04-11 19:38:29 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-11 15:51:09 +02:00
tomas@whalegate.ndb.mysql.com
dd4351e96f
Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
...
- try to catch as many malloc failures as possible and give error messages
2007-04-11 15:21:11 +02:00
jani@ua141d10.elisa.omakaista.fi
b4ba815967
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-10 16:28:47 +03:00
tomas@whalegate.ndb.mysql.com
254ad34300
disabled test and feature
2007-04-07 00:28:09 +02:00
mskold/marty@mysql.com/linux.site
5d622943e8
ha_ndbcluster.cc:
...
Bug #26591 Cluster handler does not set bits in null bytes correctly: Improved comments
ha_ndbcluster_binlog.cc:
Bug #26591 Cluster handler does not set bits in null bytes correctly: Using empty_record() instead of bzero
2007-04-05 15:59:42 +02:00
tomas@whalegate.ndb.mysql.com
970e6bc7e5
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 11:21:25 +02:00
mskold/marty@mysql.com/linux.site
bcac914163
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 09:18:37 +02:00
mskold/marty@mysql.com/linux.site
3e8cf5958b
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-05 08:39:12 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0011750d9b
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 13:42:53 +08:00
mskold/marty@linux.site
2e27f2ce27
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-05 07:34:36 +02:00
mskold/marty@linux.site
c5210c0b59
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-05 07:29:38 +02:00
mskold/marty@mysql.com/linux.site
ee034c0e59
Removed compiler warnings
2007-04-05 07:28:09 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 12:26:01 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c7da27b5b2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-04-05 11:30:19 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 10:47:40 +08:00
tomas@whalegate.ndb.mysql.com
343bfb779d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-04 23:03:27 +02:00
jani@ua141d10.elisa.omakaista.fi
e40d3631a3
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-04 21:25:39 +03:00
mskold/marty@linux.site
552d1086ec
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-04 17:03:31 +02:00
mskold/marty@linux.site
7e33b92279
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2007-04-04 13:21:49 +02:00
mskold/marty@mysql.com/linux.site
625a2629f0
Bug #26242 UPDATE with subquery and triggers failing with cluster tables
...
In certain cases AFTER UPDATE/DELETE triggers on NDB tables that referenced
subject table didn't see the results of operation which caused invocation
of those triggers. In other words AFTER trigger invoked as result of update
(or deletion) of particular row saw version of this row before update (or
deletion).
The problem occured because NDB handler in those cases postponed actual
update/delete operations to be able to perform them later as one batch.
This fix solves the problem by disabling this optimization for particular
operation if subject table has AFTER trigger for this operation defined.
To achieve this we introduce two new flags for handler::extra() method:
HA_EXTRA_DELETE_CANNOT_BATCH and HA_EXTRA_UPDATE_CANNOT_BATCH.
These are called if there exists AFTER DELETE/UPDATE triggers during a
statement that potentially can generate calls to delete_row()/update_row().
This includes multi_delete/multi_update statements as well as insert statements
that do delete/update as part of an ON DUPLICATE statement.
2007-04-04 12:50:39 +02:00
gni/root@dev3-221.dev.cn.tlan
888fcd6f7e
recovery from 5.0 merge for bug18676
2007-04-04 15:22:37 +08:00
gni/root@dev3-221.dev.cn.tlan
99895eb6c3
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug18676
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-04 14:30:12 +08:00
mskold/marty@linux.site
3a70c41512
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-03 16:27:23 +02:00
mskold/marty@mysql.com/linux.site
05216c2aa8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-04-03 14:00:38 +02:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-03 14:51:32 +03:00
tomas@whalegate.ndb.mysql.com
81ac116dfa
Bug #17095 Cluster RBR in circle does not terminate
...
- add any value to ndb
- use it to update correct server id in binlog thread
2007-04-03 12:57:18 +02:00
gni/root@dev3-221.dev.cn.tlan
98e5757618
BUG#18676 when cluster storage engine is down, misleading error message on create table with 4009.
2007-04-03 18:44:29 +08:00
kostja@bodhi.local
93d0316f45
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
0a29b7e7e3
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
2007-04-03 16:48:21 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
ac4467e6c2
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25295-5.1-new-ndb-bj
2007-04-03 16:45:47 +08:00
tomas@whalegate.ndb.mysql.com
d2bcd58e5b
Bug #26783 replication status unknown after cluster or mysqld failure
...
- correction, wrong datatype used
2007-04-03 09:53:15 +02:00
tomas@whalegate.ndb.mysql.com
7e9df0e9b6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-03 09:37:15 +02:00
tomas@whalegate.ndb.mysql.com
d019e94aed
remove unused List
2007-04-03 09:30:05 +02:00
tomas@whalegate.ndb.mysql.com
2dc02167df
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-03 07:21:42 +02:00
tomas@whalegate.ndb.mysql.com
8bf9bf001d
Bug #26783 replication status unknown after cluster or mysqld failure
...
- update the ndb_apply_status table with binlog info
2007-04-03 07:20:55 +02:00