sql/sp.cc:
  Added more error handling for abnormal cases (like a broken mysql.proc table),
  and made the field indexing clearer, using defines instead of explicit numbers.

later set by the procedure.


mysql-test/r/sp.result:
  Test case for BUG#1656
mysql-test/t/sp.test:
  Test case for BUG#1656

into mysql.com:/home/pem/work/mysql-5.0


sql/item_sum.h:
  Auto merged

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.

sql/item_sum.h:
  fixed merge bug

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-compile-netware-src~1:
  Delete: netware/BUILD/compile-netware-src
BitKeeper/deleted/.del-knetware.imp~1:
  Delete: netware/BUILD/knetware.imp
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Need a sp_cache_remove() function with implicit name lookup to make the WL task
to work. It's a cleaner and more convenient interface anyway...


sql/sp.cc:
  Modified sp_cache_remove() function calls; just remove by name.
sql/sp_cache.cc:
  Modified sp_cache_remove() function. Get name and lookup/remove, return the
  removed entry, if any.
sql/sp_cache.h:
  Modified sp_cache_remove() function. Get name and lookup/remove, return the
  removed entry, if any.

into deer.(none):/home/hf/work/mysql-4.1.clean


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

libmysqld/lib_sql.cc:
  This code seems to be superfluous
sql/derror.cc:
  in embedded server these functions should return the sign of the error
  instead of halting the program
sql/init.cc:
  my_abort_hook left unchanged
sql/mysql_priv.h:
  declaration of init_errmessage changed
  unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
  these functions don't work in embedded server thus #ifdef-ed

New sp_cache C API. When an SP is dropped, old caches (in other threads)
become invalid and are cleared.
Also, the caches in THD are only created on demand.


Docs/sp-imp-spec.txt:
  Brough the SP cache docs up-to-date.
sql/mysqld.cc:
  Initialize SP cache.
sql/sp.cc:
  New C API for SP cache.
sql/sp_cache.cc:
  New C API for sp_cache.
  The class sp_cache is still used, but not directly. The C functions makes takes
  care of updating caches when SPs are dropped. (This is done in the simplest
  possible way, by simply detecting drops and then clear all old caches.)
  The API is also designed so that the sp_cache is created on demand.
sql/sp_cache.h:
  New C API for sp_cache.
  The class sp_cache is still used, but not directly. The C functions makes takes
  care of updating caches when SPs are dropped.
  The API is also designed so that the sp_cache is created on demand.
sql/sql_class.cc:
  The new sp_cache API creates the caches on demand, to avoid allocating it
  when it's not needed.

into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1


sql/item.cc:
  Auto merged

fix to functions as well.


mysql-test/r/sp.result:
  Modified test to trap yet another bug (now fixed).
mysql-test/t/sp.test:
  Modified test to trap yet another bug (now fixed).
sql/item.h:
  Another bugfix; need to override yet another method in Item_splocal.
sql/sp_head.cc:
  Completed previous initialization bug; now for FUNCTIONs. too.

Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.cc:
  Auto merged

http://bugs.mysql.com/bug.php?id=1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.

sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

scripts/fill_help_tables.sh:
  made more fine error message

 - correct table name shown in EXPLAIN Iindex reference)
 - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)


mysql-test/r/derived.result:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/r/subselect.result:
  test moved to derived table tests
mysql-test/t/derived.test:
  test moved to derived table tests
  added test of BUG#1584
mysql-test/t/subselect.test:
  test moved to derived table tests
sql/item.cc:
  layout fix
sql/sql_select.cc:
  correct table name assigned to temporary table field

  Reduce InnoDB memory allocation if buffer pool < 8 MB


innobase/include/os0thread.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/include/srv0srv.h:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0srv.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/srv/srv0start.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB
innobase/thr/thr0loc.c:
  Reduce InnoDB memory allocation if buffer pool < 8 MB

mysql-test/r/sp.result:
  New test case for bugfix (when a variable is not set due to an exception).
mysql-test/t/sp.test:
  New test case for bugfix (when a variable is not set due to an exception).
sql/item.h:
  Local variables are initialized to null.
sql/sp_head.cc:
  Local variables are initialized to null.

mysql-test/r/subselect.result:
  fixed drop table statement
  test for BUG#1536
mysql-test/t/subselect.test:
  fixed drop table statement
  test for BUG#1536
sql/sql_derived.cc:
  all tree of derived table should be deleted
sql/sql_lex.cc:
  delete subtree method
