prime number test example.


mysql-test/r/sp.result:
  New prime number example. (Good for future benchmarkings too.)
mysql-test/t/sp.test:
  New prime number example. (Good for future benchmarkings too.)
sql/sql_class.cc:
  Reset row_count in select_dumpvar when preparing, to make it reentrant as a lex member.
sql/sql_select.cc:
  Don't delete result if it's a lex member (since lex needs to be reentrant).

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).

Docs/sp-imp-spec.txt:
  Updated docs about stored FUNCTIONs.
Docs/sp-implemented.txt:
  Updated docs about stored FUNCTIONs.
mysql-test/r/sp.result:
  Changed the ifac test example into a combination of a procedure and a function.
mysql-test/t/sp.test:
  Changed the ifac test example into a combination of a procedure and a function.

Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
reworked once the real SP caching is implemented.


mysql-test/r/sp.result:
  New function tests.
mysql-test/t/sp.test:
  New function tests.
sql/sp.cc:
  Big rehack of mysql.proc table usage strategy and adding a function cache
  mechanism, since we need to read used functions from the db before doing anything else
  when executing a query. (This cache is temporary and will probably be replaced by
  the real thing later.)
sql/sp.h:
  New (temporary) FUNCTION caching functions.
sql/sp_head.cc:
  Fixed some bugs in the function and procedure execution.
  Disabled some data collections that's not used at the moment.
sql/sp_head.h:
  Fixed some bugs in the function and procedure execution.
  Disabled some data collections that's not used at the moment.
sql/sql_class.h:
  Added SP function cache list to thd.
sql/sql_lex.cc:
  Added SP function name list to lex.
sql/sql_lex.h:
  Added SP function name list to lex.
sql/sql_parse.cc:
  Read used FUNCTIONs from db and cache them in thd before doing anything else
  in a query execution. (This is necessary since we can't open mysql.proc during
  query execution.)
sql/sql_yacc.yy:
  Collect used function names in lex.

mysql-test/r/show_check.result:
  proc table now shows up in different places.
mysql-test/r/status.result:
  proc table now shows up in different places.
sql/sp.cc:
  Fixed closing of tables.
sql/sp_head.cc:
  Close tables after each sub statement.
sql/sql_class.cc:
  Removed closing of tables in various send_eof() methods again.

but still strange interferences between multiple function invocations...


mysql-test/r/sp.result:
  New FUNCTION tests.
mysql-test/t/sp.test:
  New FUNCTION tests.
sql/item_func.cc:
  Fixed field_type bug; now string functions work too.
  Removed unecessary function which was added in a state of confusion.
sql/item_func.h:
  Fixed field_type bug; now string functions work too.
  Removed unecessary function which was added in a state of confusion.
sql/sp_head.cc:
  Fixed string type bug, and set the right charset.

various known problems, but good enough for a checkpoint commit.


mysql-test/r/sp.result:
  New tests for invoking simple FUNCTIONs.
mysql-test/t/sp.test:
  New tests for invoking simple FUNCTIONs.
sql/item_func.cc:
  New Item_func_sp for stored FUNCTIONs.
sql/item_func.h:
  New Item_func_sp for stored FUNCTIONs.
sql/sp.cc:
  Close mysql.proc table earlier so recursive find_function calls work.
  Added temporary sp_function_exists() function for checking without parsing.
sql/sp.h:
  Added temporary sp_function_exists() function for checking without parsing.
sql/sp_head.cc:
  New code for executing a FUNCTION. (And reworked some of the old code in the process.)
sql/sp_head.h:
  New code for executing a FUNCTION.
sql/sp_rcontext.h:
  Added result slot for FUNCTIONs.
sql/sql_lex.cc:
  Added check for stored FUNCTION, analogous to UDFs.
sql/sql_parse.cc:
  sp_head::execute was renamed into execute_procedure.
sql/sql_yacc.yy:
  Added parsing of stored FUNCTION invocation and code generation for RETURN statement.

Expanded the mysql.proc table, reworked the find/create/drop functions
completely, added new functions for FUNCTIONs (lotta functions here :),
got rid of some unnecessary use of Item_strings while at it. Extended
the parser correspondingly, and fiddled around a bit to make SP FUNCTIONs
coexist with UDFs.
Can now CREATE and DROP FUNCTIONs. Invoking yet to come...


Docs/sp-implemented.txt:
  Updated with info about CASCADE/RESTICT and METHOD, and some answers to questions.
include/mysqld_error.h:
  New error message for misuse of RETURN.
mysql-test/install_test_db.sh:
  Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
mysql-test/r/sp.result:
  New test for creating and dropping FUNCTIONS.
mysql-test/t/sp.test:
  New test for creating and dropping FUNCTIONS.
scripts/mysql_install_db.sh:
  Added enum field to mysql.proc to distinguish between FUNCTION and PROCEDURE.
