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
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.
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
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
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
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
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
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
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
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
baker@bk-internal.mysql.com
2bfa1aa3d6
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-27 18:44:02 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-27 18:12:33 +02:00
mats@romeo.(none)
c9a7855f7f
BUG#22583 (RBR between MyISAM and non-MyISAM tables containing a BIT
...
field does not work):
Enabling previously disabled test.
2007-03-27 17:21:47 +02:00
mats@romeo.(none)
06b5e9bb53
BUG#27441 (There is no COLS bitmap for the after image of an update
...
rows event):
Adding a after image COLS bitmap to Update_rows_log_event (for telling
what columns that are present in the after image of each row update).
Also fixing case where Rows_log_event length was not correctly computed
(happened when the number of columns in a table was more than 251).
2007-03-27 12:17:51 +02:00
joerg@trift-lap.fambruehe
336f03d151
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-27 12:06:13 +02:00
bar@mysql.com
5e52cd3650
Bug#25946 Namespace not include for xsi usage within --xml output with null/nil values
...
Fix: adding namespace reference into "mysql --xml" output,
to make it work similary to "mysqldump --xml".
2007-03-27 13:30:43 +05:00
bar@mysql.com
1b426d3c6d
Bug#27079 Crash while grouping empty ucs2 strings
...
Problem: GROUP BY on empty ucs2 strings crashed server.
Reason: sometimes mi_unique_hash() is executed with
ptr=null and length=0, which means "empty string".
The branch of code handling UCS2 character set
was not safe against ptr=null and fell into and
endless loop even if length=0 because of poiter
arithmetic overflow.
Fix: adding special check for length=0 to avoid pointer arithmetic
overflow.
2007-03-27 12:20:20 +05:00
tomas@whalegate.ndb.mysql.com
1bae3e5726
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 21:13:46 +02:00
cbell/Chuck@mysql_cab_desk.
71c4bd1f0a
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-26 09:57:16 -04:00
brian@zim.(none)
68cdfea52a
Merge zim.(none):/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/slap-5.1
2007-03-26 02:29:09 -07:00
brian@zim.(none)
9a2a7071be
Added pre and post option to test run (allows me to adjust an engine once all of the data has been loaded).
...
Kinda obvious that this was going to come up ;)
2007-03-26 02:24:49 -07:00
mats@romeo.(none)
6269e4f216
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
2007-03-26 09:02:38 +02:00
pekka@clam.(none)
5f061a7e5c
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00
tomas@whalegate.ndb.mysql.com
ac0da397db
rpl_ndb_sync.result, ndb_partition_key.result:
...
test case
2007-03-23 21:49:49 +01:00
baker@bk-internal.mysql.com
503d7b20cb
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-23 20:25:36 +01:00
joerg@trift2.
751531fca7
mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded".
2007-03-23 17:31:10 +01:00
tomas@whalegate.ndb.mysql.com
972837350b
result file updates, message format changes
2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b
enabled and extended single user test
2007-03-23 17:14:38 +01:00
tomas@poseidon.mysql.com
210d055000
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-23 13:10:58 +01:00
joerg@trift2.
2e5e79cf37
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-03-23 10:57:17 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 08:20:36 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e06a8826c9
fixes to make embedded-server test working
2007-03-23 10:16:30 +04:00
omer@linux.site
cbdd03c5d5
Merge linux.site:/home/omer/source/bld50_0321
...
into linux.site:/home/omer/source/bld51_0322
2007-03-22 14:49:25 -07:00
holyfoot/hf@mysql.com/hfmain.(none)
7eb78d8d04
merging
2007-03-23 01:46:02 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e1044ab5d1
merging
2007-03-23 01:04:31 +04:00
holyfoot/hf@hfmain.(none)
a7f5f07b6f
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 00:09:12 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fc23f3356e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-23 00:04:47 +04:00
holyfoot/hf@hfmain.(none)
81b59fb3cc
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:59:20 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
68f9ff123c
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:54:47 +04:00
holyfoot/hf@hfmain.(none)
09d4529457
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-22 23:49:44 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
0102d38ef4
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mrg/mysql-5.0-opt
2007-03-22 23:48:39 +04:00
evgen@moonbone.local
b1f852b901
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql
2007-03-22 22:15:21 +03:00
evgen@moonbone.local
1ac5987ae2
Bug#26813: The SUPER privilege is wrongly required to alter a view created by
...
another user.
When the DEFINER clause isn't specified in the ALTER statement then it's loaded
from the view definition. If the definer differs from the current user then
the error is thrown because only a super-user can set other users as a definers.
Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
definer from the original view is used without check.
2007-03-22 22:05:19 +03:00
gkodinov/kgeorge@magare.gmz
70d91d43ae
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt
2007-03-22 18:49:47 +02:00
gkodinov/kgeorge@magare.gmz
ef1bb48af9
Bug #26207 : When making the key image to use
...
in index search MySQL was not explicitly
suppressing warnings. And if the context
happens to enable warnings (e.g. INSERT ..
SELECT) the warnings resulting from converting
the data the key is compared to are
reported to the client.
Fixed by suppressing warnings when converting
the data to the same type as the key parts.
2007-03-22 18:44:16 +02:00
mats@romeo.(none)
08bb33dbd7
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b22583-mysql-5.1-new-rpl
2007-03-22 17:34:25 +01:00
guilhem@gbichot3.local
68cc7dde31
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into gbichot3.local:/home/mysql_src/mysql-5.1-rpl-26194
2007-03-22 17:32:37 +01:00