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
77d37e5810
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-30 08:37:47 +02:00
mats@romeo.(none)
1694f98859
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-rpl
2007-03-30 04:49:06 +02:00
mats@romeo.(none)
55dd7f8bd8
Post merge fixes of result files.
2007-03-30 04:44:49 +02:00
cbell/Chuck@mysql_cab_desk.
b41603e6b9
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629_test
2007-03-29 16:54:16 -04:00
cbell/Chuck@mysql_cab_desk.
c7c1b341f7
WL#3629 - Replication of Invocation and Invoked Features
...
This patch changes test to remove Windows-specific limitations and potential
rounding errors in the calculation of a UDF.
Also corrects a minor merge conflict.
2007-03-29 16:43:00 -04:00
mats@romeo.(none)
b463c78218
Post-merge patch.
2007-03-29 22:32:28 +02:00
mats@romeo.(none)
e12cc44ac3
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/w3464-mysql-5.1-new-rpl
2007-03-29 21:38:03 +02:00
tomas@whalegate.ndb.mysql.com
5610fb9f42
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-29 20:50:19 +02:00
mats@romeo.(none)
7c187c2c9b
WL#3464: Add replication event to denote gap in replication
...
Adding an event that can be used to denote that an incident occured
on the master. The event can be used to denote a gap in the replication
stream, but can also be used to denote other incidents.
In addition, the injector interface is extended with functions to
generate an incident event. The function will also rotate the binary
log after generating an incident event to get a fresh binary log.
2007-03-29 20:31:09 +02:00
cbell/Chuck@mysql_cab_desk.
9fb3199c26
WL#3629 - Replication of Invocation and Invoked Features
...
This patch corrects an error in the header file concerning a method declaration
in the header file. Compiles ok on Windows, but not on Linux.
2007-03-29 13:21:59 -04:00
cbell/Chuck@mysql_cab_desk.
0322284f92
WL#3629 - Replication of Invocation and Invoked Features
...
This patch corrects errors that occurred in a local manual merge.
It adds the originator column in the results of the SHOW EVENTS command
for a series of tests.
The only code change is to correct references to the classname in
enums.
2007-03-29 11:11:28 -04:00
cbell/Chuck@mysql_cab_desk.
a591514a67
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
2007-03-29 09:54:59 -04:00
tomas@whalegate.ndb.mysql.com
5143b870dd
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-03-29 15:49:44 +02:00
cbell/Chuck@mysql_cab_desk.
0627a31d7d
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
...
into mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
2007-03-29 08:38:06 -04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
f02726e72a
post-merge test fixes
2007-03-29 14:21:44 +02:00
tomas@whalegate.ndb.mysql.com
998c68261f
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-29 14:21:15 +02:00
tomas@whalegate.ndb.mysql.com
51105a7781
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-29 14:20:34 +02:00
tomas@whalegate.ndb.mysql.com
d10de8e783
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-29 14:18:22 +02:00
cbell/Chuck@mysql_cab_desk.
89838e1008
WL#3629 - Replication of Invocation and Invoked Features
...
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct
problems found during the recalculation of next execution of events in RBR.
2007-03-29 08:17:19 -04:00
tomas@whalegate.ndb.mysql.com
ca5f4f4642
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-29 14:15:19 +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
tomas@whalegate.ndb.mysql.com
b327e23c5b
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-03-29 14:10:51 +02:00
tomas@whalegate.ndb.mysql.com
90113ac9ee
Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
...
- also run this patch on 32 bit machines to allow online upgrade
2007-03-29 14:10:21 +02:00
tomas@whalegate.ndb.mysql.com
8f8a659b79
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-03-29 13:52:17 +02:00
lars/lthalmann@dl145j.mysql.com
812a54ce88
Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-29 13:52:12 +02:00
lars/lthalmann@dl145j.mysql.com
771e05d657
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-29 13:49:10 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-29 12:25:28 +02:00
tomas@whalegate.ndb.mysql.com
5660e224c2
Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
...
- increase var part reference from 32 to 64 bits on 64 bit systems
- note current patch does not allow for online upgrade from 32 to 64 bit systems or vice versa
2007-03-29 11:05:32 +02:00
joerg@trift-lap.fambruehe
4507c6757a
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
bar@bar.myoffice.izhnet.ru
306af7f4bc
Merge mysql.com:/home/bar/mysql-5.0.b27079
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:36:28 +05:00
bar@mysql.com
d5c6680443
Code layout fix for bug N 27079
...
Thanks to Gluh for suggestion.
2007-03-29 10:32:38 +05:00
bar@mysql.com
6d290278cc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b27079
2007-03-29 10:19:45 +05:00
bar@mysql.com
3099b103ce
Merge mysql.com:/home/bar/mysql-5.0.b22378
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:03:59 +05:00
bar@mysql.com
98a4bb356a
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b22378
2007-03-29 10:00:01 +05:00
kent@mysql.com/kent-amd64.(none)
7eeae6ff13
Makefile.am:
...
Extended test section
Removed duplicate EXTRA_DIST
2007-03-28 23:18:43 +02:00
kent@kent-amd64.(none)
0544355385
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7
configure.in:
...
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
Removed Cybozu patches
2007-03-28 23:00:50 +02:00
kent@kent-amd64.(none)
082de779b3
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 22:50:43 +02:00
baker@bk-internal.mysql.com
1b9c4358a8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-28 22:31:10 +02:00
joerg@trift-lap.fambruehe
385526f768
mysys/my_thr_init.c : Avoid warnings of "unused variable" by extending a '#ifdef'.
2007-03-28 19:01:49 +02:00
serg@janus.mylan
fd1d4f864e
compiler warnings
2007-03-28 17:12:38 +02:00
serg@janus.mylan
52ca332600
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
2007-03-28 15:47:48 +02:00
mats@romeo.(none)
fc44f5c8ed
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-rpl
2007-03-28 15:40:45 +02:00
serg@janus.mylan
e5b660487b
restored run-time thread lib detection
2007-03-28 15:33:29 +02:00
mats@romeo.(none)
0488fd87c8
Eliminating some warnings.
2007-03-28 15:30:03 +02:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
3014488a1f
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dsl-hkibras1-ff1dc300-249.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bugBug27015-s_query_q_append
2007-03-28 14:59:00 +03:00
bar@bar.myoffice.izhnet.ru
f418475eec
Merge mysql.com:/home/bar/mysql-5.0.b25946
...
into mysql.com:/home/bar/mysql-5.1.b25946
2007-03-28 15:12:25 +05:00
aelkin/elkin@dsl-hkibras1-ff1dc300-249.dhcp.inet.fi
cc40358768
Bug#27015 s_query.q_append() called without s_query.reserve()?
...
there is a way to miss allocation for the punctuation marks,
namely if (q == EOF) is true inside of append_identifier(), i.e in case names are not quoted
(not by default).
Replacing q_append with the method with reallocation if needed.
2007-03-28 12:18:06 +03:00
tomas@whalegate.ndb.mysql.com
5f1abd8c6b
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
...
- test case
2007-03-28 10:10:27 +02:00