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
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
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
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
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
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
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
tsmith/tim@siva.hindu.god
e8cbda2c27
Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
...
into siva.hindu.god:/usr/home/tim/m/bk/41
2006-08-23 18:06:07 -06:00
tsmith/tim@siva.hindu.god
45460bd0af
Bug #21531 : EXPORT_SET() doesn't accept args with coercible character sets
...
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
2006-08-23 18:02:31 -06:00
tsmith/tim@siva.hindu.god
b8521714af
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-41
...
into siva.hindu.god:/usr/home/tim/m/bk/41
2006-08-23 16:30:05 -06:00
tsmith/tim@siva.hindu.god
dba7b8e81c
Bug #20402 : DROP USER failure logged as ERROR rather than WARNING
...
Remove some sql_print_error() calls which were triggered by user error (i.e., not server-level events at all).
Also, convert an sql_print_error -> sql_print_information for a non-error server event.
2006-08-23 15:37:54 -06:00
tsmith@maint1.mysql.com
e312416ef2
Merge bk-internal:/home/bk/mysql-4.1
...
into maint1.mysql.com:/data/localhome/tsmith/bk/41
2006-08-23 22:51:20 +02:00
timour/timka@lamia.home
31373e000b
Merge lamia.home:/home/timka/mysql/src/4.1-virgin
...
into lamia.home:/home/timka/mysql/src/4.1-bug-21456
2006-08-23 18:30:21 +03:00
timour/timka@lamia.home
de723f2998
Bug #21456 : SELECT DISTINCT(x) produces incorrect results when using order by
...
GROUP BY/DISTINCT pruning optimization must be done before ORDER BY
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in
SELECT DISTINCT <non-key-col>,<pk> FROM t1
ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.
2006-08-23 16:46:57 +03:00
kent@mysql.com/g4-2.local
442c111b72
mysql.spec.sh:
...
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
2006-08-22 11:48:58 +02:00
holyfoot/hf@mysql.com/vva.(none)
6f16cb371b
Merge hf@192.168.21.12:work/mysql-4.1.15440
...
into mysql.com:/home/hf/work/mysql-4.1.clean
2006-08-19 13:31:21 +05:00
holyfoot/hf@mysql.com/vva.(none)
52b5421ec3
Merge hf@192.168.21.12:work/mysql-4.1.13717
...
into mysql.com:/home/hf/work/mysql-4.1.clean
2006-08-19 13:30:44 +05:00
jimw@rama.(none)
abc148000d
Bug #21288 : mysqldump segmentation fault when using --where
...
The problem was that the error handling was using a too-small buffer to
print the error message generated. We fix this by not using a buffer at
all, but by using fprintf() directly. There were also some problems with
the error handling in table dumping that was exposed by this fix that were
also corrected.
2006-08-17 14:09:24 -07:00
ramil/ram@mysql.com/myoffice.izhnet.ru
907f5db856
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b20695
2006-08-17 11:36:03 +05:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08
Bug#20328 - Correction to test/result for broken Windows build.
2006-08-16 13:55:16 -04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
39860d67de
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b9509
2006-08-16 12:42:22 +05:00