ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
msvensson@neptunus.(none)
3426b59dbb
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 23:26:43 +02:00
msvensson@neptunus.(none)
13b9adbac3
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-19 23:13:32 +02:00
msvensson@neptunus.(none)
698e0abd11
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 20:34:28 +02:00
msvensson@neptunus.(none)
c4a570aa00
Adapt to running from "binary dist"
...
Add function mtr_exe_maybe_exists to look for binaries that is optional
Skip ndb support if it's a binary dist where mysqld supports ndb but there is no ndbd
2006-10-19 20:33:32 +02:00
msvensson@neptunus.(none)
c950eee217
Fix problem running rpl_timezone on powermacg5, it was not popular to set TZ to "" so now it's set
...
to a value wich is not our default
2006-10-19 20:29:33 +02:00
msvensson@neptunus.(none)
c7710510ac
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 17:15:49 +02:00
msvensson@neptunus.(none)
9a5b4a1151
Add command "exit" to mysqltest, it will stop processing any more
...
commands and go directly to result file processing
2006-10-19 13:34:09 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f6ea36c3a5
Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-19 16:15:30 +05:00
msvensson@neptunus.(none)
9a0e8fb4a1
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 12:36:40 +02:00
andrey@example.com
e9f826028e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23379/my50-bug23379
2006-10-19 11:52:35 +02:00
andrey@example.com
4030175bc5
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug23379/my41-bug23379
2006-10-19 11:50:28 +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
msvensson@neptunus.(none)
6573fed1c7
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 11:35:10 +02:00
msvensson@neptunus.(none)
f59ac964f4
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-19 11:31:12 +02:00
msvensson@neptunus.(none)
b11dee73ca
Backport test cases fixes from 5.0
2006-10-19 10:54:23 +02:00
andrey@example.com
c1d42efcb5
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug23379/my41-bug23379
2006-10-19 10:31:46 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0027b6e4b7
Fix for bug #20732 : Partial index and long sjis search with '>' fails sometimes
...
We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
Create table t1(a char(2), key(a(1)));
insert into t1 values ('a'), ('xx');
select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.
Fix: don't use open segments in such a case.
2006-10-19 12:52:37 +05:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-10-18 19:27:14 -04:00
msvensson@neptunus.(none)
179c17adfa
Merge neptunus.(none):/home/msvensson/mysql/bug22436/my50-bug22436
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 01:01:54 +02:00
msvensson@neptunus.(none)
9a50d74fbb
Change the ssl related variables to loose so they work also when the server is compiled without ssl
2006-10-19 00:53:01 +02: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)
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)
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)
722aec24d3
Remove extra whitespace in result file
2006-10-18 22:47:30 +02:00
msvensson@neptunus.(none)
c2b656fa68
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-18 21:41:04 +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
andrey@example.com
b53f83881e
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug23379/my41-bug23379
2006-10-18 20:07:28 +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
andrey@example.com
9010a79527
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-18 18:17:41 +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
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
3a709f50b2
Fix previous bad patch for Bug#14262.
...
Remove table engine qualification where it's unnecessary.
2006-10-17 11:06:11 -04: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
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
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