libmysqld/lib_sql.cc:
  This would be more correct
sql/item.cc:
  This error not to be exposed
sql/item_strfunc.cc:
  We don't want login/password stuff in Embedded Library
sql/sql_select.cc:
  This error not to be exposed
sql/sql_table.cc:
  Usual changes here

into bisonxp.(none):/home/hf/work/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

libmysqld/lib_sql.cc:
  Working when LIMIT is on
sql/sql_handler.cc:
  Usual fix to handle embedded case properly
sql/sql_select.cc:
  Usual fix to handle embedded case properly
sql/sql_table.cc:
  Usual fix to handle embedded case properly
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

server-cfg.sh	set bdb as transactional


sql-bench/server-cfg.sh:
  remove %smds, remove conversation from date to int for mysql,
  set bdb as transactional
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Small fixes in database default charset code


sql/mysql_priv.h:
  SHOW CREATE DATABASE name;
sql/sql_db.cc:
  SHOW CREATE DATABASE name;
sql/sql_lex.h:
  SHOW CREATE DATABASE name;
sql/sql_parse.cc:
  SHOW CREATE DATABASE name;
sql/sql_yacc.yy:
  SHOW CREATE DATABASE name;

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

fix after automerge


sql/item_strfunc.cc:
  fix after automerge
sql/sql_lex.h:
  subselect clean up
sql/sql_select.cc:
  subselect clean up

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1

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


sql/item_strfunc.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

fixed bug in sum function in subselect


mysql-test/r/subselect.result:
  subselect in having clause
mysql-test/t/subselect.test:
  subselect in having clause
sql/item.cc:
  subselect in having clause
sql/item.h:
  subselect in having clause
sql/item_cmpfunc.cc:
  subselect in having clause
sql/item_cmpfunc.h:
  subselect in having clause
sql/item_func.cc:
  subselect in having clause
sql/item_func.h:
  subselect in having clause
sql/item_strfunc.h:
  subselect in having clause
sql/item_subselect.cc:
  subselect in having clause
sql/item_subselect.h:
  subselect in having clause
sql/item_uniq.h:
  subselect in having clause
sql/sql_base.cc:
  subselect in having clause
sql/sql_class.cc:
  subselect in having clause
sql/sql_class.h:
  subselect in having clause
sql/sql_handler.cc:
  subselect in having clause
sql/sql_lex.cc:
  subselect in having clause
sql/sql_lex.h:
  subselect in having clause
sql/sql_prepare.cc:
  subselect in having clause
sql/sql_yacc.yy:
  subselect in having clause

if the current db is being altered

CREATE TABLE a SELECT strfunc(non_default_charset_expr)

Fixed that MyISAM were not working properly with non-8bit charsets in some cases
CONVERT() function now works properly


myisam/mi_unique.c:
  Fix for non-8bit charsets
sql/field.cc:
  Initialize blobs with charset
sql/field.h:
  Initialize blobs with charset
sql/field_conv.cc:
  Initialize blobs with charset
sql/item_strfunc.cc:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/item_strfunc.h:
  CONVERT() function now has working fix_lenght_and_dec(), and it's own 
  fix_fields()
sql/sql_select.cc:
  Fixes for BLOBs
  Fixed that wrong charset was used in some cases

CREATE DATABASE dbname DEFAULT CHARACTERSET=latin1


sql/sql_class.cc:
  Database default charset
sql/sql_class.h:
  Database default charset
sql/sql_db.cc:
  Database default charset
sql/sql_table.cc:
  Database default charset
BitKeeper/etc/ignore:
  Added tests/client_test to the ignore list

now works more correctly. Still needs fixes.

Remove dupicated code


sql/sql_lex.cc:
  new UNDERSCORE_CHARSET language item

into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

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


sql/sql_yacc.yy:
  Auto merged

ALTER TABLE a CHARSET=DEFAULT

CREATE TABLE a (field,...) TYPE=type CHARSET=cset;


sql/handler.h:
  New flag to remember whether new table default charset 
  has been passed in ALTER TABLE
sql/lex.h:
  New language symbol
sql/sql_show.cc:
  Display default table charset if exists
sql/sql_table.cc:
  Check table charset before default server charset
sql/sql_yacc.yy:
  New create table option: default table character set
sql/table.cc:
  Table charset
sql/unireg.cc:
  field->charset must be initialized before. So assumes it is not NULL

sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

more correct parameters in result creation script


mysql-test/create-test-result:
  more correct parameters in result creation script
mysql-test/r/subselect.result:
  test of EXISTS
mysql-test/t/subselect.test:
  test of EXISTS
sql/item_subselect.cc:
  EXISTS type of subselect
sql/item_subselect.h:
  EXISTS type of subselect
sql/sql_class.cc:
  EXISTS type of subselect
sql/sql_class.h:
  EXISTS type of subselect
sql/sql_yacc.yy:
  EXISTS type of subselect

into bison.(none):/home/hf/work/mysql-4.1


include/mysql.h:
  Auto merged

libmysqld/lib_sql.cc:
  Function renaming fix
libmysqld/sql_error.cc:
  Fix after pull
libmysqld/sql_prepare.cc:
  Fix after pull

Failed to compile at least on freebsd.

BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
libmysqld/lib_vio.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/net_pkg.cc:
  Merging of pull conflicts
sql/sql_base.cc:
  Merging of pull conflicts
sql/sql_class.h:
  Merging of pull conflicts

sql/mysql_priv.h:
  This macro compiles as network-sending in usual case and as writing record
  into client structures in embedded case

include/mysql.h:
  Several structures content changed for embedded case
include/violite.h:
  enum_vio_type extended
libmysqld/embedded_priv.h:
  three new funcs added
libmysqld/lib_sql.cc:
  A lot of changes on the way to excude network emulation
libmysqld/lib_vio.c:
  vio structure changed.
  we're on the way to remove network...
libmysqld/libmysqld.c:
  A lot of changes.
sql/ha_myisam.cc:
  Network sending modified for embedded case.
sql/net_pkg.cc:
  Exclude network from error sending
sql/sql_acl.cc:
  Exclude access permissions checking in embedded case
sql/sql_base.cc:
  Implementation of send_fields got quite different in enbedded case and now
  placed in lib_sql.cc
sql/sql_class.cc:
  select_send::send_data for embedded case placed in lib_sql
sql/sql_class.h:
  Extra fields added for embedded case
sql/sql_parse.cc:
  remove this out of server
sql/sql_show.cc:
  lots of similar changes to exclude network emulation
sql/sql_table.cc:
  Network emulation excluded
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  corrected the symlink


libmysqld/sql_prepare.cc:
  corrected the symlink

  Added missing sql_prepare.cc & sql_error.cc to libmysqld
sql_error.cc, sql_prepare.cc:
  new file


libmysqld/Makefile.am:
  Added missing sql_prepare.cc & sql_error.cc to libmysqld