sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  SCCS merged

merging with switching on static tables optimization (SCRUM)
fixed subselects with uncacheable results
added test for fixed bugs from bugreports


mysql-test/r/subselect.result:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
mysql-test/t/subselect.test:
  changes in subselect test after switching on static tables optimization
  fixed bug test added
  uncacheable subselects
sql/item_create.cc:
  fixed subselects with uncacheable results
sql/item_func.cc:
  fixed subselects with uncacheable results
sql/item_subselect.cc:
  fixed subselects with uncacheable results
  clean up
sql/item_subselect.h:
  fixed subselects with uncacheable results
sql/sql_lex.cc:
  fixed subselects with uncacheable results
sql/sql_lex.h:
  fixed subselects with uncacheable results
sql/sql_select.cc:
  fixed bugs in temporary tables in subselect implementation
  fixed subselects with uncacheable results
sql/sql_union.cc:
  fixed subselects with uncacheable results
sql/sql_yacc.yy:
  fixed subselects with uncacheable results

into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/field.h:
  Auto merged

into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Missing merge in changeset 1.1435


include/my_pthread.h:
  Missing merge in changeset 1.1435
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Added some fields to the st_my_thread_var structure to be
  able to link such structures into a list.


include/my_pthread.h:
  Added some fields to the st_my_thread_var structure to be
  able to link such structures into a list.
mysys/mf_keycache.c:
  Introduced a scalable key cache management.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

strings/ctype-simple.c:
  do not ignore first char, when truncating spaces.

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

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

Enable test_stmt_close() and test output to stdout(client_test)


tests/client_test.c:
  Enable test_stmt_close() and test output to stdout
libmysql/libmysql.c:
  Fix stmt_close not to close the resources on error

into myvenu.com:/home/venu/bk/src-4.1

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

  Use cs->scan() instead of my_isspace()


sql/field.cc:
  Use cs->scan() instead of my_isspace()

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

  tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT


sql/field.cc:
  tis620 normalization will be implemented ad a SQL function, without automatic normalization on INSERT

  Semicolon has been added


sql/sql_yacc.yy:
  Semicolon has been added

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


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix)
fixed derived tables with subselect inside


mysql-test/r/derived.result:
  test of subselects inside derived tables
mysql-test/t/derived.test:
  test of subselects inside derived tables
mysql-test/t/subselect.test:
  subselect test (not finished)
sql/item.cc:
  after merge fix
sql/item.h:
  after merge fix
sql/item_cmpfunc.h:
  after merge fix
sql/item_subselect.cc:
  after merge fix
sql/item_sum.h:
  after merge fix
sql/mysql_priv.h:
  fixed derived tables with subselect inside
sql/sql_class.h:
  after merge fix
sql/sql_derived.cc:
  fixed derived tables with subselect inside
sql/sql_lex.cc:
  fixed derived tables with subselect inside
sql/sql_lex.h:
  fixed derived tables with subselect inside
sql/sql_parse.cc:
  fixed derived tables with subselect inside
  after merge fix
sql/sql_prepare.cc:
  after merge fix
sql/sql_select.cc:
  after merge fix
  fixed derived tables with subselect inside

removed switching off static table optimization for subselects (SCRUM , pre-commit  to be able merge with temporary table fix)



sql/item.cc:
  report other table for outer reference
sql/item.h:
  report other table for outer reference
sql/item_cmpfunc.cc:
  report other table for outer reference
sql/sql_select.cc:
  removed switching off static table optimization for subselects

Pure coverage tests (debug only)


include/mysql.h:
  Remove un-used variables
tests/client_test.c:
  Pure coverage tests (debug only)

sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_olap.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  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

fixed memory leacks


mysql-test/r/subselect.result:
  some changes in subselect tests
mysql-test/t/subselect.test:
  some changes in subselect tests
sql/item.cc:
  some item made copyable
  methods for creating copy of item list
  tmp_table_field() splited
sql/item.h:
  some item made copyable
  methods for creating copy of item list
  tmp_table_field() splited
sql/item_cmpfunc.cc:
  changed references creation
sql/item_cmpfunc.h:
  changed references creation
sql/item_func.cc:
  some item made copyable
  methods for creating copy of item list
  changed references creation
sql/item_func.h:
  some item made copyable
  methods for creating copy of item list
  changed references creation
  tmp_table_field() splited
sql/item_subselect.cc:
  changed references creation
sql/item_sum.cc:
  some item made copyable
  methods for creating copy of item list
sql/item_sum.h:
  some item made copyable
  methods for creating copy of item list
sql/item_timefunc.h:
  tmp_table_field() splited
sql/item_uniq.h:
  some item made copyable
  methods for creating copy of item list
sql/mysql_priv.h:
  fixed subselects with temporary tables
sql/sql_base.cc:
  fixed subselects with temporary tables
sql/sql_class.h:
  fixed subselects with temporary tables
sql/sql_delete.cc:
  fixed subselects with temporary tables
sql/sql_derived.cc:
  fixed subselects with temporary tables
sql/sql_do.cc:
  fixed subselects with temporary tables
sql/sql_insert.cc:
  fixed subselects with temporary tables
sql/sql_lex.cc:
  fixed subselects with temporary tables
sql/sql_lex.h:
  fixed subselects with temporary tables
sql/sql_list.h:
  fixed subselects with temporary tables
sql/sql_load.cc:
  fixed subselects with temporary tables
sql/sql_olap.cc:
  fixed subselects with temporary tables
sql/sql_parse.cc:
  fixed subselects with temporary tables
sql/sql_prepare.cc:
  fixed subselects with temporary tables
sql/sql_select.cc:
  fixed subselects with temporary tables
sql/sql_select.h:
  fixed subselects with temporary tables
sql/sql_table.cc:
  fixed subselects with temporary tables
sql/sql_union.cc:
  fixed subselects with temporary tables
sql/sql_update.cc:
  fixed subselects with temporary tables
sql/sql_yacc.yy:
  fixed subselects with temporary tables

Remove get_binary_length 
Enable the clients to work wih date,time and ts directly with binary protocol

  Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch


sql/ha_innodb.cc:
  Temporary fix to make the new client/server protocol to work: fetch all columns in an index, even if not needed by the SELECT statement; Monty has to fix the parser to tell InnoDB what to fetch

Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)


include/errmsg.h:
  Remove compiler warning
libmysql/libmysql.c:
  Avoid memory overruns when buffer_length is too small
libmysqld/lib_sql.cc:
  Fixed function name
sql/mysqld.cc:
  Code cleanup; Added back shared memory support (which was accidently deleted)
sql/sql_parse.cc:
  Clean up multi-query

into myvenu.com:/home/venu/bk/src-4.1

into myvenu.com:/home/venu/bk/src-4.1

into deer.mysql.r18.ru:/home/hf/work/mysql-default


sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

when optimized).


sql/protocol.cc:
  Put inline back and added missing return.

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