mjorgensen@production.mysql.com
2e174533f0
Merge bk-internal:/home/bk/mysql-5.1
...
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
2007-01-23 20:38:00 +01:00
acurtis/antony@ltamd64.xiphis.org
37f76ab496
Merge xiphis.org:/home/antony/work2/p1-bug25396.4
...
into xiphis.org:/home/antony/work2/p1-bug25396.5
2007-01-23 08:34:50 -08:00
tulin/mysqldev@mysql.com/production.mysql.com
e916f08a85
Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-build
2007-01-23 14:53:59 +01:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
fddb97da98
Bug#25396
...
"Valgrind leak in closecon_handlerton"
plugin_shutdown() calls plugin_deinitialize() which calls ha_finalize_handlerton().
ndbcluster_end() fails to wait for the ndb utility thread to exit which results in
the handlerton struct being freed before the ndb utility thread has destroyed it's THD
but before the plugin has been marked as UNINITIALIZED
Bug is caused by misuse of abort_loops variable and not locking mutex during calls to
pthread condition variable functions causing a race in valgrind's pthread_cond_wait
implementation.
2007-01-23 05:09:14 -08:00
pekka@clam.(none)
0bdb9dc809
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
2007-01-23 13:22:48 +01:00
pekka@clam.ndb.mysql.com/clam.(none)
56e2d4ffcb
ndb - bug#25562 use byte-size max_data_length() when setting blob part size
2007-01-23 12:58:10 +01:00
tomas@poseidon.mysql.com
cd5f9b2f3e
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 07:25:24 +07:00
tomas@poseidon.mysql.com
12911bb5c0
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- post review changes
2007-01-23 07:12:03 +07:00
tomas@poseidon.mysql.com
9605aee4fe
bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
...
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
2007-01-23 00:34:00 +07:00
mskold/marty@mysql.com/linux.site
c72cae75d4
Crash in rpl_ndb_dd_advance: check for null transaction pointer
2007-01-18 13:21:20 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
2fed34d7ea
ha_ndbcluster.cc:
...
Bug #25668 - corrected patch after test failures
2007-01-17 10:41:52 +01:00
tulin/mysqldev@mysql.com/production.mysql.com
1d6fe0ffaa
ha_ndbcluster.cc:
...
Bug #25668 ndb: mysqld may core if cluster disconnected
-- pTrans may be NULL, remove not needed usage of handler::ndb_err
2007-01-17 10:06:50 +01:00
mskold/marty@mysql.com/linux.site
3c36b92a1d
Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName
2007-01-16 09:19:41 +01:00
mskold/marty@mysql.com/linux.site
a74b06c723
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
2007-01-08 11:42:32 +01:00
mskold/marty@mysql.com/linux.site
0627ce96c8
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-01-08 11:18:24 +01:00
mskold/marty@mysql.com/linux.site
db0107b801
bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Added error checking
2007-01-08 10:38:53 +01:00
mskold/marty@mysql.com/linux.site
4ddf45b19c
ha_ndbcluster.h, ndb_dd_alter.result, ha_ndbcluster.cc:
...
bug#25296 Truncate table converts NDB disk based tables to in-memory tables: Changed fix to use get_tablespace_name directly instead
2007-01-04 17:26:53 +01:00
mskold/marty@mysql.com/linux.site
408e4a61d1
bug #25296 Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_info should only update for TRUNCATE since we need to detect change of STORAGE at ALTER TABLE
2007-01-04 09:15:09 +01:00
mskold/marty@mysql.com/linux.site
b448ad77c8
bug #25296 Truncate table converts NDB disk based tables to in-memory tables: ha_ndbcluster::update_create_infohas to check for explicit STORAGE MEMORY
2007-01-03 10:22:31 +01:00
mskold/marty@mysql.com/linux.site
a4e84daa7f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-01-03 10:04:47 +01:00
mskold/marty@mysql.com/linux.site
500918f2ab
bug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info
2007-01-02 22:31:29 +01:00
mskold/marty@mysql.com/linux.site
40ab7bdb8f
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: removed use of environment variable NDB_DEFAULT_DISK
2007-01-02 10:05:58 +01:00
tomas@poseidon.
7b9a5f6de2
ndb: remove compiler warnings
2006-12-27 14:16:34 +01:00
tomas@poseidon.
044c410968
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2006-12-27 11:01:54 +01:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
mskold/marty@linux.site
7993c76c10
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-21 16:30:07 +01:00
msvensson@neptunus.(none)
7e7a0e95d3
Improve ndb thread shutdown handling
2006-12-20 22:57:23 +01:00
mskold/marty@mysql.com/linux.site
f55af1eade
ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
...
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
2006-12-20 15:15:26 +01:00
mskold/marty@mysql.com/linux.site
3587ee8e4e
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: ALTER TABLE must specify STORAGE explicitely to change it, + post review changes
2006-12-19 23:20:43 +01:00
mskold/marty@mysql.com/linux.site
dab48d5df2
bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb: copy tablespace from old table in copying alter table
2006-12-19 15:53:46 +01:00
mskold/marty@mysql.com/linux.site
856b919986
bug#19956 Problems with VARCHAR primary key and BLOB fields:put back removed error handling for HA_ERR_KEY_NOT_FOUND
2006-12-14 16:52:50 +01:00
mskold/marty@mysql.com/linux.site
8d8d063f91
Removed check for impossible error return
2006-12-14 16:27:14 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
6072b7a4c4
Merge bk-internal:/home/bk/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 18:44:14 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
mskold/marty@linux.site
93b7491421
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 16:37:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03
Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2006-12-01 11:35:05 +08:00
mskold/marty@mysql.com/linux.site
2311316962
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 23:12:33 +01:00
mskold/marty@mysql.com/linux.site
4b7e0b5fd9
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 23:10:11 +01:00
mskold/marty@mysql.com/linux.site
aa03fbcac9
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: only check pk if it is updated
2006-11-30 22:52:23 +01:00
monty@mysql.com/narttu.mysql.fi
601e6f4b2a
Fixed compiler warnings
...
Don't assert if my_thread_end() is called twice (common case)
2006-11-30 21:56:03 +02:00
mskold/marty@linux.site
7ef5479520
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 17:28:08 +01:00
mskold/marty@linux.site
a6f311750f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 17:23:54 +01:00
mskold/marty@mysql.com/linux.site
e71c09b482
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: handle INSERT ... ON DUPLICATE KEY UPDATE
2006-11-30 17:22:04 +01:00
mskold/marty@mysql.com/linux.site
a172df24a9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
d4a929d741
bug#24303 Wrong result for UPDATE IGNORE for NDB table: bug fix reverted, fix for bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key, solves it a better way
2006-11-30 15:44:30 +01:00
mskold/marty@linux.site
d7e375680a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
2a4de6fc84
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 15:05:09 +01:00