sql/sql_class.cc:
  This should be #ifdefed

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

Pure coverage tests (debug only)


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

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

DEFAULT in SELECT & UPDATE corrections


mysql-test/r/replace.result:
  test slightly extended
mysql-test/t/replace.test:
  test slightly extended with replace(default)
sql/item.cc:
  DEFAULT_ITEM replaced
sql/item.h:
  some modifications after talking with Sergey

BitKeeper/deleted/.del-emb_sample.tds~3555f163bebc8355:
  Delete: libmysqld/examples/builder-sample/emb_sample.tds
BitKeeper/deleted/.del-libmysqld.lib~eeb4bc25c97947da:
  Delete: libmysqld/examples/builder-sample/libmysqld.lib

tests/client_test.c:
  Fix the tests
include/mysql.h:
  Remove bind_length
libmysql/libmysql.c:
  Remove bind_length

client/mysql.cc:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mf_iocache.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.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_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/protocol.cc:
  SCCS merged