mskold/marty@mysql.com/linux.site
eaba3f2548
ha_ndbcluster.h, ha_ndbcluster.cc:
...
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
Merge
2007-04-24 14:24:06 +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
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
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
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
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
tomas@whalegate.ndb.mysql.com
e372d0419a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 21:27:17 +02:00
tomas@whalegate.ndb.mysql.com
33680fa2f7
correction of manual merge
2007-04-02 21:26:27 +02:00
tomas@whalegate.ndb.mysql.com
f2437037f3
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-02 18:51:45 +02:00
tomas@whalegate.ndb.mysql.com
0accd5f242
corrected previos manual merge
2007-04-02 18:49:52 +02:00
tomas@whalegate.ndb.mysql.com
661453619e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-04-02 18:39:40 +02:00
tomas@whalegate.ndb.mysql.com
c02efd8f1b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-02 18:22:33 +02:00
tomas@whalegate.ndb.mysql.com
dd6073f5d7
BUG#27560: Memory usage of mysqld grows while doing nothing
...
The query-cache watch thread was continually allocating new thread entries on the
THD MEM_ROOT, not freed until server exit.
Fixed by using a simple array, auto-expanded as necessary.
2007-04-02 18:21:05 +02:00
tomas@whalegate.ndb.mysql.com
3129179178
Bug #27378 update becomes delete on slave
...
- quick workaround, better patch is needed later
- test case
2007-03-29 14:14:42 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9734a8eac7
Bug#26898, Alter table to empty merge from ndb causes mysqld to crash
2007-03-28 10:32:06 +08:00
kostja@bodhi.local
b42b416400
Remove unnecessary casts to uchar. The casts are stemming from
...
the lexer API which internally uses unsigned char variables to
address its state map. The implementation of the lexer should be
internal to the lexer, and not influence the rest of the code.
2007-03-27 21:09:56 +04:00
tomas@whalegate.ndb.mysql.com
71ec671d4d
correction of manual merge
2007-03-26 21:10:34 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
c445baeabd
correct medium int printout
...
correct cit printout
correct bit store retrieve
2007-03-26 17:57:00 +02:00
tomas@whalegate.ndb.mysql.com
405fb2cfb6
Bug #26986 BIT(33) for ndb is broken on solaris.
...
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
mskold/marty@mysql.com/linux.site
daec2ad6d4
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-03-24 08:21:59 +01:00