sql/lex.h:
  De-UDFed some symbol names, as they are now used for SPs as well.
  Added RETURN_SYM.
sql/share/czech/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/danish/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/dutch/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/english/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/estonian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/french/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/german/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/greek/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/hungarian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/italian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/japanese/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/korean/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/norwegian-ny/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/norwegian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/polish/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/portuguese/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/romanian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/russian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/serbian/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/slovak/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/spanish/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/swedish/errmsg.txt:
  New error message for misuse of RETURN.
sql/share/ukrainian/errmsg.txt:
  New error message for misuse of RETURN.
sql/sp.cc:
  Major rehack to accomodate FUNCTIONs, and to make it easier to add
  future in-memory cache of prepared SPs.
sql/sp.h:
  Major rehack to accomodate FUNCTIONs, and to make it easier to add
  future in-memory cache of prepared SPs.
sql/sp_head.cc:
  Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sp_head.h:
  Now creates FUNCTIONs too. (And got rid of some unnecessary Item_string use.)
sql/sql_lex.h:
  New stored FUNCTION commands.
sql/sql_parse.cc:
  Added FUNCTION support ("drop" merged with the old UDF code), and made some
  additional changes for better error handling (following the sp.cc rehacking).
sql/sql_yacc.yy:
  Some former UDF specific symbols renamed.
  Added CREATE FUNCTION parsing.
  DROP FUNCTION had to be partly merged with the old UDF code, because of the similar
  syntax.
  RETURN statement added, but still a no-op.

reorganized the sp.test file.


mysql-test/r/sp.result:
  New results from the reorganized sp.test file.
mysql-test/t/sp.test:
  Reorganized the tests, and added a few new ones. ("fac" and more "select into")
sql/sql_class.cc:
  Unlock tables and set thd->lock=0 in select_export::send_eof() and
  select_dump::send_eof().
  This fixes a problem with an assert() in lock_tables(), and made
  SELECT ... INTO OUTFILE and ... INTO DUMPFILE work in stored procedures.

sql/sql_class.cc:
  Unlock tables after a SELECT INTO variables, or an assert() in lock_tables() fails.
  Note: This might be a problem with other SELECT variants too.
sql/sql_yacc.yy:
  Make all bison versions work (hopefully).

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/insert.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged

"syntax error".


sql/mysqld.cc:
  Test for "syntax error" in yyerror() as well.
  They've changed the "parse error" string into "syntax error" in bison 1.875.

myisam/rt_index.c:
  bug fix
myisam/rt_key.c:
  bug fix
myisam/rt_test.c:
  bug fix

myisam/rt_key.c:
  bug fix
myisam/rt_split.c:
  bug fix

  Bug fix
opt_range.cc:
  Buf fix


sql/field.cc:
  Bug fix
sql/opt_range.cc:
  Buf fix
sql/sql_table.cc:
  Bug fix

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb

client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/rpl000001.result:
  Auto merged
mysql-test/r/rpl000004.result:
  Auto merged
mysql-test/r/type_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/rpl000001.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
Makefile.am:
  Merge with 4.0.11
mysql-test/mysql-test-run.sh:
  Merge with 4.0.11
mysql-test/r/rpl_log.result:
  Use local version (needs to be updated)
mysql-test/t/type_blob.test:
  Merge with 4.0.11
sql/mysqld.cc:
  Merge with 4.0.11
sql/protocol.cc:
  Use local version

Novell patches


Makefile.am:
  Novell patch
client/mysql.cc:
  Novell patch
configure.in:
  Novell patch
extra/mysql_waitpid.c:
  Novell patch
include/my_pthread.h:
  Novell patch
include/mysql.h:
  Novell patch
libmysql/libmysql.c:
  Novell patch
libmysqld/libmysqld.c:
  Novell patch
mysql-test/mysql-test-run.sh:
  Don't use running server with --valgrind
mysql-test/r/innodb.result:
  Updated results
mysql-test/r/rpl000001.result:
  Updated results
mysql-test/r/rpl000004.result:
  Updated results
mysql-test/r/rpl_log.result:
  Updated results
mysql-test/r/type_blob.result:
  Updated results
mysql-test/std_data/words.dat:
  Added more words to make type_blob test relevant
mysql-test/t/innodb.test:
  test of multi-table-delete
mysql-test/t/rpl000001.test:
  Update for new word file
mysql-test/t/type_blob.test:
  Test if BLOB IS NULL on NOT NULL column
mysys/my_init.c:
  Novell patch
mysys/my_netware.c:
  Novell patch
netware/Makefile.am:
  Novell patch
netware/init_db.sql:
  Novell patch
netware/isamchk.def:
  Novell patch
netware/isamlog.def:
  Novell patch
netware/libmysql.def:
  Novell patch
netware/my_print_defaults.def:
  Novell patch
netware/myisamchk.def:
  Novell patch
