into deer.(none):/home/hf/work/mysql-4.1.2way


BitKeeper/etc/logging_ok:
  auto-union

client code added to the embedded library
some fixes


include/mysql.h:
  test code removed
  simple_command is the macrodefinition now
libmysqld/embedded_priv.h:
  this declaration obsolete
libmysqld/lib_sql.cc:
  errors stored in the same place for embedded and client libraries now
sql-common/client.c:
  we don't need that ugly wrapper

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 deer.(none):/home/hf/work/mysql-4.1.2way

including client code into embedded server
code to guess what library to use added
net_field_length moved to pack.c


include/mysql.h:
  typedefinitions moved for suitability
  mysql_option.methods_to_use added
include/mysql_com.h:
  net_store_length declaration
libmysql/libmysql.c:
  net_store_length moved to sql-common/pack.c
libmysqld/libmysqld.c:
  added code to guess whether to use remote or embedded connection
sql-common/client.c:
  options checking added
sql-common/pack.c:
  net_store_length implementation moved here
sql/protocol.cc:
  net_store_length moved to sql-common/pack.c

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

Some intersections with Monty encountered


libmysql/client_settings.h:
  We don't need the trick with macroses since Monty moved cli_mysql_use_result
  into sql-common/client.c
libmysql/libmysql.c:
  mysql_use_result moved in sql-common/client.c
sql-common/client.c:
  code simplified with the moving of mysql_use_result here
sql/client_settings.h:
  we don't need this #define anymore
sql/sql_client.cc:
  this function was moved to sql-common/pack.c by me
  i think the pack.c is the better place for it

  Initial cleanup edits.


INSTALL-WIN-SOURCE:
  Initial cleanup edits.

scripts/make_win_src_distribution.sh:
  Fix for --dirname and --suffix (missed ones)

Added new HOWTO doc 'INSTALL-WIN-SOURCE' on building 'mysql clients and server' on WINDOWS from BitKeeper as well as from distributed source archive


scripts/make_win_src_distribution.sh:
  Fix for INSTALL-WIN-SOURCE

merged conflicts about my previous commit
it seems there are some errors left - gonna check...


BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
include/sql_common.h:
  Auto merged
include/mysql.h:
  conflicts merged
libmysql/client_settings.h:
  conflicts merged
libmysql/libmysql.c:
  conflicts merged
sql-common/client.c:
  conflicts merged
sql/client_settings.h:
  conflicts merged
sql/protocol.cc:
  conflict merged

client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed

IMHO all the above made library's code way more pleasant to look at, didn't it?


BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220:
  Delete: libmysqld/lib_vio.c
BitKeeper/etc/ignore:
  Added libmysqld/client.c libmysqld/client_settings.h libmysqld/libmysql.c libmysqld/pack.c to the ignore list
client/mysqltest.c:
  we don't need this now
include/mysql.h:
  MYSQL and related structures unified
  four methods made "virtual"
  relative wrappers added
include/mysql_com.h:
  todo added
include/mysql_embed.h:
  now we include implementations of Vio structure in libmysqld
include/sql_common.h:
  declarations changed
include/violite.h:
  implementation of Vio included in libmysqld
libmysql/client_settings.h:
  changes to make this working with both client and embedded
libmysql/libmysql.c:
  global variables and my_net_local_init moved to sql-common/pack.c
libmysqld/Makefile.am:
  libmysql.c, client.c, pack.c symlinked and added to sources
  lib_vio.c removed
libmysqld/examples/Makefile.am:
  now we need CLIENT_LIBS here
libmysqld/lib_sql.cc:
  code duplications removed
  emb_advanced_command was made from simple_command
libmysqld/libmysqld.c:
  duplicated code removed
sql-common/client.c:
  code trimmed with new model of calling
sql-common/pack.c:
  some code moved here from libmysql.c and protocol.cc
sql/client_settings.h:
  we don't need mysql_use_result for mini_client
sql/net_serv.cc:
  file included in embedded server
sql/protocol.cc:
  code moved to sql-common/pack.c

   consistent with the other column names in the table.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_yacc.yy:
  Auto merged

mysql-test/r/fulltext.result:
  test for CREATE FULLTEXT INDEX
mysql-test/t/fulltext.test:
  test for CREATE FULLTEXT INDEX

sql-common/client.c:
  Auto merged
scripts/mysql_install_db.sh:
  Use local version

Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables


libmysql/client_settings.h:
  semicolon added
sql-common/client.c:
  we don't need semicolons after init_sigpipe_variables

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

Removed compiler warnings


scripts/make_win_src_distribution.sh:
  Added option --dirname
  Also copy sql-common directory
  Create mysql data files even if mysqld is not installed
scripts/mysql_create_system_tables.sh:
  Update for usage with make_win_src_distribution
scripts/mysql_install_db.sh:
  Update for usage with make_win_src_distribution
sql-common/client.c:
  Portability fix
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_acl.cc:
  Indentation cleanup
  Removed compiler warning
sql/sql_parse.cc:
  Removed compiler warning
sql/sql_select.cc:
  Removed compiler warning
sql/sql_yacc.yy:
  Removed compiler warning
strings/ctype-utf8.c:
  Removed compiler warning

mysql-test/r/auto_increment.result:
  Update results after bug fix

scripts/mysql_install_db.sh:
  fixed bug with './' prefix