anozdrin/alik@station.
f0d70d1184
Fix result files (BUG#24923).
2007-10-17 15:44:22 +04:00
gkodinov/kgeorge@magare.gmz
5f5b7cc311
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27099-5.1-opt
2007-10-17 13:39:41 +03:00
gluh@mysql.com/eagle.(none)
9992761343
Bug#31381 Error in retrieving Data from INFORMATION_SCHEMA
...
move 'table_collation' field filling outside of if(file) condition
because this field has 'OPEN_FRM_ONLY' attribute
2007-10-17 14:08:03 +05:00
gluh@eagle.(none)
9659588287
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-17 13:26:20 +05:00
gluh@mysql.com/eagle.(none)
7f67efccef
Bug#31568 Some "information_schema" entries suddenly report a NULL default
...
updated result files
2007-10-17 13:22:34 +05:00
anozdrin/alik@station.
49a0f09bbf
Fix for BUG#24923: Functions with ENUM issues.
...
The problem was that the RETURNS column in the mysql.proc was of
CHAR(64). That was not enough for storing long-named datatypes.
The fix is to change CHAR(64) to LONGBLOB, and to throw warnings
at the time a stored routine is created if some data is truncated
during writing into mysql.proc.
2007-10-17 12:13:56 +04:00
mats@kindahl-laptop.dnsalias.net
7ef34c3a70
Removing debug variables from non-debug builds.
2007-10-17 09:29:11 +02:00
kaa@polly.(none)
3a2e673c9f
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-17 10:38:26 +04:00
kaa@polly.(none)
63ae0223b1
Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-17 10:32:05 +04:00
kaa@polly.(none)
fa21920020
Fixed the test case for bug #31174 to not fail on 64-bit platforms.
2007-10-17 10:29:51 +04:00
mats@kindahl-laptop.dnsalias.net
128f1540d6
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b29549-mysql-5.1-target-5.1.22
2007-10-17 06:53:19 +02:00
mats@kindahl-laptop.dnsalias.net
56ae0be77d
Eliminating some valgrind warnings resulting from that some
...
storage engines do not set the unused null bits (i.e., the
filler bits and the X bit) correctly. Also adding some casts
to debug printouts to eliminate compiler warnings.
2007-10-17 06:50:03 +02:00
malff@lambda.hsd1.co.comcast.net.
ee3e6d8171
Manual merge of 5.0-runtime to 5.1-runtime
2007-10-16 20:47:08 -06:00
malff@lambda.hsd1.co.comcast.net.
a4c66084a8
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-16 15:43:16 -06:00
malff@lambda.hsd1.co.comcast.net.
f3a6483945
Fixed broken call to my_error
2007-10-16 14:27:20 -06:00
skozlov/ksm@mysql.com/virtop.localdomain
253bb96e79
Fix for non-deterministic behavior of SELECTs and VIEWs
2007-10-16 23:19:39 +04:00
thek@adventure.(none)
a1978fefee
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-10-16 19:33:28 +02:00
thek@adventure.(none)
9388592a21
Fixed query_cache_notembedded test program failure because of dependencies between
...
test programs.
2007-10-16 19:32:38 +02:00
malff@lambda.hsd1.co.comcast.net.
f8d262216c
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-28318-rework
2007-10-16 11:17:27 -06:00
malff@lambda.hsd1.co.comcast.net.
a9c6ed46e2
Implementing code review comments
2007-10-16 11:16:31 -06:00
kostja@bodhi.(none)
4b5914caf5
Update the client ABI to reflect member rename
...
(this is a backward-compatible change).
2007-10-16 20:21:40 +04:00
davi@moksha.com.br
c3447cef35
Bug#31608 missing mysqltest change_user command
...
The problem is that currently there is no way to test the behavior
of the mysql_change_user() function using the mysqltest suite because
there is no internal command for it.
The solution is to introduce a change_user command that can be used
to test aspects of the MySQL client function mysql_change_user().
2007-10-16 12:29:22 -03:00
kaa@polly.(none)
a9184873cf
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-16 19:25:04 +04:00
kaa@polly.(none)
5cb0d70646
Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-16 19:20:00 +04:00
kaa@polly.(none)
18250925bc
Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174
...
into polly.(none):/home/kaa/src/maint/mysql-4.1-maint
2007-10-16 19:17:00 +04:00
thek@adventure.(none)
b6c7a4b6b2
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-10-16 14:45:52 +02:00
thek@adventure.(none)
8c86e79aa3
Bug#30710 query_cache.test fails on embedded - per-column privs test
...
The embedded version of the server doesn't use column level grants, and
the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
the redundant HAVE_QUERY_CACHE (which is always the case) to determine if
column level grants should be compiled or not.
2007-10-16 14:42:42 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
73834a4a86
After merge fix:
...
Adjusting SHOW CREATE TABLE output from 5.0 to 5.1 format
2007-10-16 15:22:44 +05:00
bar@bar.myoffice.izhnet.ru
37ee3f8990
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b31081
2007-10-16 15:04:04 +05:00
bar@bar.myoffice.izhnet.ru
35b20797d9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
2007-10-16 14:58:59 +05:00
gluh@eagle.(none)
97ce1f8cf1
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-16 14:10:07 +05:00
gluh@eagle.(none)
20baa313b5
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-16 13:19:01 +05:00
malff@lambda.hsd1.co.comcast.net.
99a270ba0f
Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II
...
The root cause of the issue was that the CREATE FUNCTION grammar,
for User Defined Functions, was using the sp_name rule.
The sp_name rule is intended for fully qualified stored procedure names,
like either ident.ident, or just ident but with a default database
implicitly selected.
A UDF does not have a fully qualified name, only a name (ident), and should
not use the sp_name grammar fragment during parsing.
The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
- creating UDF (no definer, can have AGGREGATE, simple ident)
- creating Stored Functions (definer, no AGGREGATE, fully qualified name)
With the test case provided, another issue was exposed which is also fixed:
the DROP FUNCTION statement was using sp_name and also failing when no database
is implicitly selected, when droping UDF functions.
The fix is also to change the grammar so that DROP FUNCTION works with
both the ident.ident syntax (to drop a stored function), or just the ident
syntax (to drop either a UDF or a Stored Function, in the current database)
2007-10-15 19:15:38 -06:00
dkatz@damien-katzs-computer.local
223536e526
fix problem caused by previous submission for bugs BUG#29589 BUG#29772
2007-10-15 15:53:39 -04:00
dkatz@damien-katzs-computer.local
53aeee3a0d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
2007-10-15 13:25:12 -04:00
dkatz@damien-katzs-computer.local
f721a6f610
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
2007-10-15 13:23:16 -04:00
gkodinov/kgeorge@magare.gmz
ba03c12b24
Bug #27099 : system_mysql fail in pushbuild windows
...
On Windows the debug log was doing freopen () instead of
fflush() and that was slowing the logging down that much
that some tests timed out.
Fixed by replacing the freopen() with an syncing-to-disk
flag to fopen() and fflush().
Also increased the timeout of the tests running with --debug
on windows : seems to slow down as much as valgrind on linux.
2007-10-15 19:56:24 +03:00
gluh@mysql.com/eagle.(none)
55a7338f39
Bug#30986 Character set introducer followed by a HEX string can return bad result(addon)
...
issue an error if string has illegal characters
2007-10-15 18:40:58 +05:00
kostja@bodhi.(none)
1c9e362f75
Add comments, tidy up sql_delete.cc to refer to thd->row_count_func
...
explicitly.
2007-10-15 16:42:41 +04:00
kostja@bodhi.(none)
5cda50307f
Fix broken compilation.
2007-10-15 15:49:16 +04:00
kostja@bodhi.(none)
227e13c4ca
Remove an unused variable that was there since the first implementation
...
of the stored procedure cursors (materialized on disk).
2007-10-15 15:45:20 +04:00
gshchepa/uchum@gleb.loc
88aa7b0a6e
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-10-15 14:18:26 +05:00
msvensson@pilot.mysql.com
a152ff1672
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
2007-10-15 10:59:01 +02:00
gshchepa/uchum@gleb.loc
18ecc5bb5a
Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31019
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-10-15 13:34:58 +05:00
msvensson@pilot.mysql.com
cecc37d8b4
Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
2007-10-15 09:22:11 +02:00
bar@bar.myoffice.izhnet.ru
b75eb1ee3e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b27287
2007-10-15 11:16:53 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
3286de1d91
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 10:41:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
583f5080c4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b31154/b31154.5.0
2007-10-15 10:40:28 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
71775c2432
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b31154/b31154.5.0
2007-10-15 10:28:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4c94aaa3b4
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 10:21:22 +05:00