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

  Forgot to include the portable changes from previous commit


tests/client_test.c:
  Forgot to include the portable changes from previous commit

  new file

'C' Test case for all prototype changes - Assert based which covers all most all scenarios

  One more missed fix from Windows


sql/sql_list.h:
  One more missed fix from Windows

  Missed change from previous resolve


sql/mysql_priv.h:
  Missed change from previous resolve

  new file

  Client-server protocol 4.1 changes - Server side:

 * Enhanced metadata information:
    - SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
    - SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
    - SHOW TABLE TYPES
    - SHOW PRIVILEGES
    - SHOW COLUMN TYPES (Not fully implemented)

 * Prepared execution
 * Long data handling in pieces
 * And other misc changes

  - Support of prepared execution
  - Support of Original Table and Column names
  - Support of direct transactional API
  - And lot of misc handling

  (Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit)
  


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

  fix: use my_free() instead of free()


mysys/test_charset.c:
  fix: use my_free() instead of free()

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

BitKeeper/deleted/.del-sql_select.cc.rej~b567fd439ef37cc8:
  Delete: sql/sql_select.cc.rej

  Fix for typos in system_charset_info


strings/strto.c:
  Fix for typos in system_charset_info

  Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32


BitKeeper/deleted/.del-makefile2.w32:
  Rename: BitKeeper/deleted/.del-makefile.w32 -> BitKeeper/deleted/.del-makefile2.w32

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


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

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

mysql-test/r/alter_table.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/create.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/fulltext.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/innodb.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/merge.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/select.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/show_check.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/symlink.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/type_blob.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
mysql-test/r/type_ranges.result:
  Fix test result according to new SHOW CREATE TABLE and SHOW FIELDS
sql/field.cc:
  New format for string fields in SHOW CREATE TABLE and SHOW FIELDS
sql/mysql_priv.h:
  pass charset
sql/sql_parse.cc:
  QQ is now fixed :)
sql/sql_yacc.yy:
  New format for string fields in SHOW CREATE TABLE and SHOW FIELDS

sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

  changed version number

heap/hp_write.c:
  Auto merged
include/my_tree.h:
  Auto merged
mysys/charset.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

Portability fixes


include/my_tree.h:
  Add missing include file.
mysql-test/r/select.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_blob.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_float.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/r/type_ranges.result:
  Update results for new SHOW FULL COLUMNS
mysql-test/t/heap_btree.test:
  Update results for new SHOW FULL COLUMNS

BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  merge with 4.0

Fixes after last merge from 4.0.
(Code not yet complete, need anoter merge from 4.0)


heap/hp_write.c:
  cleanup
myisam/ft_boolean_search.c:
  Fixed tree handling to new format
mysql-test/r/alter_table.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/func_math.result:
  Updated results
mysql-test/r/heap_btree.result:
  Portability fix
mysql-test/r/isam.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/r/show_check.result:
  SHOW FULL COLUMN FROM TABLE now returns comment
mysql-test/t/heap_btree.test:
  Portability fix
mysql-test/t/show_check.test:
  SHOW FULL COLUMN FROM TABLE now returns comment
sql/field.cc:
  Fix for comment handling
sql/field.h:
  Added CHARSET_INFO to field structure
sql/item_cmpfunc.cc:
  Fixed like to use system charset (need to be updated)
sql/item_func.cc:
  Update to new charset handling
sql/mysql_priv.h:
  cleanup
sql/sql_base.cc:
  Added charset to HA_CREATE_INFO
sql/sql_delete.cc:
  Added charset to HA_CREATE_INFO
sql/sql_parse.cc:
  Added charset to HA_CREATE_INFO
sql/sql_select.cc:
  cleanup
sql/sql_show.cc:
  charset change
sql/sql_string.h:
  cleanup
sql/sql_table.cc:
  cleanup
sql/sql_yacc.yy:
  Go back to old code for ALTER table ... MODIFY
sql/table.cc:
  fixed comment handling
sql/unireg.cc:
  new field format

Docs/manual.texi:
  Auto merged
sql/sql_parse.cc:
  Auto merged

Added syntax for column comments (for compability with 4.1)
Fix of ALTER TABLE RENAME


Docs/manual.texi:
  Changelog
client/mysqltest.c:
  Enable LOAD DATA LOCAL INFILE
mysql-test/r/alter_table.result:
  Test of syntax for column comments
mysql-test/r/func_math.result:
  Fixed test of new truncate
mysql-test/t/alter_table.test:
  Test of syntax for column comments
mysys/my_gethostbyname.c:
  Portability fix
sql/hostname.cc:
  Fixed pointer bug
sql/item_cmpfunc.cc:
  Optimizing LIKE code
sql/item_cmpfunc.h:
  Cleanup
sql/mysqld.cc:
  Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_analyse.cc:
  Removed warning from DBUG
sql/sql_parse.cc:
  Avoid warning of duplicate calls to mysql_thread_init()
sql/sql_table.cc:
  Fix of ALTER TABLE RENAME
sql/sql_yacc.yy:
  Added syntax for field comments
vio/test-sslserver.c:
  Cleanup

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

user has table privilege and global FILE privilege