malff@lambda.hsd1.co.comcast.net.
2d6fbbda59
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-10-18 16:57:51 -06:00
tsmith@ramayana.hindu.god
9727b6dcac
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-17 11:23:04 -06:00
tsmith@ramayana.hindu.god
3d203e55e6
Fix syntax error build problem on Windows (variable was defined
...
in middle of block)
2007-10-17 11:22:41 -06: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
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
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
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
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
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
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
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
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
ramil/ram@ramil.myoffice.izhnet.ru
d2251a8fe3
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b30885/b30885.5.0
2007-10-15 09:57:11 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
b3d7188639
Merge mysql.com:/home/ram/work/b31154/b31154.5.0
...
into mysql.com:/home/ram/work/b31154/b31154.5.1
2007-10-15 09:44:22 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d8d0f7f226
Merge mysql.com:/home/ram/work/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b30885/b30885.5.1
2007-10-15 09:43:31 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
981ebebf4e
Merge mysql.com:/home/ram/work/b30885/b30885.5.0
...
into mysql.com:/home/ram/work/b30885/b30885.5.1
2007-10-15 09:41:30 +05:00
mtaylor@solace.(none)
c51df4a534
Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
...
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-10-12 13:31:32 -07:00
mtaylor@solace.(none)
4d44d8b316
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
2007-10-12 13:19:08 -07:00
mtaylor@solace.(none)
427908c490
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-10-12 13:18:48 -07:00
mtaylor@solace.(none)
f6ba3443e8
Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion.
2007-10-12 13:07:39 -07:00
tnurnberg@sin.intern.azundris.com
76d685c435
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
2007-10-12 16:32:33 +02:00
tnurnberg@sin.intern.azundris.com
c02687815a
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into sin.intern.azundris.com:/home/tnurnberg/30951/50-30951
2007-10-12 16:26:07 +02:00
davi@moksha.com.br
0dce64d635
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-12 11:03:10 -03:00
davi@moksha.com.br
abdd328374
Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0
...
into moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime
2007-10-12 10:56:59 -03:00
davi@moksha.com.br
0eea821636
Merge moksha.com.br:/Users/davi/mysql/bugs/post-rename-5.0
...
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
2007-10-12 10:56:50 -03:00
davi@moksha.com.br
b92f3309f1
Bug#31409 RENAME TABLE causes server crash or deadlock when used with HANDLER statements
...
If mysql_lock_tables fails because the lock was aborted, we need to
reset thd->some_tables_delete, otherwise we might loop indefinitely
because handler's tables are not closed in a standard way, meaning
that close_thread_tables() (which resets some_tables_deleted) is not
used.
This patch fixes sporadical failures of handler_myisam/innodb tests
which were introduced by previous fix for this bug.
2007-10-12 10:55:46 -03:00
kaa@polly.(none)
d58ef22d9a
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-12 15:15:33 +04:00
kaa@polly.(none)
acae688f46
Merge polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254
...
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
2007-10-12 15:10:33 +04:00
kaa@polly.(none)
48ada204d1
Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254
...
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
2007-10-12 15:02:39 +04:00
kaa@polly.(none)
0288f24d21
Merge polly.(none):/home/kaa/src/maint/bug31254/my50-bug31254
...
into polly.(none):/home/kaa/src/maint/bug31254/my51-bug31254
2007-10-12 14:52:02 +04:00