sql/item.h:
  silly mistake

sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.h:
  Conflict resolving

DEFAULT in UPDATE and SELECT


sql/field.h:
  set_default() implementation changed
sql/item.cc:
  Item_default_value methods implementations added
sql/item.h:
  Item_default_value class added
sql/sql_yacc.yy:
  DEFAULT in UPDATE and SELECT added
sql/table.cc:
  table->default_values initialization added
sql/table.h:
  st_table::default_values added

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

sql/mysql_priv.h:
  Fix bugs with shared memory's variables
sql/mysqld.cc:
  Fix bugs with shared memory's variables

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

  this function will be used to load both Index and a named charset, so let's add a new argument to pass file name


mysys/charset.c:
  this function will be used to load both Index and a named charset, so let's add a new argument to pass file name

  "compiled" flag


sql/share/charsets/Index.xml:
  "compiled" flag

  Delete: sql/share/charsets/Index


BitKeeper/deleted/.del-Index~a8f78510440e2fc4:
  Delete: sql/share/charsets/Index

  SLL -> SSL


libmysql/libmysql.c:
  SLL -> SSL

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

  Delete: mysys/test_xml


BitKeeper/deleted/.del-test_xml~6237d9729f4fe38:
  Delete: mysys/test_xml

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


sql/field.cc:
  Auto merged

client/mysql.cc:
  Removing unreferenced variables
sql/sql_test.cc:
  Fix VC++ compiler error that doesn't permits the declaration and
  initialization of variables that can be skipped by the prior
  goto end instruction.

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


sql/sql_parse.cc:
  Auto merged

mysql-test/r/subselect.result:
  test of DO with subselects
mysql-test/t/subselect.test:
  test of DO with subselects

into mysql.com:/home/pz/mysql/mysql-4.1-root

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


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged

into mysql.com:/home/pz/mysql/mysql-4.1

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


sql/field.cc:
  Auto merged

  added test_xml


BitKeeper/etc/ignore:
  added test_xml

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

into mysql.com:/home/pz/mysql/mysql-4.1

sql/item_strfunc.cc:
  Fix password() function according Monty's comment

into mysql.com:/home/pz/mysql/mysql-4.1

sql/item.cc:
  post-post-review fix
sql/item_cmpfunc.h:
  post-post-review fix
sql/item_row.cc:
  post-post-review fix
sql/item_subselect.cc:
  post-post-review fix

into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

reordered Item_row class variables to be sorted by memory size


mysql-test/r/subselect.result:
  fix result of subselect test
sql/item.cc:
  postreviews fix
sql/item.h:
  postreviews fix
sql/item_cmpfunc.h:
  postreviews fix
sql/item_row.cc:
  postreviews fix
sql/item_row.h:
  reordered class variables to be sorted by memory size
  postreviews fix
sql/item_strfunc.cc:
  postreviews fix
sql/item_subselect.cc:
  postreviews fix

outfile) class.

sql/mysqld.cc:
  Fixed duplicate of handle_count