sql/sql_list.h:
  Post-merge

sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/opt_range.cc:
  Post_merge

The objects of this class represent multiple conjunctive equalities
in where conditions: =(f1,f2,...fn) <=> f1=f2 and f2= ... and =fn.
The objects are used to generate new possibale paths to access
the tables when executing a query.
They are also used to optimize the execution plan 
chosen by the optimizer for the query.  


sql/item.cc:
  Introduced Item_equal
sql/item.h:
  Introduced Item_equal.
  Added traverse method.
sql/item_cmpfunc.cc:
  Introduced Item_equal.
  Added traverse mehtod.
sql/item_cmpfunc.h:
  Itroduced Item_equal and Item_equal_iterator.
sql/item_func.cc:
  Added traverse method.
  Introduced Item_equal.
sql/item_func.h:
  Introduced Item_equal.
  Added traverse method.
sql/item_row.cc:
  Added traverse method.
sql/item_row.h:
  Added traverse method.
sql/item_strfunc.h:
  Added traverse method.
sql/opt_range.cc:
  Used Item_equal in range analysis.
sql/opt_sum.cc:
  Introduced Item_equal.
sql/sql_list.h:
  Added concat and disjoin methods to lists.
  Fixed remove method for lists.
sql/sql_select.cc:
  Introdiced Item_equal:
    created Item_equal;
    used Item_equal objects to generate new paths to access tables.
    used Item_equal objects to optimize the execution plan chosen by optimizer.
sql/sql_select.h:
  Introduced Item_equal.

BitKeeper/etc/ignore:
  Added libmysqld/protocol_cursor.cc libmysqld/sp_rcontext.cc to the ignore list

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

include/mysqld_error.h:
  Changed "query" into "statement".
include/sql_state.h:
  Changed "query" into "statement", and corrected SQL state code.
mysql-test/r/sp-error.result:
  Changed "query" into "statement", and corrected SQL state code.
sql/share/czech/errmsg.txt:
  Changed "query" into "statement".
sql/share/danish/errmsg.txt:
  Changed "query" into "statement".
sql/share/dutch/errmsg.txt:
  Changed "query" into "statement".
sql/share/english/errmsg.txt:
  Changed "query" into "statement".
sql/share/estonian/errmsg.txt:
  Changed "query" into "statement".
sql/share/french/errmsg.txt:
  Changed "query" into "statement".
sql/share/german/errmsg.txt:
  Changed "query" into "statement".
sql/share/greek/errmsg.txt:
  Changed "query" into "statement".
sql/share/hungarian/errmsg.txt:
  Changed "query" into "statement".
sql/share/italian/errmsg.txt:
  Changed "query" into "statement".
sql/share/japanese/errmsg.txt:
  Changed "query" into "statement".
sql/share/korean/errmsg.txt:
  Changed "query" into "statement".
sql/share/norwegian-ny/errmsg.txt:
  Changed "query" into "statement".
sql/share/norwegian/errmsg.txt:
  Changed "query" into "statement".
sql/share/polish/errmsg.txt:
  Changed "query" into "statement".
sql/share/portuguese/errmsg.txt:
  Changed "query" into "statement".
sql/share/romanian/errmsg.txt:
  Changed "query" into "statement".
sql/share/russian/errmsg.txt:
  Changed "query" into "statement".
sql/share/serbian/errmsg.txt:
  Changed "query" into "statement".
sql/share/slovak/errmsg.txt:
  Changed "query" into "statement".
sql/share/spanish/errmsg.txt:
  Changed "query" into "statement".
sql/share/swedish/errmsg.txt:
  Changed "query" into "statement".
sql/share/ukrainian/errmsg.txt:
  Changed "query" into "statement".
sql/sql_yacc.yy:
  Changed "query" into "statement".

into mysql.com:/home/kostja/mysql/mysql-5.0-root


sql/sql_class.cc:
  Auto merged

- unused variable THD::con_root removed
- we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
- we don't need to bzero(&transaction.mem_root) because we 
  bzero(&transaction) later in THD::THD
- we don't need to free thd->mem_root thd->transaction.mem_root
  in handle_one_connection because they are freed in THD::~THD
  which is called in end_thread later 



sql/sql_class.cc:
  Cleanups:
  - unused variable THD::con_root removed
  - we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
  - we don't need to bzero(&transaction.mem_root) because we 
    bzero(&transaction) later in THD::THD
sql/sql_class.h:
  Unused variable THD::con_root removed
sql/sql_parse.cc:
  we don't need to free thd->mem_root and thd->transaction.mem_root
  because they are freed in THD::~THD

into mysql.com:/home/psergey/10-get-mysql5


sql/sql_class.cc:
  Auto merged

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

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

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.

into mysql.com:/home/kostja/mysql/mysql-5.0-root


sql/sql_class.cc:
  Auto merged

sql/sp_head.cc:
  Fixed bug that showed up when using running with --debug.

BitKeeper/etc/logging_ok:
  auto-union
sql/opt_range.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/opt_range.cc:
  Merged
sql/sql_select.cc:
  Merged

  Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
  Post-merge fixes
Many files:
  new file


sql/opt_ft.h:
  Post-merge fixes
sql/opt_range.cc:
  Post-merge fixes
sql/opt_range.h:
  Post-merge fixes
sql/sql_select.cc:
  Post-merge fixes
sql/sql_union.cc:
  Post-merge fixes
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

for some items, which made aggregates like MIN(), MAX() and SUM() fail.


mysql-test/r/sp.result:
  Test case for aggregate functions in SELECT INTO. (BUG#1874)
mysql-test/t/sp.test:
  Test case for aggregate functions in SELECT INTO. (BUG#1874)

mysql-test/r/sp.result:
  Test for handling of null values.
mysql-test/t/sp.test:
  Test for handling of null values.
sql/item.h:
  Update null_value correctly in Item_splocal.

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

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.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/rpl_temporary.result:
  Auto merged
mysql-test/r/show_check.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_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.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_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.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/table.h:
  Auto merged

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

  There were errors in cp850: in unicode, ctype and sort arrays


sql/share/charsets/cp850.xml:
  There were errors in cp850: in unicode, ctype and sort arrays

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

mysys/mf_keycache.c:
  Fixed C syntax error.

sql/sql_yacc.yy:
   - added a missing comma (maybe a merge error?)

into mysql.com:/space/my/mysql-4.1

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

into mysql.com:/space/my/mysql-4.1

into mysql.com:/bk/mysql-4.1

scripts/make_win_src_distribution.sh:
  Changed to copy Docs/internals.texi to target directory.

mysql-test/mysql-test-run.sh:
   - fixed typo in error message

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


sql/sql_yacc.yy:
  Auto merged

sql/item_create.cc:
  changed name of bit on more descriptive
sql/item_func.cc:
  changed name of bit on more descriptive
sql/mysql_priv.h:
  changed name of bit on more descriptive
sql/sql_lex.h:
  changed name of bit on more descriptive
sql/sql_yacc.yy:
  changed name of bit on more descriptive