Commit graph

123 commits

Author SHA1 Message Date
unknown
919b5ba6b5 Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
and BUG#1966: "select 1 into a" on top-level hangs client


include/mysql_com.h:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
mysql-test/r/sp-error.result:
  Added tests for BUG#1965 and BUG#1966.
mysql-test/t/sp-error.test:
  Added tests for BUG#1965 and BUG#1966.
sql/net_serv.cc:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
sql/protocol.cc:
  Added no_send_eof flag to NET for SP cursors (the simple read-only version).
sql/sp_rcontext.cc:
  Use net->no_send_eof flag to prevent eofs during cursor open (instead of
  the dirty vio=0 which didn't work).
sql/sp_rcontext.h:
  Use net->no_send_eof flag to prevent eofs during cursor open (instead of
  the dirty vio=0 which didn't work).
sql/sql_yacc.yy:
  Give error message if doing SELECT ... INTO localvar even if it's outside an SP.
2003-11-27 16:48:21 +01:00
unknown
1e0907c1c9 Translated 5.0 error codes into sql states.
include/mysqld_error.h:
  Marked where 5.0 error codes begin.
sql/sql_yacc.yy:
  Referring to an unitialized variable is a warning, not an error.
2003-11-21 18:23:05 +01:00
unknown
700ae43d71 Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
- dropped routines should not show up in status
- error handling for non-existing routines

+ some cleanup.


mysql-test/r/sp-error.result:
  Test SHOW CREATE PROCEDURE for non-existing procedure.
mysql-test/r/sp.result:
  Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
  after being dropped).
mysql-test/t/sp-error.test:
  Test SHOW CREATE PROCEDURE for non-existing procedure.
mysql-test/t/sp.test:
  Additional SHOW FUNCTION/PROCEDURE STATUS calls (make sure they don't show
  after being dropped).
sql/sp.cc:
  Fixed bug in SHOW ... STATUS after a routine has been dropped,
  and fixed the error return codes (for correct error handling).
  Also some general cleanup.
sql/sp.h:
  Fixed prefix for external functions (should be sp_, not db_).
sql/sql_parse.cc:
  Fixed error handling in SHOW CREATE PROCEDURE/FUNCTION.
2003-11-20 15:07:22 +01:00
unknown
afe2186e3b Post-merge fixes. 2003-11-19 16:59:35 +01:00
unknown
bd2263503d Fixed BUG#1862 (flush table in SPs didn't work).
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.


mysql-test/r/sp-error.result:
  Corrected security syntax for alter/create procedure.
mysql-test/r/sp.result:
  Corrected security syntax for alter/create procedure.
  New tests for setting local variables to null,
  bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
  and corrected "no data" warning for SELECT INTO with no rows.
mysql-test/t/sp-error.test:
  Corrected security syntax for alter/create procedure.
mysql-test/t/sp.test:
  Corrected security syntax for alter/create procedure.
  New tests for setting local variables to null,
  bug fixes for SELECT INTO var, FLUSH TABLES calls (BUG#1862),
  and corrected "no data" warning for SELECT INTO with no rows.
sql/lex.h:
  Added SQL_SYM (and added a few _SYM suffixes for new symbols).
sql/sp_head.cc:
  Fixed bug in the item_list copying for "with_wild" cases (list nodes ended
  up in the wrong memroot).
  Catch errors and warnings even if return values is 0 from sub-statements.
  Restore table_list which is zapped by SQLCOM_CREATE_TABLE and INSERT_SELECT.
  Set old table pointers to NULL after sub-statement call (since all tables are
  closed).
sql/sql_class.cc:
  Corrected error message when no rows return by a SELECT INTO var; should
  be a "no data" warning.
sql/sql_lex.h:
  Have to store the original table_list first pointer for some
  sub-statements in SPs.
sql/sql_yacc.yy:
  Corrected SECURITY INVOKER/DEFINER syntax ("SQL" missing), added some _SYM
  suffixes, and fixed valgrind complaints for SP COMMENTs.
  (Also removed some now irrelevant comments.)
2003-11-19 11:26:18 +01:00
unknown
6c1a2b7fd2 WL#1241: SHOW PROCEDURE/FUNCTION
WL#1263: Support for the attributes COMMENT and SUID
         in CREATE/ALTER PROCEDURE/FUNCTION


include/mysqld_error.h:
  Error code for 'alter procedure'
mysql-test/r/sp-error.result:
  Test for WL#1241&WL#1263
mysql-test/r/sp.result:
  Test for WL#1241&WL#1263
mysql-test/t/sp-error.test:
  Test for WL#1241&WL#1263
mysql-test/t/sp.test:
  Test for WL#1241&WL#1263
sql/share/czech/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/danish/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/dutch/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/english/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/estonian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/french/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/german/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/greek/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/hungarian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/italian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/japanese/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/korean/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/norwegian-ny/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/norwegian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/polish/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/portuguese/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/romanian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/russian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/serbian/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/slovak/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/spanish/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/swedish/errmsg.txt:
  Error massage for 'alter procedure'
sql/share/ukrainian/errmsg.txt:
  Error massage for 'alter procedure'
2003-11-17 21:21:36 +04:00
unknown
7b4a85050b Changed single generic error code/message into different ones for duplicate things.
(For multi-lingual support.)
Also fixed memory leak when aborting parsing for a duplicate cursor.


include/mysqld_error.h:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
mysql-test/r/sp-error.result:
  Fixed error message for duplicate variable.
mysql-test/t/sp-error.test:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/czech/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/danish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/dutch/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/english/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/estonian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/french/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/german/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/greek/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/hungarian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/italian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/japanese/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/korean/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/norwegian-ny/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/norwegian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/polish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/portuguese/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/romanian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/russian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/serbian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/slovak/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/spanish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/swedish/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
sql/share/ukrainian/errmsg.txt:
  Changed single generic error code/message into different ones for duplicate things.
  (For multi-lingual support.)
2003-11-14 13:46:50 +01:00
unknown
c9232c60e2 Various bug fixes:
- Duplicate parameters/variables, conditions and cursors (not allowed).
  - ITERATE in labelled BEGIN-END (not allowed).
  - Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
  - Empty BEGIN-END (now allowed).
  - End label (now optional).


include/mysqld_error.h:
  New error code for duplicate things (vars et al) in SPs.
mysql-test/r/sp-error.result:
  New error tests for ITERATE in begin-end block and duplicate variables,
  conditions and cursors.
mysql-test/r/sp.result:
  New tests for empty begin-end blocks, overriding local variables outside scope
  only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
  declarations.
mysql-test/t/sp-error.test:
  New error tests for ITERATE in begin-end block and duplicate variables,
  conditions and cursors.
mysql-test/t/sp.test:
  New tests for empty begin-end blocks, overriding local variables outside scope
  only, leave a begin-end block, and SQLSTATE [VALUE] words for CONDITION/HANDLER
  declarations.
sql/lex.h:
  New SQLSTATE keyword.
sql/share/czech/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/danish/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/dutch/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/english/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/estonian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/french/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/german/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/greek/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/hungarian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/italian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/japanese/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/korean/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian-ny/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/norwegian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/polish/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/portuguese/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/romanian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/russian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/serbian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/slovak/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/spanish/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/swedish/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/share/ukrainian/errmsg.txt:
  New error message for duplicate things (vars et al) in SPs.
sql/sp_pcontext.cc:
  Keep track on scope limits for error checking of duplicate variables,
  conditions and cursors.
sql/sp_pcontext.h:
  Keep track on scope limits for error checking of duplicate variables,
  conditions and cursors.
  Also need to flag BEGIN labels to check for illegal ITERATEs.
sql/sql_yacc.yy:
  End-labels in SPs loop and begin-end blocks are now optional.
  SQLSTATE [VALUE] added to syntax for sqlstates.
  Check for duplicate variable, condition and cursor declarations, but
  only in the same scope.
  Empty BEGIN-END statements now allowed.
  Check if ITERATE is referring to a BEGIN label.
2003-11-13 19:34:56 +01:00
unknown
ec3a39dc67 Post-merge fixes.
mysql-test/r/sp-error.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/r/sp.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/r/variables.result:
  Post-merge fixes. Error codes renumbered.
mysql-test/t/sp-error.test:
  Post-merge fixes. Error codes renumbered.
mysql-test/t/sp.test:
  Post-merge fixes. Error codes renumbered.
sql/item_subselect.cc:
  Post-merge fixes. thd->lex is a pointer.
sql/slave.cc:
  Post-merge fixes. Undid imported patch that's not 5.0 compatible.
sql/sql_parse.cc:
  Post-merge fixes. Changed access API calls, and fixed merge error.
sql/sql_table.cc:
  Post-merge fixes. No update log in 5.0.
2003-10-23 16:06:51 +02:00
unknown
04c6b9b8d8 WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
(updated) Protocol_cursor class.
Also did some bug fixes.


Docs/sp-imp-spec.txt:
  Added CURSOR docs (and fixed typos)
Docs/sp-implemented.txt:
  Updated for CURSORs
include/mysqld_error.h:
  New error codes/messages for CURSORs
libmysqld/Makefile.am:
  SP cursors now needs this.
mysql-test/r/sp-error.result:
  New tests for cursors.
mysql-test/r/sp.result:
  New tests for cursors.
mysql-test/t/sp-error.test:
  New tests for cursors.
mysql-test/t/sp.test:
  New tests for cursors.
sql/protocol.cc:
  We now always have Protocol_cursor (SPs use it)
sql/protocol.h:
  Fixed bugs in Protocol_cursor (for SPs)
sql/protocol_cursor.cc:
  Fixed bugs in Protocol_cursor (for SPs)
sql/share/czech/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/danish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/dutch/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/english/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/estonian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/french/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/german/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/greek/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/hungarian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/italian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/japanese/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/korean/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/norwegian-ny/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/norwegian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/polish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/portuguese/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/romanian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/russian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/serbian/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/slovak/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/spanish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/swedish/errmsg.txt:
  New error codes/messages for CURSORs
sql/share/ukrainian/errmsg.txt:
  New error codes/messages for CURSORs
sql/sp_head.cc:
  Added cursor support.
  Also fixed problems with item_lists, where pointers and ref_pointer_arrays.
sql/sp_head.h:
  Added cursor support
sql/sp_pcontext.cc:
  Added cursor support
sql/sp_pcontext.h:
  Added cursor support
sql/sp_rcontext.cc:
  Added cursor support, in particular the new sp_cursor class.
sql/sp_rcontext.h:
  Added cursor support, in particular the new sp_cursor class.
sql/sql_lex.h:
  We sometimes need to copy item_lists in LEX when executing substatements in SPs
sql/sql_yacc.yy:
  Added minimal cursor support (not the full syntax yet).
2003-10-10 16:57:21 +02:00
unknown
4379cbcf30 Check that a FUNCTION contains RETURN and that we actually get a return value.
include/mysqld_error.h:
  New error codes/messages for missing RETURNs in FUNCTIONs.
mysql-test/r/sp-error.result:
  New error tests for missing RETURNs in FUNCTIONs.
mysql-test/t/sp-error.test:
  New error tests for missing RETURNs in FUNCTIONs.
sql/share/czech/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/danish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/dutch/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/english/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/estonian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/french/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/german/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/greek/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/hungarian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/italian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/japanese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/korean/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian-ny/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/norwegian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/polish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/portuguese/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/romanian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/russian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/serbian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/slovak/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/spanish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/swedish/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/share/ukrainian/errmsg.txt:
  New error codes/messages for missing RETURNs in FUNCTIONs.
sql/sp_head.h:
  Check that a FUNCTION contains RETURN.
sql/sql_parse.cc:
  Check that a FUNCTION contains RETURN.
sql/sql_yacc.yy:
  Check that a FUNCTION contains RETURN.
2003-10-03 17:38:12 +02:00
unknown
03042c7db4 Post-merge fixes. 2003-09-24 15:26:20 +02:00
unknown
4deedf6263 Implemented SP CONDITIONs and HANDLERs, with the extension of handling
MySQL error codes as well.
(No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
WL#850


Docs/sp-imp-spec.txt:
  Spec of CONDITIONs and HANDLERs (and updated some old stuff too).
Docs/sp-implemented.txt:
  Updated info about caching, CONDITIONs and HANDLERs.
include/mysqld_error.h:
  New error for undeclared CONDITION.
libmysqld/Makefile.am:
  New file: sp_rcontext.cc.
mysql-test/r/sp-error.result:
  New tests for CONDITIONs and HANDLERs.
mysql-test/r/sp.result:
  New tests for CONDITIONs and HANDLERs.
mysql-test/t/sp-error.test:
  New tests for CONDITIONs and HANDLERs.
mysql-test/t/sp.test:
  New tests for CONDITIONs and HANDLERs.
sql/Makefile.am:
  New file: sp_rcontext.cc.
sql/lex.h:
  New symbols for CONDITIONs, HANDLERs and CURSORs.
sql/mysqld.cc:
  Catch error if we have a handler for it.
sql/protocol.cc:
  Catch error if we have a handler for it.
sql/share/czech/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/danish/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/dutch/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/english/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/estonian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/french/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/german/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/greek/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/hungarian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/italian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/japanese/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/korean/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/norwegian-ny/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/norwegian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/polish/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/portuguese/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/romanian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/russian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/serbian/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/slovak/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/spanish/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/swedish/errmsg.txt:
  New error for undeclared CONDITION.
sql/share/ukrainian/errmsg.txt:
  New error for undeclared CONDITION.
sql/sp_head.cc:
  New HANDLER code.
sql/sp_head.h:
  New HANDLER code.
sql/sp_pcontext.cc:
  New CONDITION and HANDLER code.
sql/sp_pcontext.h:
  New CONDITION and HANDLER code.
sql/sp_rcontext.h:
  New CONDITION and HANDLER code.
sql/sql_yacc.yy:
  New CONDITION and HANDLER code.
2003-09-16 14:26:08 +02:00
unknown
55e776d145 Post-merge fixes. 2003-08-26 17:41:40 +02:00
unknown
2b16d5457b Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(


mysql-test/r/sp-error.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
2003-07-09 17:07:12 +02:00
unknown
e42120c664 Fixed bug #643, which caused intermittent crashes in net_printf() with repeated
syntax errors in stored procedures.


mysql-test/r/sp-error.result:
  New test case for bugfix (#643)
mysql-test/t/sp-error.test:
  New test case for bugfix (#643)
sql/sp_head.cc:
  Forgot to copy a slot from the original lex. (bug #643)
2003-06-12 15:31:20 +02:00
unknown
f525047d1e Made multiple queries (SELECT without INTO) work in SPs.
This included bug fixes in the 4.1 protocol (actually send and receive the
server_status flags).


libmysql/libmysql.c:
  Pick up the server_status (with the 4.1 protocol) as well.
mysql-test/r/sp-error.result:
  Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
  momen; this test will have to go away eventually).
mysql-test/t/sp-error.test:
  Test for "bad selects" in non-CLIENT_MULTI_QUERIES clients (as mysqltest for the
  momen; this test will have to go away eventually).
sql/protocol.cc:
  Actually send the server_status flags in send_eof() (4.1 protocol), not just zero.
sql/sp_head.cc:
  Made multiple queries (SELECT without INTO) work in SPs.
sql/sp_head.h:
  Made multiple queries (SELECT without INTO) work in SPs.
sql/sql_parse.cc:
  Made multiple queries (SELECT without INTO) work in SPs.
sql/sql_yacc.yy:
  Made multiple queries (SELECT without INTO) work in SPs.
2003-04-23 09:22:54 +02:00
unknown
4ed94fcd8e Check the number of args to SPs.
Fixes bug #280.


include/mysqld_error.h:
  Check the number of args to SPs.
mysql-test/r/sp-error.result:
  Check the number of args to SPs.
mysql-test/t/sp-error.test:
  Check the number of args to SPs.
sql/share/czech/errmsg.txt:
  Check the number of args to SPs.
sql/share/danish/errmsg.txt:
  Check the number of args to SPs.
sql/share/dutch/errmsg.txt:
  Check the number of args to SPs.
sql/share/english/errmsg.txt:
  Check the number of args to SPs.
sql/share/estonian/errmsg.txt:
  Check the number of args to SPs.
sql/share/french/errmsg.txt:
  Check the number of args to SPs.
sql/share/german/errmsg.txt:
  Check the number of args to SPs.
sql/share/greek/errmsg.txt:
  Check the number of args to SPs.
sql/share/hungarian/errmsg.txt:
  Check the number of args to SPs.
sql/share/italian/errmsg.txt:
  Check the number of args to SPs.
sql/share/japanese/errmsg.txt:
  Check the number of args to SPs.
sql/share/korean/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian-ny/errmsg.txt:
  Check the number of args to SPs.
sql/share/norwegian/errmsg.txt:
  Check the number of args to SPs.
sql/share/polish/errmsg.txt:
  Check the number of args to SPs.
sql/share/portuguese/errmsg.txt:
  Check the number of args to SPs.
sql/share/romanian/errmsg.txt:
  Check the number of args to SPs.
sql/share/russian/errmsg.txt:
  Check the number of args to SPs.
sql/share/serbian/errmsg.txt:
  Check the number of args to SPs.
sql/share/slovak/errmsg.txt:
  Check the number of args to SPs.
sql/share/spanish/errmsg.txt:
  Check the number of args to SPs.
sql/share/swedish/errmsg.txt:
  Check the number of args to SPs.
sql/share/ukrainian/errmsg.txt:
  Check the number of args to SPs.
sql/sp_head.cc:
  Check the number of args to SPs.
2003-04-17 13:20:02 +02:00
unknown
d7edf9785b Post-merge fixes. 2003-04-17 00:18:29 +02:00
unknown
cfd69393e4 Post merge fixes.
mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.
2003-04-04 15:47:43 +02:00
unknown
3946b8235c Added IF EXISTS to DROP PROCEDURE|FUNCTION.
Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).


Docs/sp-implemented.txt:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
mysql-test/r/sp-error.result:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
mysql-test/t/sp-error.test:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
sql/sp_pcontext.cc:
  Changed another unecessary use of Item_string into LEX_STRING.
sql/sp_pcontext.h:
  Changed another unecessary use of Item_string into LEX_STRING.
sql/sql_parse.cc:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
sql/sql_yacc.yy:
  Added IF EXISTS to DROP PROCEDURE|FUNCTION
2003-03-26 12:29:58 +01:00
unknown
addf8ea04e Post-merge fixes.
mysql-test/r/sp.result:
  Post-merge fixes.
  (And disabled the ip test, since some change in 4.1 broke it.)
mysql-test/t/sp.test:
  Post-merge fixes.
  (And disabled the ip test, since some change in 4.1 broke it.)
2003-03-19 11:36:32 +01:00
unknown
f74b36a242 Improved error handling regarding SPs (with info like names etc in the output).
Disabled queries in FUNCTIONs.


include/mysqld_error.h:
  New error message for queries in FUNCTIONs.
mysql-test/t/sp.test:
  Moved error tests to sp-error.test.
sql/share/czech/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/danish/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/dutch/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/english/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/estonian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/french/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/german/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/greek/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/hungarian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/italian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/japanese/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/korean/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/norwegian-ny/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/norwegian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/polish/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/portuguese/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/romanian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/russian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/serbian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/slovak/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/spanish/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/swedish/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/share/ukrainian/errmsg.txt:
  New error message for queries in FUNCTIONs.
  Improved most of the SP error messages with added info.
sql/sp_head.cc:
  Added debug output to sp_instr_jump::execute(). (Moved from sp_head.h)
sql/sp_head.h:
  Moved sp_instr_jump::execute() to sp_head.cc.
sql/sql_lex.h:
  Added SQLCOM_CREATE_SPFUNCTION (for improved error handling).
sql/sql_parse.cc:
  Improved error handling regarding SPs (adding info like names etc in output).
sql/sql_yacc.yy:
  Improved error handling regarding SPs (adding info like names etc in output).
  Disabled queries in FUNCTIONS (since it can't work anyway).
2003-03-05 19:45:17 +01:00