mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41211 commits 2774 branches 343 tags 1.6 GiB
Commit graph

41211 commits

This branch
This branch
All branches
Author SHA1 Message Date
kent@mysql.com/kent-amd64.(none)
4dc1132159 Makefile.am: 
Disabled abi_check, as it was before merge
 2006-12-03 00:25:52 +01:00
kent@kent-amd64.(none)
2b5e2230bb Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 23:22:53 +01:00
kent@mysql.com/kent-amd64.(none)
d72b71ef9f mysql_install_db.sh: 
If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
 2006-12-02 23:16:47 +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
kent@kent-amd64.(none)
b011500fe9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 06:10:46 +01:00
kent@kent-amd64.(none)
bc1e7c916e Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 06:09:34 +01:00
kent@mysql.com/kent-amd64.(none)
cbf529790a Makefile.am: 
Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
 2006-12-02 06:06:31 +01:00
kent/mysqldev@suse9-x86.mysql.com
81f97ed648 myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: 
Adjusted for storage path
nwbootstrap:
  Corrected bad merge
 2006-12-02 04:25:41 +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
kent@kent-amd64.(none)
cee9ec90eb Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-02 00:29:56 +01:00
kent@mysql.com/kent-amd64.(none)
ee8cdf9ded Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-12-02 00:27:34 +01:00
kent@kent-amd64.(none)
289e7eac12 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-12-01 23:28:59 +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
kent@mysql.com/kent-amd64.(none)
fb5abf8f4f mysql_upgrade.def Makefile.am: 
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)
 2006-12-01 23:09:14 +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
mskold/marty@linux.site
93b7491421 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-01 16:37:13 +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
887717c454 fix build failure introduced by 5.1-marvel merge 2006-12-01 14:25:32 +01:00
jonas@perch.ndb.mysql.com
7a0179e178 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 14:06:15 +01:00
jonas@perch.ndb.mysql.com
d19c93e900 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-12-01 14:05:41 +01:00
jonas@perch.ndb.mysql.com
764304031d ndb - bug#24655 
Handle events "differently" so that dict doesnt get lock too often
 2006-12-01 14:04:06 +01:00
jonas@perch.ndb.mysql.com
fc09c8a62d Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 13:58:24 +01:00
jonas@perch.ndb.mysql.com
76bdda5523 ndb - bug#24752 
This prevent any subsequent node restarts, but it's better than crashing an alive node
 2006-12-01 13:57:29 +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
jonas@perch.ndb.mysql.com
115643aab5 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-12-01 11:35:12 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
37f97b29c0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 11:25:08 +01:00
jonas@perch.ndb.mysql.com
7232d0f24a ndb - bug#24748 
Skip rollback if only committedRead in transaction
 2006-12-01 11:24:37 +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
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717 
fixes to testprogram to test new impl. in 5.1
 2006-12-01 11:08:53 +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
df@kahlann.erinye.com
e6a2d18421 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-01 10:36:42 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-01 10:33:28 +01:00
gkodinov@dl145s.mysql.com
68b63d176e Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-12-01 10:31:07 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb - 
fix merge error
 2006-12-01 10:29:45 +01:00
df@kahlann.erinye.com
feb70084d3 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 10:27:19 +01:00
jonas@perch.ndb.mysql.com
61c6f532d2 ndb - 
add testcase for bug#24717
 + fix typo
 2006-12-01 10:25:11 +01:00
df@kahlann.erinye.com
4e76f699b2 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-01 10:20:23 +01:00
df@kahlann.erinye.com
b70cdee8ab 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:17:27 +01:00
pekka@orca.ndb.mysql.com
b304b3f8e1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-12-01 10:10:22 +01:00