BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/log_event.cc:
  merged
sql/sql_parse.cc:
  merged

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

Add tests for show commands + MYSQL_TYPE_NULL coverage


tests/client_test.c:
  Add tests for show commands + MYSQL_TYPE_NULL coverage
libmysql/libmysql.c:
  Fix alloc_stmt_fields for non-select statements

include/my_sys.h:
  Addet reset_dinamic
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Make AWE compilation depend on __WIN2000__


innobase/srv/srv0start.c:
  Make AWE compilation depend on __WIN2000__
innobase/os/os0proc.c:
  Make AWE compilation depend on __WIN2000__
innobase/include/os0proc.h:
  Make AWE compilation depend on __WIN2000__
include/config-win.h:
  Make AWE compilation depend on __WIN2000__

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

sql/item_func.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

sql/sql_prepare.cc:
  Fix 'n' concurrent executions
libmysql/errmsg.c:
  Fix the missing semicolon for errors
libmysql/libmysql.c:
  Fix the result meta info for non-SELECT statements

No commit message

  Fix


sql/share/charsets/cp1256.xml:
  Fix

 Getting closer 


strings/conf_to_src.c:
  Getting closer

  Restoring conf_to_src. Now it loads XML.


strings/conf_to_src.c:
  Restoring conf_to_src. Now it loads XML.

  Compilation failure fix


tests/client_test.c:
  Compilation failure fix

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

sql/sql_prepare.cc:
  Fix leak when the client disconnects with open statements
tests/client_test.c:
  Enable stmt_close test

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

sql/sql_class.cc:
  This should be #ifdefed

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

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 sinisa.nasamreza.org:/mnt/work/mysql-4.1

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