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

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

  Update mirror list


Docs/mirrors.texi:
  Update mirror list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-pentium-debug:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/mysql_install.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysqld_error.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/ft_dump.c:
  Auto merged
myisam/ft_test1.c:
  Auto merged
myisam/ftdefs.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysys/charset.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/hash.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
strings/Makefile.am:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
tools/mysqlmanager.c:
  Auto merged

mysys/my_getopt.c:
  Fixed two bugs in my_getopt:
  
  - argc was decremented twice when type was GET_BOOL and short
    option was used. This caused all GET_BOOL -type short-options
    to malfunction.
  
  - Fixed a bug in argv handling. Any program that used argv directly
    without checking argc first, tried to use (already handled) options
    as non-option arguments, after all true non-option arguments were
    handled. At least mysqldump was affected by this bug.

include/m_ctype.h:
  cleanup
include/mysqld_error.h:
  New error messages
sql/field.cc:
  Extension of .frm file
sql/field.h:
  Extension of .frm file
sql/handler.h:
  cleanup
  Added CHARSET_INFO to ha_create_information
sql/item_strfunc.cc:
  cleanup
sql/lex.h:
  Update for FOREIGN KEYS
sql/mysql_priv.h:
  Extension of .frm file
sql/slave.cc:
  Fixed bug in wait_for_relay_log_space()
sql/spatial.h:
  Cleanup
sql/sql_class.h:
  Cleanup
sql/sql_lex.h:
  Extension of .frm file
sql/sql_parse.cc:
  Extension of .frm file
sql/sql_show.cc:
  Extension of .frm file
sql/sql_table.cc:
  Extension of .frm file
sql/sql_yacc.yy:
  Extension of .frm file
sql/table.cc:
  Extension of .frm file
sql/unireg.cc:
  Extension of .frm file

BitKeeper/deleted/.del-rpl_empty_master_crash.result:
  Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
  Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
  Auto merged
include/my_net.h:
  Auto merged
include/my_pthread.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysys/my_gethostbyname.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged

Charset convertion FROM dynamic charset is now working too
Allow dynamic charsets in CONVERT()


mysys/charset.c:
  Charset convertion FROM dynamic charset is now working too
sql/item_strfunc.cc:
  Allow dynamic charsets in CONVERT()
sql/share/charsets/cp1251.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/cp1257.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/dec8.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/greek.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/hebrew.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/hp8.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/swe7.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/usa7.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/win1250.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/win1251.conf:
  Change 003F -> 0000 for undefinite characters
sql/share/charsets/win1251ukr.conf:
  Change 003F -> 0000 for undefinite characters

client/mysqltest.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged

Added checking of sem_init() in configure.


client/mysqltest.c:
  Cleanup
configure.in:
  Added checking of sem_init
sql/hostname.cc:
  Portability fix
sql/slave.cc:
  Fixed bug in wait_for_relay_log_space()

LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX


mysql-test/r/subselect.result:
  new subselect tests
mysql-test/t/subselect.test:
  new subselect tests
sql/item.cc:
  marking as depended _ALL_ subselects under select from wich depend
sql/item_subselect.cc:
  limit fixed
  TODO added
sql/sql_class.cc:
  AVG & STD function with subselects fixed
sql/sql_lex.h:
  sort_default removed
sql/sql_parse.cc:
  limit fixed
sql/sql_select.cc:
  fixed to be subselect compatible
sql/sql_yacc.yy:
  sort_default removed

into nick.leippe.com:/home/nick/mysql/mysql

added respective test case


sql/slave.cc:
  fixed load table from master hang when host is empty

All charset.conf files were extended to supply unicode mapping array
CONVERT() now uses more common order of arguments: CONVERT(expr,charset_from,charset_to)
Dynamic charset can be used as CONVERT() argument


mysys/charset.c:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/armscii8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/cp1251.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/cp1257.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/croat.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/danish.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/dec8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/dos.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/estonia.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/german1.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/greek.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hebrew.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hp8.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/hungarian.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/koi8_ru.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/koi8_ukr.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin1.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin2.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/latin5.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/swe7.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/usa7.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1250.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1251.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/share/charsets/win1251ukr.conf:
  Added filling of unicode mapping arrays during charset.conf loading
sql/sql_yacc.yy:
  Changed the order of arguments to Convert(expr,charset_from,charset_to)
  Dynamic charsets are now resolved too for Convert() arguments

mysys/my_getopt.c:
  Fixed two bugs in my_getopt:
  - Didn't exit with error if a short option was not recognized. Fixed.
  - If unrecognized short option was not the first one in the list,
    printed "unknown option" error for wrong option. Fixed.

client/mysql.cc:
  Fixed a bug in option -N

Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name


Docs/manual.texi:
  Update of TRUNCATE() information
configure.in:
  Fix for HPUX
extra/resolveip.c:
  Fix for SCO
include/my_net.h:
  Fix for HPUX
libmysql/libmysql.c:
  Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
  Test of new TRUNCATE handling
mysql-test/t/func_math.test:
  Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
  Portability fix
sql/item_func.cc:
  Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
  Fix NULL handling for DESCRIBE table_name

This fix should be merged into 4.0 and 4.1

client/mysql.cc:
  Fixed a bug that caused segmentation fault in internal 'tee' command.

support-files/my-huge.cnf.sh:
  added more complete sample master and slave configuration

Now it properly returns error.
Added respective test case.


sql/repl_failsafe.cc:
  fixed bug: load table from master w/ empty master would hang.
  Now it properly returns error.

  change mirror


Docs/mirrors.texi:
  change mirror

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

sql/slave.h:
  Fixed a bug in option handling.
sql/sql_repl.h:
  Fixed a bug in option handling.