gkodinov@dl145s.mysql.com
d253588c69
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
2006-12-04 18:05:42 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/mysql-5.0-maint
2006-12-04 14:43:34 +01:00
Kristofer.Pettersson@naruto.
be5da5a152
Merge naruto.:C:/cpp/bug17733/my51-bug17733
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-12-04 14:34:56 +01:00
gkodinov/kgeorge@macbook.gmz
2a9edce6f6
type_varchar.result:
...
fixed a valgrind problem
2006-12-04 14:29:51 +02:00
malff/marcsql@weblab.(none)
6e3f6b049b
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-maint-24736
2006-12-02 11:54:18 -07:00
andrey@example.com
32dedbe62d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24395-v2/my51
2006-12-02 15:18:51 +01:00
malff/marcsql@weblab.(none)
88ba7676c1
Bug#24736: UDF functions parsed as Stored Functions
...
Before this fix, a call to a User Defined Function (UDF) could,
under some circumstances, be interpreted as a call to a Stored function
instead. This occurred if a native function was invoked in the parameters
for the UDF, as in "select my_udf(abs(x))".
The root cause of this defect is the introduction, by the fix for Bug 21809,
of st_select_lex::udf_list, and it's usage in the parser in sql_yacc.yy
in the rule function_call_generic (in 5.1).
While the fix itself for Bug 21809 is correct in 5.0, the code change
merged into the 5.1 release created the issue, because the calls in 5.1 to :
- lex->current_select->udf_list.push_front(udf)
- lex->current_select->udf_list.pop()
are not balanced in case of native functions, causing the udf_list,
which is really a stack, to be out of sync with the internal stack
maintained by the bison parser.
Instead of moving the call to udf_list.pop(), which would have fixed the
symptom, this patch goes further and removes the need for udf_list.
This is motivated by two reasons:
a) Maintaining a stack in the MySQL code in sync with the stack maintained
internally in sql_yacc.cc (not .yy) is extremely dependent of the
implementation of yacc/bison, and extremely difficult to maintain.
It's also totally dependent of the structure of the grammar, and has a risk
to break with regression defects each time the grammar itself is changed.
b) The previous code did report construct like "foo(expr AS name)" as
syntax errors (ER_PARSER_ERROR), which is incorrect, and misleading.
The syntax is perfectly valid, as this expression is valid when "foo" is
a UDF. Whether this syntax is legal or not depends of the semantic of "foo".
With this change:
a) There is only one stack (in bison), and no List<udf_func> to maintain.
b) "foo(expr AS name)", when used incorrectly, is reported as semantic error:
- ER_WRONG_PARAMETERS_TO_NATIVE_FCT (for native functions)
- ER_WRONG_PARAMETERS_TO_STORED_FCT (for stored functions)
This is achieved by the changes implemented in item_create.cc
2006-12-01 19:16:03 -07:00
andrey@example.com
b5e44560f6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug24395-v2/my50
2006-12-02 00:30:10 +01:00
andrey@example.com
b275089b66
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into example.com:/work/bug24395-v2/my41
2006-12-01 23:11:44 +01:00
mskold/marty@linux.site
6f0e7a2631
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
thek@kpdesk.mysql.com
f74e1d2696
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
2006-12-01 18:08:47 +01:00
thek@kpdesk.mysql.com
94b48caf2e
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
2006-12-01 18:00:45 +01:00
thek@kpdesk.mysql.com
620a989133
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
...
- Merged; updated test case.
2006-12-01 17:36:51 +01:00
thek@kpdesk.mysql.com
46de7157bd
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043
...
into kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
2006-12-01 17:23:12 +01:00
mskold/marty@linux.site
9e56779f97
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-01 16:44:50 +01:00
andrey@example.com
8fcf14210d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug24395-v2/my51
2006-12-01 16:27:48 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
df@kahlann.erinye.com
da7820c37d
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2006-12-01 13:02:54 +01:00
thek@kpdesk.mysql.com
b201d4ef93
Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
...
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
2006-12-01 12:50:57 +01:00
andrey@example.com
afb930947d
Merge example.com:/work/bug24395-v2/my50
...
into example.com:/work/bug24395-v2/my51
2006-12-01 11:37:33 +01:00
Kristofer.Pettersson@naruto.
70c450a18a
Merge naruto.:C:/cpp/bug17733/my50-bug17733
...
into naruto.:C:/cpp/bug17733/my51-bug17733
2006-12-01 11:17:34 +01:00
df@kahlann.erinye.com
6dc7e55e9c
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-12-01 10:39:48 +01:00
Kristofer.Pettersson@naruto.
6c8d7ea894
Bug#17733 Flushing logs causes daily server crash
...
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
2006-12-01 09:49:19 +01:00
monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
andrey@example.com
dec1ebf6e3
Merge example.com:/work/bug24395-v2/my41
...
into example.com:/work/bug24395-v2/my50
fix for bug#24395 merged into 5.0
2006-11-30 18:36:15 +01:00
gkodinov@dl145s.mysql.com
af74fd07b4
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 17:59:14 +01:00
gkodinov/kgeorge@macbook.gmz
8b8e820224
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
2006-11-30 18:49:50 +02:00
gkodinov/kgeorge@macbook.gmz
36e7fbc033
func_group.test, func_group.result, func_gconcat.result, func_gconcat.test:
...
merge fix : removed undeterministic warnings
2006-11-30 18:47:59 +02:00
mskold/marty@mysql.com/linux.site
e576bf7fa3
bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result
2006-11-30 16:19:55 +01:00
mskold/marty@mysql.com/linux.site
a172df24a9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
638c294b7f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-11-30 15:57:43 +01:00
mskold/marty@linux.site
d7e375680a
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0
#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows
2006-11-30 15:02:33 +01:00
mskold/marty@linux.site
6db1610c21
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 14:45:54 +01:00
msvensson@neptunus.(none)
dc88e57744
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-30 13:04:24 +01:00
gkodinov@dl145s.mysql.com
7c94b8012c
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 12:29:11 +01:00
gkodinov@dl145s.mysql.com
498791908a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-11-30 12:27:04 +01:00
gkodinov@dl145s.mysql.com
03431eb78a
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-30 12:22:32 +01:00
msvensson@neptunus.(none)
e36384fdce
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-30 12:14:28 +01:00
msvensson@neptunus.(none)
fb2ffbf203
Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-30 11:58:23 +01:00
gkodinov/kgeorge@macbook.gmz
7464a20bc8
func_gconcat.result, func_gconcat.test:
...
disabled warnings because their order is undeterministic
2006-11-30 12:58:05 +02:00
msvensson@neptunus.(none)
af5882a175
Merge neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-30 11:40:13 +01:00
msvensson@neptunus.(none)
1daff38fd8
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-30 11:31:51 +01:00
msvensson@neptunus.(none)
f883d68ad6
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c
Add "chmod" command to mysqltest
2006-11-30 10:54:50 +01:00
baker@bk-internal.mysql.com
082de8dfce
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-11-30 01:45:16 +01:00
kostja@bodhi.local
bdf6d15f4b
A post-merge fix.
2006-11-30 02:51:41 +03:00
kostja@bodhi.local
9fa2b75804
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-30 02:36:18 +03:00
msvensson@neptunus.(none)
b5603af7d5
Merge 192.168.0.5:mysql/mysql-5.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 23:53:07 +01:00