evgen@moonbone.local
31c738d8a2
query_cache.result, func_time.test, type_date.result, func_time.result:
...
Corrected test case after removal of fix for bug#16377
type_date.test:
Corrected test case after removal of fix for bug#16377
item_cmpfunc.cc:
Removed changes to the agg_cmp_type() made in the for bug#16377
2006-09-08 00:59:34 +04:00
istruewing@chilla.local
45ceab9ec5
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-09-07 16:46:20 +02:00
istruewing@chilla.local
39c0f0a484
Bug#14400 - Query joins wrong rows from table which is subject of
...
"concurrent insert"
Additional fix for full keys and test case.
2006-09-07 15:39:31 +02:00
holyfoot/hf@mysql.com/deer.(none)
668a57b10a
bug #12991 (compile error --without-geometry)
2006-09-06 19:56:19 +05:00
gkodinov/kgeorge@rakia.(none)
580d4a0df4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B16792-4.1-opt
2006-09-05 19:22:55 +03:00
jonas@perch.ndb.mysql.com
f8fdc3bcb0
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-05 15:05:52 +02:00
gkodinov/kgeorge@rakia.(none)
68b9ae4d14
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into rakia.(none):/home/kgeorge/mysql/autopush/B21392-4.1-opt
2006-09-05 13:12:30 +03:00
gkodinov/kgeorge@macbook.gmz
3758b975f8
Bug #21392 : multi-table delete with alias table name fails with
...
1003: Incorrect table name
in multi-table DELETE the set of tables to delete from actually
references then tables in the other list, e.g:
DELETE alias_of_t1 FROM t1 alias_of_t1 WHERE ....
is a valid statement.
So we must turn off table name syntactical validity check for alias_of_t1
because it's not a table name (even if it looks like one).
In order to do that we add a special flag (TL_OPTION_ALIAS) to
disable the name checking for the aliases in multi-table DELETE.
2006-09-04 18:40:30 +03:00
holyfoot/hf@mysql.com/deer.(none)
c32f62bebb
bug #12620 (UTF-8 indexing causes ER_NO_KEYFILE error)
...
The problem is that on some Mac OS X-es the file writing/reading
call with zero bytes to read/write returns error.
So here i try to eliminate that kinds of calls.
2006-09-04 19:47:24 +05:00
timour/timka@lamia.home
cf3bed86b5
BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
...
Fix an error in the bug fix.
2006-09-04 16:53:03 +03:00
jonas@perch.ndb.mysql.com
7488c8fda8
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-04 14:45:13 +02:00
jonas@perch.ndb.mysql.com
96ff8b4c52
bug#21965 - replication
...
fix deadlock if master switches log file in parallell with "show master logs"
2006-09-04 13:43:34 +02:00
timour/timka@lamia.home
5a0d5670b8
Merge lamia.home:/home/timka/mysql/src/4.1-virgin
...
into lamia.home:/home/timka/mysql/src/4.1-bug-21787
2006-09-01 17:21:49 +03:00
timour/timka@lamia.home
02e194cea2
Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
...
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.
2006-09-01 15:07:04 +03:00
msvensson@neptunus.(none)
4b41566503
Backport from 5.0
...
- Dont test "encrypt" in ctype_ucs
2006-09-01 11:21:12 +02:00
jonas@perch.ndb.mysql.com
e650052803
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-01 10:32:12 +02:00
msvensson@shellback.(none)
2cb8215809
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-01 10:26:01 +02:00
msvensson@shellback.(none)
324cf4ccb3
Add target to make "mtr", shortcut for running test suite
2006-09-01 10:21:08 +02:00
jimw@rama.(none)
2b8f30a764
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
cmiller@zippy.cornsilk.net
9c94dade04
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 12:45:49 -04:00
cmiller@zippy.cornsilk.net
2d9187fcba
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 11:30:14 -04:00
cmiller@zippy.cornsilk.net
436d3a3798
Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a
...
single file is a bad practice.
2006-08-31 11:14:04 -04:00
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
45568bbe11
BUG#18822 LOAD DATA FROM MASTER corrupts data
...
there is a bunch of dups. It has been decided to declare this feature as
deprecated.
2006-08-31 02:00:40 +03:00
tsmith@maint2.mysql.com
9a8ed3fe3e
Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-31 00:23:15 +02:00
tsmith@maint2.mysql.com
4ae5e61620
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
...
into maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-30 23:49:21 +02:00
cmiller@zippy.cornsilk.net
5a3922fbf1
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db
Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
...
event' from master"
Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.
The syscall read() wasn't checked for a negative return value for an
interrupted read. The kernel sys_read() returns -EINTR, and the "library"
layer maps that to return value of -1 and sets errno to EINTR. It's
impossible (on Linux) for read() to set errno EINTR without the return
value being -1 .
So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
2006-08-30 17:28:34 -04:00
tsmith@maint2.mysql.com
e80741b3a5
Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows
2006-08-30 22:39:23 +02:00
tsmith@maint2.mysql.com
843135ae1f
portability fix in BUILD/* for solaris
2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321
Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
...
into maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
2006-08-30 20:04:33 +02:00
gluh@mysql.com/gluh.(none)
af9895d4c2
Bug#20393 User name truncation in mysql client
...
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2006-08-30 15:56:17 +05:00
istruewing@chilla.local
7439a52434
Merge chilla.local:/home/mydev/mysql-4.0-bug14400
...
into chilla.local:/home/mydev/mysql-4.1-bug14400
2006-08-29 21:08:40 +02:00
istruewing@chilla.local
0b2a9d01ed
Bug#14400 - Query joins wrong rows from table which is
...
subject of "concurrent insert"
Better fix by Monty: "The previous bug fix didn't work
when using partial keys."
2006-08-29 20:45:04 +02:00
tsmith@maint2.mysql.com
ccdda2e7ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-29 03:58:38 +02:00
tsmith@maint1.mysql.com
1f07fa0246
Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40
...
into maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41
2006-08-29 01:15:54 +02:00
tsmith@maint1.mysql.com
54e73e93d7
minor portability fix in SETUP.sh
2006-08-29 01:13:06 +02:00
evgen@moonbone.local
109d58af66
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-27 23:43:11 +04:00
evgen@moonbone.local
13f50fdb69
Merge moonbone.local:/work/tmp_merge-4.1-mysql
...
into moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
msvensson@neptunus.(none)
4703f302fe
Dont' ever use cluster for slave in 4.1
2006-08-26 18:38:42 +02:00
msvensson@neptunus.(none)
5abbe9eb00
Ignore --skip-im if specified on command line
...
Null merge to 5.0
2006-08-25 17:01:04 +02:00
msvensson@neptunus.(none)
7e8f06c46f
Add mysqld-max-nt to list of mysqld executales to look for on windows
2006-08-25 15:23:42 +02:00
msvensson@neptunus.(none)
f0c4aba723
Backport from 5.0 a fix that will start ndb only for tests that needs it
2006-08-25 15:17:03 +02:00
msvensson@neptunus.(none)
31aa966718
Fix running tests suite with non standard tmp dir.
...
Default is "var/tmp"
2006-08-25 10:46:14 +02:00
msvensson@neptunus.(none)
655bdac0bc
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-08-25 10:11:55 +02:00
msvensson@neptunus.(none)
37be9fa3a7
Backport fix for finding executables from 5.0
2006-08-25 10:11:15 +02:00
sergefp@mysql.com
848548e16f
BUG#16255: Post-review fixes: adjust the testcase.
2006-08-24 19:16:27 +04:00
sergefp@mysql.com
d4cacdb5cc
Bug #16255 : Subquery in WHERE (the cset by Georgi Kodinov)
...
Must not use Item_direct_ref in HAVING because it points to
the new value (witch is not yet calculated for the first row).
2006-08-24 19:14:36 +04:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
2006-08-24 14:48:22 +02:00
jonas@perch.ndb.mysql.com
b60be73461
ndb - bug#21800
...
read TransactionDeadlockTimeout (for scans) to cater for insane settings
2006-08-24 07:14:46 +02:00
tsmith@maint1.mysql.com
679d1e27ed
Merge tim@tsmith.mysql.internal:m/bk/41
...
into maint1.mysql.com:/data/localhome/tsmith/bk/41
2006-08-24 02:44:49 +02:00