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

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

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

BitKeeper/deleted/.del-innodb-non-simple.test~380a6ef42b6e15d1:
  Delete: mysql-test/t/innodb-non-simple.test
BitKeeper/deleted/.del-innodb-non-simple.result~2f77d5b0aaf5aa90:
  Delete: mysql-test/r/innodb-non-simple.result

sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/subselect.test:
  SCCS merged

sql/item.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/item.h:
  Made some virtual functions non virtual (as they are not used virtually)
sql/item_strfunc.cc:
  Optimizations.
sql/item_strfunc.h:
  Fixed BINARY handling
sql/sql_string.h:
  Indentation cleanups

sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  SCCS merged

removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
fix for using subselects with update
test of locking for non-simple queries
(SCRUM?)


sql/sql_yacc.yy:
  removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
  fix for using subselects with update

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

configure.in:
  Auto merged
BitKeeper/deleted/.del-mutex.m4~a13383cde18a64e1:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/null_key.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_func.h:
  Merge

Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE



sql/sql_lex.cc:
  Faster handling of identifiers
sql/sql_lex.h:
  Faster handling of identifiers
sql/sql_yacc.yy:
  Added SERIAL (alias for bigint auto_increment)
  Make PRIMARY optional in field specification
  Make VALUE alias for VALUES

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

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

mysql-test/r/subselect.result:
  test of subselect in derived table
mysql-test/t/subselect.test:
  test of subselect in derived table

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


sql/opt_range.cc:
  Auto merged

more efficient reference creation
fixed table_name of Field in temporary table


mysql-test/r/subselect.result:
  test of 2 references bugs
mysql-test/t/subselect.test:
  test of 2 references bugs
sql/field.h:
  fixed layout
  fixed table name of fields of temporary table (derived table)
sql/item.cc:
  more efficient reference creation
sql/sql_base.cc:
  fixed layout
  supported possiblity of item substitute (fixed bug)

sql/opt_range.cc:
  Auto merged

Fixed context in error mesages


mysql-test/r/subselect.result:
  tests of references and error message
mysql-test/t/subselect.test:
  tests of references and error message
sql/item.cc:
  Fixed layout
  Resolving field names of outer select
sql/item_subselect.cc:
  saving/restoring context for error messages
sql/mysql_priv.h:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_base.cc:
  changed function interface to allow resolving field names inside Item_ref::fix_fields
sql/sql_lex.h:
  allow access to thd field

renamed tables to prevent droping real tables


mysql-test/r/group_by.result:
  test of error message
mysql-test/r/subselect.result:
  renamed tables to prevent droping real tables
mysql-test/t/group_by.test:
  test of error message
mysql-test/t/subselect.test:
  renamed tables to prevent droping real tables
sql/sql_base.cc:
  moved thd->allow_sum_func assignment to upper level
sql/sql_select.cc:
  fixed removed by previos patch thd->allow_sum_func "side effect" of setup_conds

Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23

Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.


mysql-test/r/bigint.result:
  Moved casting test to cast.test
mysql-test/r/func_time.result:
  Test of new functions
mysql-test/t/bigint.test:
  Moved casting test to cast.test
mysql-test/t/func_time.test:
  Test of new functions
sql/item_create.cc:
  Added casting to CHAR
sql/item_func.h:
  Added casting to CHAR
sql/item_timefunc.h:
  Added casting to CHAR
sql/lex.h:
  Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
  Added CEIL as an alias for CEILING
sql/sql_yacc.yy:
  Cleaned up CHECK constraint handling.

mysql-test/r/subselect.result:
  test of selfreference
mysql-test/t/subselect.test:
  test of selfreference

mysql-test/r/subselect.result:
  test of sum function with subselect
mysql-test/t/subselect.test:
  test of sum function with subselect

mysql-test/t/subselect.test:
  after merging fix
sql/sql_lex.cc:
  after merging fix
sql/sql_update.cc:
  after merging fix
sql/sql_yacc.yy:
  after merging fix

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


mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/share/czech/errmsg.txt:
  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/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged