kostja@bodhi.(none)
9d48e76b20
Sort class handler public declarations.
2007-12-19 00:36:20 +03:00
serg@janus.mylan
e97f18135c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-18 20:27:23 +01:00
dkatz@damien-katzs-computer.local
6b2815bedc
Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/Com_create_function
2007-12-18 13:52:26 -05:00
skozlov/ksm@mysql.com/virtop.localdomain
b1f2a84bba
WL#4077. Added new value 'ENABLED' for 'support' column of information_schema.engines
2007-12-18 16:10:58 +03:00
kostja@vajra.(none)
ef4295af44
Consistently use doxygen comments in class handler.
2007-12-18 15:47:22 +03:00
istruewing@stella.local
cd1b00e8bb
Bug#32705 - myisam corruption: Key in wrong position
...
at page 1024 with ucs2_bin
Inserting strings with a common prefix into a table with
characterset UCS2 corrupted the table.
An efficient search method was used, which compares end space
with ASCII blank. This doesn't work for character sets like UCS2,
which do not encode blank like ASCII does.
Use the less efficient search method _mi_seq_search()
for charsets with mbminlen > 1.
2007-12-18 12:29:50 +01:00
gkodinov/kgeorge@magare.gmz
af1231fa80
Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B19390-5.1-opt
2007-12-18 11:07:08 +02:00
gkodinov/kgeorge@magare.gmz
1a8b8eb91c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt
2007-12-18 10:45:05 +02:00
hezx@hezx.(none)
f858fe1064
Fixed some test case for BUG#32205
2007-12-18 15:43:51 +08:00
df@pippilotta.erinye.com
92de4d5e78
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-17 19:08:55 +01:00
df@pippilotta.erinye.com
01b6c78fbe
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-12-17 19:01:14 +01:00
gkodinov/kgeorge@magare.gmz
695342d676
Bug #19390 : Test 'rpl_trigger' fails, might be random
...
The checks in the test for bug #12480 were too wide and
made the test to depend on the procedures and triggers
present in the server.
Corrected the test to check only for the procedure and
trigger it creates.
2007-12-17 18:56:39 +02:00
tnurnberg@sin.intern.azundris.com
c25619f25f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into sin.intern.azundris.com:/misc/mysql/32770/51-32770
2007-12-17 16:22:00 +01:00
tnurnberg@white.intern.koehntopp.de
e6fc773b43
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 16:16:39 +01:00
cmiller@zippy.cornsilk.net
6accbba0c0
Order results to be deterministic.
...
Follow SergG's lead with mysqlcheck result.
2007-12-17 08:51:29 -05:00
serg@janus.mylan
a2eb9e01ed
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-17 14:28:10 +01:00
hezx@hezx.(none)
f8fb5adc2f
Merge hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/5.1
...
into hezx.(none):/media/sda3/work/mysql/bkwork/bug#32205/mysql-5.1-new-rpl
2007-12-17 21:21:23 +08:00
tnurnberg@white.intern.koehntopp.de
977a189e24
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 14:17:18 +01:00
hezx@hezx.(none)
3255237fc2
BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates
...
fine
The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.
Start a newline before appending delimiter after a query string
2007-12-17 21:13:25 +08:00
joerg@trift2.
e591fc7cb8
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-12-17 14:10:01 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b89fabe164
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 14:06:15 +01:00
joerg@trift2.
af73c6c867
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-12-17 13:40:06 +01:00
joerg@trift2.
7bd4ac4df7
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-12-17 13:36:17 +01:00
tnurnberg@white.intern.koehntopp.de
72b007864e
Merge mysql.com:/misc/mysql/31752_/50-31752_
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-12-17 12:11:14 +01:00
tnurnberg@white.intern.koehntopp.de
5016d16507
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 12:10:26 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
93894a444e
Bug#31752: check strmake() bounds
...
fix test program
2007-12-17 12:09:21 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
491b664fad
Bug#31752: check strmake() bounds
...
build fixes
2007-12-17 10:43:19 +01:00
tnurnberg@white.intern.koehntopp.de
1d84609890
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 09:56:40 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
94d7b8273f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-12-17 09:48:30 +01:00
tnurnberg@white.intern.koehntopp.de
f7aa719268
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:45:36 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b2f867155f
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into mysql.com:/misc/mysql/31752_/41-31752_
2007-12-17 09:42:55 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
efa1061a63
Merge mysql.com:/misc/mysql/31752_/50-31752_
...
into mysql.com:/misc/mysql/31752_/51-31752_
2007-12-17 09:16:47 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e131a41281
Merge mysql.com:/misc/mysql/31752_/41-31752_
...
into mysql.com:/misc/mysql/31752_/50-31752_
2007-12-17 09:13:38 +01:00
istruewing@stella.local
03a24463ca
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-12-17 09:02:24 +01:00
tnurnberg@white.intern.koehntopp.de
786b3a2b16
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/32770/51-32770
2007-12-17 08:10:13 +01:00
tnurnberg@white.intern.koehntopp.de
2ab88382ef
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/misc/mysql/32770/50-32770
2007-12-17 07:54:32 +01:00
tnurnberg@white.intern.koehntopp.de
4abda87881
Merge mysql.com:/misc/mysql/32770/50-32770
...
into mysql.com:/misc/mysql/32770/51-32770
2007-12-17 07:49:26 +01:00
tnurnberg@white.intern.koehntopp.de
d611f84449
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/misc/mysql/32350/51-32350
2007-12-17 06:55:47 +01:00
tnurnberg@white.intern.koehntopp.de
a9cffb3e4d
Merge mysql.com:/misc/mysql/32350/50-32350
...
into mysql.com:/misc/mysql/32350/51-32350
2007-12-17 06:14:53 +01:00
tnurnberg@white.intern.koehntopp.de
c0f5a7cb69
Merge mysql.com:/misc/mysql/32350/41-32350
...
into mysql.com:/misc/mysql/32350/50-32350
2007-12-17 06:13:52 +01:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b52ac74d54
Bug#32350: mysqldump should show more version information in output
...
show version of mysqldump, release of server et al., and version of
current server in mysqldumps.
2007-12-17 06:13:26 +01:00
kostja@bodhi.(none)
16f0bd712e
Try to fix assertion failures at slave shutdown when running
...
rpl_ndb tests on sapsrv1.
2007-12-15 22:24:01 +03:00
mhansson/martin@linux-st28.site
ca5f50788e
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
2007-12-15 16:45:21 +01:00
kostja@bodhi.(none)
2e82e66677
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 17:05:39 +03:00
kostja@bodhi.(none)
4bb503568d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-12-15 17:00:18 +03:00
kostja@bodhi.(none)
bffc615e6c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-12-15 16:59:43 +03:00
hezx@hezx.(none)
c2f00cc3f9
BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
...
The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.
Start a newline before appending delimiter after a query string
2007-12-15 19:50:23 +08:00
mhansson/martin@linux-st28.site
59314ee35b
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push
2007-12-15 12:07:33 +01:00
mhansson/martin@linux-st28.site
bcfdd27481
Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united-push
2007-12-15 12:02:33 +01:00
mhansson/martin@linux-st28.site
e8d1380263
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united-push
2007-12-15 11:54:02 +01:00