iggy@rolltop.ignatz42.dyndns.org
50222ce9ff
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-04 15:30:55 -05:00
iggy@rolltop.ignatz42.dyndns.org
011b090c62
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836
2006-12-04 12:51:26 -05:00
iggy@rolltop.ignatz42.dyndns.org
b70d2b9341
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-12-04 12:38:41 -05:00
iggy@rolltop.ignatz42.dyndns.org
76d43f1fdd
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my50-bug17951
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug17951/my51-bug17951
2006-12-04 12:30:58 -05: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
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
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
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
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
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
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
iggy@rolltop.ignatz42.dyndns.org
b457572385
Bug#17951: myisampack --force --silent : abnormal end in Windows XP
...
-myisampack wrote to a block on the heap that it did not allocate.
2006-11-30 21:04:02 -05:00
iggy@rolltop.ignatz42.dyndns.org
3add79dd11
Bug#20836 Selecting into variables results in wrong results being returned
...
- Post-merge cleanup.
- Disabled this bug's test for 5.x until 16861 is resolved.
2006-11-30 13:09:48 -05: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
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
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
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)
e753d615c5
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-30 11:38:24 +01:00
msvensson@neptunus.(none)
19def6ebe7
Include *.MY* files from std_data in dist
2006-11-30 11:33:26 +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
msvensson@neptunus.(none)
b9d696099a
check_db_name know takes LEX_STRING*
2006-11-30 09:13:09 +01: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
msvensson@neptunus.(none)
741eb0179a
Update result to 5.1 version format
2006-11-29 23:48:39 +01:00
msvensson@neptunus.(none)
298edec4c1
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-11-29 23:09:57 +01:00
msvensson@neptunus.(none)
d3090cc3fe
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
a50f80636c
Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731
...
into neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
2006-11-29 23:05:33 +01:00
msvensson@neptunus.(none)
68724b3a8d
Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1
...
- chmod the saved files from 4.1 to make sure they are writable
2006-11-29 23:03:45 +01:00
msvensson@neptunus.(none)
db863d826c
Add command "chmod" to mysqltest
2006-11-29 23:02:06 +01:00
msvensson@shellback.(none)
7146466eef
Merge 192.168.0.10:mysql/work/my51-work
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 22:52:32 +01:00
msvensson@neptunus.(none)
eea2bd8421
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-29 22:51:25 +01:00
msvensson@neptunus.(none)
21d6f823af
Merge neptunus.(none):/home/msvensson/mysql/work/my50-work
...
into neptunus.(none):/home/msvensson/mysql/work/my51-work
2006-11-29 22:50:54 +01:00
msvensson@neptunus.(none)
b23cb23349
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
9799bbd76f
Merge neptunus.(none):/home/msvensson/mysql/work/my41-work
...
into neptunus.(none):/home/msvensson/mysql/work/my50-work
2006-11-29 22:49:31 +01:00
msvensson@neptunus.(none)
5f4acf145b
After 5.1.6 just turn on logging, it will be sent to tables by default
2006-11-29 22:49:02 +01:00
msvensson@neptunus.(none)
7aec43481d
Change mode of the checked in 4.1 version files so they are writable
2006-11-29 21:38:38 +01:00
msvensson@shellback.(none)
f7bbcb71cc
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 21:31:05 +01:00
msvensson@shellback.(none)
521464755c
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
2006-11-29 19:32:36 +01:00
cmiller@zippy.cornsilk.net
42291995c3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-29 12:50:07 -05:00
cmiller@zippy.cornsilk.net
d577e3d4a8
Fix merges.
2006-11-29 12:49:21 -05:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756
Many files:
...
Changed paths to ndb include directory to include "storage"
Makefile.am:
Adjusted path to yaSSL libtool libraries
ssl.m4:
Use libtool way of specifying yaSSL libraries
2006-11-29 18:36:51 +01:00
msvensson@shellback.(none)
e9d526f50a
Merge fixes for new test cases
2006-11-29 18:35:33 +01:00
iggy@rolltop.ignatz42.dyndns.org
98c6f8bf49
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836
2006-11-29 12:15:15 -05:00