netware/myisamlog.def:
  Novell patch
netware/myisampack.def:
  Novell patch
netware/mysql.def:
  Novell patch
netware/mysql_install_db.c:
  Novell patch
netware/mysql_install_db.def:
  Novell patch
netware/mysql_test_run.def:
  Novell patch
netware/mysqladmin.def:
  Novell patch
netware/mysqlbinlog.def:
  Novell patch
netware/mysqlcheck.def:
  Novell patch
netware/mysqld_safe.c:
  Novell patch
netware/mysqldump.def:
  Novell patch
netware/mysqlimport.def:
  Novell patch
netware/mysqlshow.def:
  Novell patch
netware/mysqltest.def:
  Novell patch
netware/pack_isam.def:
  Novell patch
netware/perror.def:
  Novell patch
netware/replace.def:
  Novell patch
netware/resolveip.def:
  Novell patch
netware/test_db.sql:
  Novell patch
scripts/make_binary_distribution.sh:
  Novell patch
sql/item_cmpfunc.h:
  Optimization of 'IS NULL'
sql/mysql_priv.h:
  Code cleanup
sql/mysqld.cc:
  Novell patch
sql/net_pkg.cc:
  Code cleanup
sql/records.cc:
  Fixed multi-table-delete for InnoDB tables
sql/sql_delete.cc:
  Fixed multi-table-delete for InnoDB tables
sql/sql_handler.cc:
  Code cleanup
sql/sql_table.cc:
  Code cleanup
sql/structs.h:
  Fixed multi-table-delete for InnoDB tables

into mashka.mysql.fi:/home/my/mysql-4.0


sql/item_cmpfunc.h:
  Auto merged

Reverted wrong patch for mysqld_safe.sh


client/mysqldump.c:
  Patch for novell.
scripts/mysqld_safe.sh:
  Reverted wrong patch.
  (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)

fixed destroing not well constructed analize object
fixed wrong detection of unions in derived tables


sql/sql_analyse.h:
  fixed destroing not well constructed analize object
sql/sql_derived.cc:
  fixed wrong detection of unions in derived tables
sql/sql_lex.cc:
  fixed excluding st_select_lex from global select list

libmysql/libmysql.c:
  Fix to read the correct 'default value'

tests/client_test.c:
  Another misc variable test which is of bool type returning a longlong

tests/client_test.c:
  Updated tests for MYSQL_FIELD members for misc cases
libmysql/libmysql.c:
  Remove the assignment from stmt->fields to stmt->mysql->fields

into mysql.r18.ru:/usr/home/ram/work/mysql-4.1.bdb

Fixed problem with LIKE and BINARY


BitKeeper/etc/ignore:
  added scripts/fill_help_tables
client/mysqltest.c:
  Better error messages
libmysql/libmysql.c:
  Simple code cleanup
  Simplified connect() and change_user() by using sub function
libmysqld/lib_sql.cc:
  Ensure that new fields in MYSQL_FIELD structure is used
mysql-test/r/rpl_user_variables.result:
  Cleaned up test
mysql-test/r/type_blob.result:
  New test
mysql-test/t/rpl_user_variables.test:
  Cleaned up test
mysql-test/t/type_blob.test:
  New test
sql/item.cc:
  Fixed that Item_ref returns the right character set
sql/item_cmpfunc.cc:
  Fixed problem with LIKE and BINARY
sql/item_func.cc:
  Don't store end ASCII(0) for string user variables
  (Made some other code easier)
sql/log_event.cc:
  Don't store end ASCII(0) for string user variables.
  Fixed comment style
  Some optimizations
sql/log_event.h:
  Optimized type
sql/mini_client.cc:
  Indentation changes
sql/mysql_priv.h:
  Made is_update_query extern
sql/protocol.cc:
  Simple code cleanup
sql/sql_acl.cc:
  Code cleanup
  Fixed problem when connecting to user without a password.
sql/sql_lex.h:
  Fixed problem with uninitialized memory
sql/sql_parse.cc:
  Fixed problem with user without passwords
  Fixed some connect problems.
sql/time.cc:
  removed reference to uninitialized memory

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1


BUILD/FINISH.sh:
  Auto merged
client/mysqldump.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
  Auto merged

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  Fix


sql/item_strfunc.cc:
  Fix

  Fix


sql/item_strfunc.cc:
  Fix

  Typo fix
  ,


scripts/fill_help_tables.sh:
  Typo fix
  ,

  Compilation failure fix


sql/sql_yacc.yy:
  Compilation failure fix

libmysql/libmysql.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Fixed a few typos from last patch


configure.in:
  Updated script to handle 1 digit numbers in MySQL version
libmysqld/libmysqld.c:
  Added mysql_get_server_version
sql/sql_parse.cc:
  Fixed typo in last patch
sql/sql_yacc.yy:
  Fixed typo in last patch