tomas@poseidon.ndb.mysql.com
5cc1da5424
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-23 22:50:20 +01:00
tomas@poseidon.ndb.mysql.com
57198f85d6
Bug #18472 race condition between multiple mysqld's when setting up cluster/schema
...
- check that event is the correct one, and only delete if wrong version
2006-03-23 22:49:02 +01:00
pekka@mysql.com
a2263a1fbf
ndb - bug#17813 schema.query => blob
2006-03-23 04:59:14 +01:00
tomas@poseidon.ndb.mysql.com
bd9f9533fb
Bug #18395 dual mysqld's with binlog do not sync drop table binlog event correctly
...
- in ndb_binlog_thread_handle_schema_event make sure to postpone "slock achnowledgement" until event has been put into the binlog
+ some cleanup, Cluster_replication_schem -> Cluster_schema, indentation
2006-03-21 16:54:56 +01:00
tomas@poseidon.ndb.mysql.com
5a4e512942
changed test to make it predictable
2006-03-13 09:55:41 +01:00
tomas@poseidon.ndb.mysql.com
a7e7a1acf4
wl#3023 clean up
...
- enabling some new tests
2006-03-11 15:52:38 +01:00
tomas@poseidon.ndb.mysql.com
e4b7cd8eab
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-03-11 07:26:58 +01:00
tomas@poseidon.ndb.mysql.com
485580e436
wl#3023 ndb to return correct tables for initial table maps
...
+ removed extra binlog events generated by drop table schema ops to produce predictable test cases
2006-03-11 06:58:48 +01:00
lars@mysql.com
681c8717ae
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
2006-03-10 17:31:06 +01:00
tomas@poseidon.ndb.mysql.com
a7f9699d8a
added missing dbug_return
2006-03-10 10:41:52 +01:00
lars@mysql.com
6bcac9fcc6
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new
...
into mysql.com:/users/lthalmann/bk/mysql-5.1-new-wl3023-mats
2006-03-09 16:12:58 +01:00
tomas@poseidon.ndb.mysql.com
280e2bf440
Bug #18106 Ndb: Online add index together with replication may cause mysqld core
2006-03-09 15:50:26 +01:00
tomas@poseidon.ndb.mysql.com
dc08a83735
missing DBUG_RETURN added
2006-03-09 09:30:32 +01:00
tomas@poseidon.ndb.mysql.com
610aa1e07c
Bug #17838 binlog not setup on seconday master after rename
...
-added setting up of binlogging after receiving rename table
+cleanup
2006-03-09 01:04:13 +01:00
mats@mysql.com
2b2691e975
WL#3023 (Use locks in a statement-based manner):
...
Minor changes to make it work with NDB.
2006-03-08 14:12:26 +01:00
mats@mysql.com
e0f5d35ceb
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-03-03 09:57:42 +01:00
mats@mysql.com
0ffd1be87d
WL#3023 (RBR: Use locks in a statement-like manner):
...
More adaptions to make it work with existing code base.
2006-03-03 09:49:46 +01:00
tomas@poseidon.ndb.mysql.com
500fa8262a
Bug #17827 cluster: rename of several tables in one statement, gets multiply logged
...
- redo log table query for log, split into separate entries per rename, to avoid duplicates, also to only log renames that relate to ndb tables
2006-03-01 18:23:00 +01:00
tomas@poseidon.ndb.mysql.com
df6bb1994b
Bug #17805 Cluster_replication database should be renamed to just cluster
2006-03-01 13:31:21 +01:00
tomas@poseidon.ndb.mysql.com
4dee17f159
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-28 12:40:19 +01:00
tomas@poseidon.ndb.mysql.com
fecfbb4834
Bug#16385, Partitions: crash when updating a range partitioned NDB table
...
- too little space was allocated for receiving events, partition uses extra column in table
2006-02-28 12:28:52 +01:00
mats@mysql.com
1e66bc0d16
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-02-28 10:06:58 +01:00
mats@mysql.com
f0f8795beb
Post-merge fixes.
2006-02-27 17:23:20 +01:00
mats@mysql.com
a865af0d4b
Merge mysql.com:/home/bkroot/mysql-5.1-new
...
into mysql.com:/home/bk/fix-mysql-5.1-release
2006-02-27 09:09:02 +01:00
monty@mysql.com
386276d89d
Cleanups
...
Don't run upgrade.test with embedded server as it requires mysqlcheck
2006-02-26 16:03:43 +02:00
guilhem@mysql.com
0071749595
WL#2977 and WL#2712 global and session-level variable to set the binlog format (row/statement),
...
and new binlog format called "mixed" (which is statement-based except if only row-based is correct,
in this cset it means if UDF or UUID is used; more cases could be added in later 5.1 release):
SET GLOBAL|SESSION BINLOG_FORMAT=row|statement|mixed|default;
the global default is statement unless cluster is enabled (then it's row) as in 5.1-alpha.
It's not possible to use SET on this variable if a session is currently in row-based mode and has open temporary tables (because CREATE
TEMPORARY TABLE was not binlogged so temp table is not known on slave), or if NDB is enabled (because
NDB does not support such change on-the-fly, though it will later), of if in a stored function (see below).
The added tests test the possibility or impossibility to SET, their effects, and the mixed mode,
including in prepared statements and in stored procedures and functions.
Caveats:
a) The mixed mode will not work for stored functions: in mixed mode, a stored function will
always be binlogged as one call and in a statement-based way (e.g. INSERT VALUES(myfunc()) or SELECT myfunc()).
b) for the same reason, changing the thread's binlog format inside a stored function is
refused with an error message.
c) the same problems apply to triggers; implementing b) for triggers will be done later (will ask
Dmitri).
Additionally, as the binlog format is now changeable by each user for his session, I remove the implication
which was done at startup, where row-based automatically set log-bin-trust-routine-creators to 1
(not possible anymore as a user can now switch to stmt-based and do nasty things again), and automatically
set --innodb-locks-unsafe-for-binlog to 1 (was anyway theoretically incorrect as it disabled
phantom protection).
Plus fixes for compiler warnings.
2006-02-25 22:21:03 +01:00
mats@mysql.com
13a61982a9
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/home/bk/w3023-mysql-5.1-new
2006-02-24 16:31:38 +01:00
mats@mysql.com
101edab125
WL#3023 (RBR: Use locks in a statement-like manner):
...
Adaptions to make it work with NDB.
2006-02-24 16:19:55 +01:00
mats@mysql.com
584388c74c
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new
2006-02-23 13:49:27 +01:00
mats@mysql.com
5dab541c3a
Bug#17181 (mysqlslap test server crash):
...
Moving assignments to table_map_id for thread-safe handling of
table shares.
2006-02-23 13:34:03 +01:00
konstantin@mysql.com
5d07195888
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-22 20:15:24 +03:00
konstantin@mysql.com
97d36a453e
Post-merge fixes.
2006-02-22 20:03:25 +03:00
mskold@mysql.com
bdf3e238b8
Removed unnecessary unlock/lock of mutex
2006-02-22 16:05:57 +01:00
mskold@mysql.com
865a3c9204
Fixes for push version of discover of on-line altered table
2006-02-22 15:19:22 +01:00
mskold@mysql.com
043a16e34a
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-02-21 13:54:58 +01:00
mskold@mysql.com
df4a632339
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-02-20 22:23:02 +01:00
pekka@mysql.com
976be6facc
ndb - rbr blobs etc: minor changes bug#17045 bug#17505
2006-02-20 16:36:30 +01:00
pekka@mysql.com
78d3257f37
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-20 12:37:27 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b
Bug #17559 ndb_gis test failure
...
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
pekka@mysql.com
32298c75c0
ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
2006-02-20 12:07:12 +01:00
pekka@mysql.com
5007310de2
ndb - rbr blobs: remove obsolete problem-causing temporary fix
2006-02-17 11:53:39 +01:00
mskold@mysql.com
406d52d4aa
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-02-17 10:20:16 +01:00
mskold@mysql.com
6d87be2c34
Invalidate table including all it's indexes from binlog thread
2006-02-17 09:44:12 +01:00
pekka@mysql.com
ad86b3e43a
ndb - wl#3023 : pass tables per GCI to injector at epoch start
2006-02-16 14:54:30 +01:00
mskold@mysql.com
ae586462b2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb_improved_on-line_discover
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
2006-02-16 10:15:44 +01:00
mskold@mysql.com
e62db4e18c
Improvement of on-line discovery in injector thread
2006-02-16 10:07:31 +01:00
tomas@poseidon.ndb.mysql.com
704562f696
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-16 03:24:55 +01:00
tomas@poseidon.ndb.mysql.com
212d8c05e6
Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist
2006-02-16 03:23:43 +01:00
tomas@poseidon.ndb.mysql.com
cd8f8449e2
Bug #17414 ndb schema distribution functionality does not work on mysql servers without binlog
2006-02-16 00:30:56 +01:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00