tsmith/tim@siva.hindu.god
c965f53784
Merge siva.hindu.god:/usr/home/tim/m/bk/inno/50
...
into siva.hindu.god:/usr/home/tim/m/bk/inno/51
2006-10-20 12:44:12 -06:00
tsmith/tim@siva.hindu.god
032f356f7c
Apply InnoDB snapshot ss923
...
Fixes:
- Bug #18077 : InnoDB uses full explicit table locks in stored FUNCTION
2006-10-20 12:36:15 -06:00
tsmith/tim@siva.hindu.god
deee020489
Apply InnoDB snapshot ss923
...
Fixes:
- Bug #18077 : InnoDB uses full explicit table locks in stored FUNCTION
2006-10-20 12:34:31 -06:00
andrey@example.com
e8431818ff
Merge example.com:/work/bug23379/my50-bug23379
...
into example.com:/work/bug23379/my51-bug23379
2006-10-19 11:41:50 +02:00
andrey@example.com
5a510c7299
Merge example.com:/work/bug23379/my41-bug23379
...
into example.com:/work/bug23379/my50-bug23379
2006-10-19 11:39:19 +02:00
andrey@example.com
102d36b7f6
Fix for bug#23379 "wrong time value in SHOW PROCESSLIST"
...
The value taken to be shown in SHOW PROCESSLIST is not
initialized when THD is created and will be random for
unauthenticated connections.
To the documentor: Random value, instead of NULL, was shown,
in SHOW PROCESSLIST for still non-authenticated connections.
2006-10-19 11:37:07 +02:00
iggy@rolltop.ignatz42.dyndns.org
2ec5a57ff4
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-10-18 19:28:37 -04:00
iggy@rolltop.ignatz42.dyndns.org
b0d833c32d
Post-Merge Fix.
2006-10-18 19:17:56 -04:00
iggy@rolltop.ignatz42.dyndns.org
b61c3a7361
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745
2006-10-18 18:48:02 -04:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200
Bug#19745: mysqldump --xml produces invalid xml
...
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.
The proper XML datatype is xs:hexBinary.
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
2006-10-18 18:43:51 -04:00
msvensson@neptunus.(none)
e32b743f1c
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-19 00:18:02 +02:00
msvensson@neptunus.(none)
4d59b37f27
Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-19 00:14:22 +02:00
msvensson@neptunus.(none)
4b9ea8c0e2
Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 00:12:36 +02:00
msvensson@neptunus.(none)
9069a9367b
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-19 00:11:13 +02:00
msvensson@neptunus.(none)
4cf0a5ee74
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 00:10:36 +02:00
msvensson@neptunus.(none)
658623bd5c
Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039
...
into neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039
2006-10-18 22:58:04 +02:00
msvensson@neptunus.(none)
722aec24d3
Remove extra whitespace in result file
2006-10-18 22:47:30 +02:00
msvensson@neptunus.(none)
1547a73878
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-18 21:17:31 +02:00
msvensson@neptunus.(none)
ecccb89ca2
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 21:16:04 +02:00
msvensson@neptunus.(none)
a755fae8d6
Merge 192.168.0.4:mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-18 21:15:27 +02:00
msvensson@neptunus.(none)
96c0c99577
Merge 192.168.0.4:mysql/mysql-5.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-18 19:21:10 +02:00
msvensson@neptunus.(none)
d4d84a88f6
Merge 192.168.0.4:mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 19:17:15 +02:00
msvensson@shellback.(none)
3d42998cee
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-18 18:45:00 +02:00
msvensson@shellback.(none)
f83e9e4f18
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 18:02:07 +02:00
msvensson@shellback.(none)
4cefd49b81
Put the printf of failed ratio on itäs only line, printf was tricked
...
into thinking the escaped % + w was a format specifier
2006-10-18 17:58:26 +02:00
msvensson@shellback.(none)
d71d1a64de
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 17:16:53 +02:00
msvensson@shellback.(none)
770a1f919f
Don't stop the time in mtr_timer_timeout, that will be done after testcase or when program exit
2006-10-18 17:16:08 +02:00
msvensson@shellback.(none)
09d069fa01
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 16:41:01 +02:00
msvensson@shellback.(none)
dd6a9307f1
Remove some junk
2006-10-18 16:40:22 +02:00
msvensson@shellback.(none)
1feac4d44f
Stop all timers before exiting when --start-and-exit
2006-10-18 16:39:00 +02:00
msvensson@shellback.(none)
a5561176e4
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 16:31:38 +02:00
msvensson@shellback.(none)
4890ed261c
Fix bug where a timer was stopped by calling mtr_timer_stop with a "timer" instead of it's name
2006-10-18 16:30:51 +02:00
msvensson@shellback.(none)
ae10cfc01a
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-18 13:25:06 +02:00
msvensson@shellback.(none)
8d72bf9448
Make --with-ndbcluster only be valid together with --bench
...
Improve code that detects if ndb shuold be installed
Remove call to stop_all_servers after install db, if any servers are still running
and need to be stopped they will be stopped atuomatically
2006-10-18 13:24:06 +02:00
cmiller@zippy.cornsilk.net
0fdfb36263
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 16:24:47 -04:00
cmiller@zippy.cornsilk.net
cf9f5b8b14
Merge fixes.
2006-10-17 16:22:44 -04:00
tsmith/tim@siva.hindu.god
a42a06cff5
Update ps and show_check results to account for new -master.opt settings.
2006-10-17 12:15:14 -06:00
cmiller@zippy.cornsilk.net
7714fea9a2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
2006-10-17 12:31:52 -04:00
cmiller@zippy.cornsilk.net
91c4edfbfb
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 12:00:36 -04:00
cmiller@zippy.cornsilk.net
184467a2cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-10-17 11:23:07 -04:00
cmiller@zippy.cornsilk.net
3a709f50b2
Fix previous bad patch for Bug#14262.
...
Remove table engine qualification where it's unnecessary.
2006-10-17 11:06:11 -04:00
Kristofer.Pettersson@naruto.
cda2a11330
Merge naruto.:C:/cpp/bug23010/my51-bug23010
...
into naruto.:C:/cpp/mysql-5.1-new-maint
2006-10-17 13:32:58 +02:00
msvensson@shellback.(none)
84d455b4f2
Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-17 11:31:56 +02:00
Kristofer.Pettersson@naruto.
550c9e55f3
Merge naruto.:C:/cpp/bug23010/my50-bug23010
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-10-17 10:53:53 +02:00
Kristofer.Pettersson@naruto.
44e01d4144
Merge naruto.:C:/cpp/bug23010/my50-bug23010
...
into naruto.:C:/cpp/bug23010/my51-bug23010
2006-10-17 10:37:55 +02:00
msvensson@shellback.(none)
d45b61b1b5
Remove warnings
...
Set comment properly before calling mtr_report_test failed and report_failure_restart
2006-10-17 10:31:06 +02:00
msvensson@shellback.(none)
3f46c5cdbd
When calculating what features to use for _this_ test run, don't look at test that already are deterined to be skipped
2006-10-17 08:10:51 +02:00
tsmith/tim@siva.hindu.god
60de8b58bc
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
2006-10-16 20:18:11 -06:00
tsmith/tim@siva.hindu.god
df200bd018
Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
2006-10-16 20:15:14 -06:00
tsmith/tim@siva.hindu.god
285c14d3e7
Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
2006-10-16 20:10:48 -06:00