mikael/pappa@dator5.(none)
3b9f4a616c
Merge dator5.(none):/home/pappa/clean-mysql-5.1
...
into dator5.(none):/home/pappa/bug18198
2006-08-26 06:18:41 -04:00
mikael/pappa@dator5.(none)
b28a550eb4
Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt
...
into dator5.(none):/home/pappa/bug21388
2006-08-26 06:14:05 -04:00
cmiller@zippy.cornsilk.net
5db9cce5fd
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
2006-08-25 14:34:17 -04: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
andrey@example.com
f115ecf89f
Fix for bug#21795: SP: sp_head::is_not_allowed_in_function() contains
...
erroneous check
Problem: Actually there were two problems in the server code. The check
for SQLCOM_FLUSH in SF/Triggers were not according to the existing
architecture which uses sp_get_flags_for_command() from sp_head.cc .
This function was also missing a check for SQLCOM_FLUSH which has a
problem combined with prelocking. This changeset fixes both of these
deficiencies as well as the erroneous check in
sp_head::is_not_allowed_in_function() which was a copy&paste error.
2006-08-25 15:51:29 +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
sergefp@mysql.com
46480b22d2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bug16255-merge
2006-08-25 14:44:28 +04:00
jonas@perch.ndb.mysql.com
e4c3a58134
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-25 11:59:28 +02:00
igor@rurik.mysql.com
218a96d2c6
Fixed bug #21390 : wrong estimate of rows after elimination of
...
const tables. This resulted in choosing extremely inefficient
execution plans in same cases when distribution of data in
joined were skewed (see the customer test case for the bug).
2006-08-25 02:17:41 -07: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
jonas@perch.ndb.mysql.com
c6e8be9808
ndb - bug#21806
...
disable ndb_autodiscover3 (cluster restart (--initial))
2006-08-25 08:57:38 +02:00
cmiller@zippy.cornsilk.net
b9aaf4b24d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
2006-08-24 16:47:59 -04:00
tnurnberg@salvation.intern.azundris.com
a417492688
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 21:12:17 +02:00
iggy@rolltop.ignatz42.dyndns.org
a21ec5dbd4
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
2006-08-24 15:03:33 -04:00
jonas@perch.ndb.mysql.com
a7513025c4
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b
ndb -
...
disable ndb_binlog_discover as it's broken
remove debug printout
2006-08-24 20:31:12 +02:00
andrey@example.com
85e6c3bfc1
Fix for bug#21416 SP: Recursion level higher than zero needed for non-recursive call
...
The following procedure was not possible if max_sp_recursion_depth is 0
create procedure show_proc() show create procedure show_proc;
Actually there is no recursive call but the limit is checked.
Solved by temporarily increasing the thread's limit just before the fetch from cache
and decreasing after that.
2006-08-24 19:36:26 +02:00
tnurnberg@salvation.intern.azundris.com
030cbd2f73
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 19:11:51 +02:00
sergefp@mysql.com
84e9cb794f
BUG#16255: Merge to 5.0
2006-08-24 20:56:28 +04:00
sergefp@mysql.com
848548e16f
BUG#16255: Post-review fixes: adjust the testcase.
2006-08-24 19:16:27 +04:00
iggy@rolltop.ignatz42.dyndns.org
8bc745456f
Bug #11972 : client uses wrong character set after reconnect.
...
The mysql client uses the default character set on reconnect. The default character set is now controled by the client charset command while the client is running. The charset command now also issues a SET NAMES command to the server to make sure that the client's charset settings are in sync with the server's.
2006-08-24 11:15:08 -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
msvensson@neptunus.(none)
bc22aa60e6
Merge neptunus.(none):/home/msvensson/mysql/my51-m-bug20841
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-08-24 15:07:57 +02:00
anozdrin/alik@alik.
df28e14b3a
Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
...
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.
The fix is to check length of user/host name in parser and if string is too
long, throw an error.
2006-08-24 16:29:24 +04:00
msvensson@neptunus.(none)
81a0090333
Bug#20841 mysqldump fails to store right info with --compatible=mysql40 option
...
- Add "not in version before" commensta around new syntax "WITH PARSER" and "TABLESPACE xxx STORAGE DISK"
2006-08-24 14:27:57 +02:00
petr/cps@owlet.local
257ce16d58
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
2006-08-24 16:18:58 +04:00
petr/cps@mysql.com/owlet.local
e36be72adb
after merge fix
2006-08-24 16:17:42 +04:00
kroki/tomash@moonlight.intranet
b6bee0a394
BUG#21166: Prepared statement causes signal 11 on second execution
...
Changes in an item tree done by optimizer weren't properly
registered and went unnoticed, which resulted in preliminary freeing
of used memory.
2006-08-24 15:49:12 +04: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
24f567fa40
Merge siva.hindu.god:/usr/home/tim/m/bk/beef-51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-08-23 18:33:02 -06:00
tsmith/tim@siva.hindu.god
80e565dfe1
Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 18:31:15 -06:00
tsmith/tim@siva.hindu.god
a3cb3d2c41
Merge siva.hindu.god:/usr/home/tim/m/bk/beef-50
...
into siva.hindu.god:/usr/home/tim/m/bk/beef-51
2006-08-23 18:27:34 -06:00
tsmith/tim@siva.hindu.god
df6b8516c4
Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
...
into siva.hindu.god:/usr/home/tim/m/bk/beef-50
2006-08-23 18:24:59 -06: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
evgen@sunlight.local
1e9b5cead2
view.result, view.test:
...
Corrected test case for the bug#21261
sql_parse.cc:
Corrected fix for bug#21261
2006-08-24 03:05:13 +04: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@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
tsmith/tim@siva.hindu.god
bf8fc6e82a
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-08-23 13:43:28 -06:00
tsmith/tim@siva.hindu.god
ecc1e1fe7d
Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-08-23 13:28:01 -06:00
anozdrin/alik@alik.
9af756efd3
Fix for BUG#16899: Possible buffer overflow in handling of DEFINER-clause
...
User name (host name) has limit on length. The server code relies on these
limits when storing the names. The problem was that sometimes these limits
were not checked properly, so that could lead to buffer overflow.
The fix is to check length of user/host name in parser and if string is too
long, throw an error.
2006-08-23 21:31:00 +04:00
ahristov@bk-internal.mysql.com
71bb7e590d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-wl3337
2006-08-23 17:50:56 +02:00
cmiller@maint1.mysql.com
5572348ba5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
2006-08-23 17:37:18 +02:00
cmiller@maint1.mysql.com
7f0dcf45ab
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
2006-08-23 17:34:34 +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
70f76e457f
Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456
...
into lamia.home:/home/timka/mysql/src/5.0-bug-21456
2006-08-23 18:22:53 +03:00
andrey@example.com
f41f9bf0d9
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into example.com:/work/mysql-5.1-runtime
2006-08-23 15:51:37 +02:00