sql/sql_lex.h:
  delete subtree method

   patch)
  (BUG#1440: Redundant class name confusing hpux compiler)

removed unnesessary code from create.test


include/sql_state.h:
  added sqlstate for ER_WRONG_INDEX_NAME
mysql-test/r/create.result:
  changed sqlstate for ER_WRONG_INDEX_NAME
  remove unnesesary warning
mysql-test/t/create.test:
  remove unnesessary drop table

include/mysqld_error.h:
  added error "Incorrect index name"
mysql-test/r/create.result:
  added test for empty index name
mysql-test/t/create.test:
  added test for empty index name
sql/share/czech/errmsg.txt:
  added error "Incorrect index name"
sql/share/danish/errmsg.txt:
  added error "Incorrect index name"
sql/share/dutch/errmsg.txt:
  added error "Incorrect index name"
sql/share/english/errmsg.txt:
  added error "Incorrect index name"
sql/share/estonian/errmsg.txt:
  added error "Incorrect index name"
sql/share/french/errmsg.txt:
  added error "Incorrect index name"
sql/share/german/errmsg.txt:
  added error "Incorrect index name"
sql/share/greek/errmsg.txt:
  added error "Incorrect index name"
sql/share/hungarian/errmsg.txt:
  added error "Incorrect index name"
sql/share/italian/errmsg.txt:
  added error "Incorrect index name"
sql/share/japanese/errmsg.txt:
  added error "Incorrect index name"
sql/share/korean/errmsg.txt:
  added error "Incorrect index name"
sql/share/norwegian-ny/errmsg.txt:
  added error "Incorrect index name"
sql/share/norwegian/errmsg.txt:
  added error "Incorrect index name"
sql/share/polish/errmsg.txt:
  added error "Incorrect index name"
sql/share/portuguese/errmsg.txt:
  added error "Incorrect index name"
sql/share/romanian/errmsg.txt:
  added error "Incorrect index name"
sql/share/russian/errmsg.txt:
  added error "Incorrect index name"
sql/share/serbian/errmsg.txt:
  added error "Incorrect index name"
sql/share/slovak/errmsg.txt:
  added error "Incorrect index name"
sql/share/spanish/errmsg.txt:
  added error "Incorrect index name"
sql/share/swedish/errmsg.txt:
  added error "Incorrect index name"
sql/share/ukrainian/errmsg.txt:
  added error "Incorrect index name"
sql/sql_table.cc:
  added checking for wrong index name

mysql-test/r/sp.result:
  Test cases for user variables (@-vars) as OUT and INOUT parameters.
mysql-test/t/sp.test:
  Test cases for user variables (@-vars) as OUT and INOUT parameters.
sql/item_func.h:
  We need to be able to detect Item_func_get_user_vars when used as arguments to SPs.
sql/sp_head.cc:
  Handle user variables (@-vars) as OUT and INOUT parameters.
  But we still just ignore it, if it's anything else.

mysql-test/r/create.result:
  update test results

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

sql/set_var.cc:
  SCCS merged

BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
  Auto merged
client/client_priv.h:
  Auto merged
extra/resolveip.c:
  Auto merged
include/mysql.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged

Created small scripts to manage in-tree diffs for NetWare platform, so changes are visible in the tree but cannot affect other platforms

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


sql/item_strfunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

After merge fixes


include/my_base.h:
  Fix comment syntax
libmysql/client_settings.h:
  Portability fixes for windows
libmysql/libmysql.c:
  Portability fixes for windows
libmysql/libmysql.def:
  Portability fixes for windows
mysql-test/r/variables.result:
  Fix result after merge
sql-common/client.c:
  Portability fixes for windows
sql/ha_berkeley.cc:
  Use defines instead of constants
sql/item_strfunc.cc:
  Portability fixes for windows
sql/mysql_priv.h:
  Use defines instead of defines
sql/mysqld.cc:
  After merge fix
sql/opt_range.h:
  After merge fix
sql/set_var.h:
  Portability fixes for windows
sql/sql_class.cc:
  Defines instead of constants
sql/sql_help.cc:
  after merge fixes
  More OOM error checking
sql/sql_prepare.cc:
  After merge fixes
sql/sql_table.cc:
  Portability fixes for windows

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

Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)


include/mysql.h:
  Added client timeouts (for TCP/IP)
libmysql/libmysql.c:
  Added client timeouts (for TCP/IP)
mysql-test/r/create.result:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysql-test/t/create.test:
  More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysys/my_chsize.c:
  Fix for windows
sql/handler.h:
  Remove not used field 'if_not_exists'
  Ordered fields to be more optimized for new CPU's
  Added field 'table_existed'
sql/slave.cc:
  Cleanup temporary tables when slave ends
sql/sql_class.h:
  Remove not used 'do_not_drop' field
sql/sql_insert.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
sql/sql_table.cc:
  Better fix for CREATE TABLE IF NOT EXISTS ... SELECT

Two missing methods added to Item_splocal + test case.


mysql-test/r/sp.result:
  Test case for BUG#1547
mysql-test/t/sp.test:
  Test case for BUG#1547
sql/item.h:
  Fix for BUG#1547: "SELECT ... WHERE field = var" sometimes give the wrong result in SPs
  
  Added missing methods to Item_splocal to get the correct compare function
  and make the optimizer do the right thing.