include/mysql_com.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/serbian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged

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

mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

sql/item.cc:
  after review changes
sql/item.h:
  after review changes
sql/item_subselect.cc:
  after review changes
sql/mysql_priv.h:
  after review changes
sql/sql_base.cc:
  after review changes

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

include/m_ctype.h:
  Typo fix
sql/field.cc:
  Use new string-to-number functions
strings/ctype-bin.c:
  Use new string-to-number functions
strings/ctype-simple.c:
  Use new string-to-number functions
strings/ctype-utf8.c:
  Use new string-to-number functions

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

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


sql/sql_parse.cc:
  Auto merged

into genie.(none):/home/vva/work/new_readline/4.1

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

wich is slower and is not ucs2 compatible

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


sql/sql_parse.cc:
  Auto merged

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


sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into myvenu.com:/home/venu/work/sql/dev-4.1


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

  Added my_global.h to compile after my_list.h is added to mysql.h
sql_prepare.cc:
  Handle close stmt from client
  Minor fixups to make SET variable=? to work
sql_parse.cc:
  Added missed COM_CLOSE_STMT
mysql_priv.h:
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
libmysql.c:
  Clean all open stmts during mysql_close() implicitly


libmysql/libmysql.c:
  Clean all open stmts during mysql_close() implicitly
sql/mysql_priv.h:
  Handle close_stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
sql/sql_parse.cc:
  Added missed COM_CLOSE_STMT
sql/sql_prepare.cc:
  Handle close stmt from client
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
  Minor fixups to make SET variable=? to work
client/insert_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h
client/select_test.c:
  Added my_global.h to compile after my_list.h is added to mysql.h

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

sql/sql_delete.cc:
  new order in global select list
sql/sql_derived.cc:
  removed recursion from derived tables
sql/sql_insert.cc:
  new order in global select list
sql/sql_lex.h:
  pointer to global select list
sql/sql_select.cc:
  new order in global select list
sql/sql_update.cc:
  new order in global select list

sql-bench/crash-me.sh:
  Add tests:
  
  - If double double quotes are allowed in identifiers. 
  - Rollback rolls back meta data
  - NULL sort and NULL sort perserve. 
  - remove one check of "serial".   
  - (Column,Table,Named constraints) new test to crash me if the check syntax is 
    only supported by the parser, but not done for real.
  - For all ..USER tests, (like current_user), add an extra test if
    ...USER() is supported.                                   
  - Add tests for constants TRUE and FALSE                     
  - Add test of LIMIT # OFFSET (PostgreSQL syntax) 
  - tests of a lot of new functions

mysql-test/r/subselect.result:
  Multi-delete with subselect test
mysql-test/t/subselect.test:
  Multi-delete with subselect test
sql/sql_parse.cc:
  multi-delete with subselects

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

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

within derived tables within ......

(thought it won't compile --without-readline)
preper fix is to follow...

BitKeeper/etc/ignore:
  Added bkpull.log.4 bkpull.log.5 bkpull.log.6 bkpush.log sql/sql_yacc.output to the ignore list

mysql-test/r/subselect.result:
  test of insert/replace with subselects
mysql-test/t/subselect.test:
  test of insert/replace with subselects
sql/sql_insert.cc:
  subselects in insert/replace
sql/sql_yacc.yy:
  subselects in insert/replace

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

myisammrg/Makefile.am:
  myrg_rnext_same.c added

mysql-test/r/subselect.result:
  subselects in delete test
mysql-test/t/subselect.test:
  subselects in delete test
sql/sql_delete.cc:
  subselet in delete