Added command 'replace_column' to mysqltest


client/mysqltest.c:
  Added user command replace_column
mysql-test/r/merge.result:
  Update of tests
mysql-test/t/innodb.test:
  User replace_column to make tests repeatable
mysql-test/t/merge.test:
  New tests for testing MERGE tables with multiple databases
scripts/mysql_create_system_tables.sh:
  Fixed syntax error
sql/ha_myisammrg.cc:
  Allow one to use MERGE tables with tables from different databases
sql/mysql_priv.h:
  Added function
sql/sql_parse.cc:
  Allow one to use MERGE tables with tables from different databases
sql/sql_show.cc:
  Extended append_identifier()

into mashka.mysql.fi:/home/my/mysql-4.1


BitKeeper/deleted/.del-internals.texi~62b6f580a41c2a43:
  Auto merged

into narttu.mysql.fi:/my/mysql-4.1

Updated VC++ files


VC++Files/client/mysql.dsp:
  Update of VC++ files
VC++Files/client/mysqlclient.dsp:
  Update of VC++ files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.def:
  Update of VC++ files
VC++Files/libmysqld/libmysqld.dsp:
  Update of VC++ files
VC++Files/myisam/myisam.dsp:
  Update of VC++ files
VC++Files/mysql.dsw:
  Update of VC++ files
VC++Files/sql/mysqld.dsp:
  Update of VC++ files
include/mysql.h:
  Add missing client functions to embedded server
libmysql/libmysql.def:
  sort functions to enable comparison with libmysqld.def
libmysqld/libmysqld.c:
  Add missing client functions to embedded server
libmysqld/libmysqld.def:
  sort functions to enable comparison with libmysql.def
  Added missing functions
myisam/mi_preload.c:
  Fixed compiler warning.
  Small code cleanup
scripts/make_win_src_distribution.sh:
  Fixed typo
  Don't run zip in verbose mode
scripts/mysql_create_system_tables.sh:
  Change so that localhost has full access (to make this like 4.0)
scripts/mysql_fix_privilege_tables.sh:
  Allow on to run this from the source distribution
sql-common/client.c:
  Fixed memory leak
sql/item_sum.cc:
  Removed compiler warning
sql/slave.cc:
  Cleanup
sql/sql_client.cc:
  Portability fix
sql/sql_help.cc:
  Fixed memory leak

into mysql.r18.ru:/usr/home/ram/work/4.1.gis

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

  Temporarily fix for test failure
  ,.


sql/item_cmpfunc.cc:
  Temporarily fix for test failure
  ,.

  Rewritten in nicer way
  ,


sql/item_cmpfunc.cc:
  Rewritten in nicer way
  ,

   distribution as well

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


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

Renamed as_text().


sql/item_create.cc:
  Renamed as_text().
sql/item_create.h:
  Renamed as_text().
sql/lex.h:
  Added AsWKT() alias for AsText().

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/space/my/mysql-4.1-build

include/Makefile.am:
   - added missing sql_state.h to source distribution

into rurik.mysql.com:/home/igor/mysql-4.1

into mysql.com:/space/my/mysql-4.1


sql/item_strfunc.cc:
  Auto merged

   distribution - better use -I../zlib where appropriate (usually we use
   the zlib installed in the system)

into rurik.mysql.com:/home/igor/mysql-4.1

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/sql_yacc.yy:
  Auto merged

  Removed non-generic info (key used blocks)
preload.result, preload.test, lex.h, sql_yacc.yy:
  Syntax change for preload statement


sql/sql_yacc.yy:
  Syntax change for preload statement
sql/lex.h:
  Syntax change for preload statement
mysql-test/t/preload.test:
  Removed non-generic info (key used blocks)
mysql-test/r/preload.result:
  Removed non-generic info (key used blocks)

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

libmysql/Makefile.am:
   - added client_settings.h to distribution

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

into rurik.mysql.com:/home/igor/mysql-4.1

BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE

into rurik.mysql.com:/home/igor/mysql-4.1

Makefile.am:
   - added sql-common directory to distribution
configure.in:
   - minor fixes
   - added sql-common/Makefile to AC_OUTPUT
include/Makefile.am:
   - added sql_common.h to distribution

into mysql.com:/space/my/mysql-4.1

  More edits to INSTALL-WIN-SOURCE.


INSTALL-WIN-SOURCE:
  More edits to INSTALL-WIN-SOURCE.

BitKeeper/etc/logging_ok:
  auto-union
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

enforce REAL_EMAIL


BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Delete: BitKeeper/triggers/post-incoming
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Delete: BitKeeper/triggers/post-outgoing
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

into mysql.com:/space/my/mysql-4.1