into mysql.com:/home/jonas/src/gcc34

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged

  Minor comment tweaks.


sql/item_geofunc.cc:
  Minor comment tweaks.

  armscii8_bin was referenced to as armscii_bin.


configure.in:
  armscii8_bin was referenced to as armscii_bin.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into here.mwagner.org:/Volumes/BK/mysql-4.1

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged

into zero.local.lan:/GORDON/MySQL/mysql-4.1/src

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

mysql-test/r/rpl_delete_all.result:
  Portability fix
mysql-test/t/rpl_delete_all.test:
  Portability fix
netware/BUILD/compile-netware-standard:
  Patch from novell

 - bumped up version number in configure.in: 4.1.3-beta -> 4.1.4-beta


configure.in:
   - bumped up version number: 4.1.3-beta -> 4.1.4-beta

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into here.mwagner.org:/Volumes/BK/mysql-4.1-work

  Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.


Build-tools/mysql-copyright:
  Fix for the condition when "the_fat" doesn't end with 'dnl\n', but ')\n'.

  Symbol spelling change.
errmsg.c:
  Client error message edits.
errmsg.h:
  Two symbol spelling changes.


include/errmsg.h:
  Two symbol spelling changes.
libmysql/errmsg.c:
  Client error message edits.
libmysql/libmysql.c:
  Symbol spelling change.
sql-common/client.c:
  Symbol spelling change.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

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

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

  wrong parameter)

  mbminlen was wrong for UTF8.


strings/ctype-uca.c:
  mbminlen was wrong for UTF8.

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

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

netware/init_db.sql:
  Add time_zone tables
netware/mysql_test_run.c:
  Portability fix (log -> log_msg)

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


mysql-test/r/bdb.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
sql/handler.h:
  Auto merged

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged

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

scripts/mysql_fix_privilege_tables.sh:
  Message touchup.
scripts/mysql_fix_privilege_tables.sql:
  Comment touchup.

into mysql.com:/home/mysql_src/mysql-4.1-874


scripts/mysql_fix_privilege_tables.sh:
  Auto merged

Pass password if it is NOT empty. Typo fixed.


scripts/mysql_fix_privilege_tables.sh:
  Pass password if it is NOT empty. Typo fixed.

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

Moved include <assert.h> to my_global.h


VC++Files/client/mysqlclient.dsp:
  Added missing my_time.c file to mysqlclient project
include/my_dbug.h:
  Moved include <assert.h> to my_global.h
  Removed NDEBUG as asserts should be indenpendent of if we are using DBUG or not
include/my_global.h:
  Added assert.h as this is included in a lot of places
sql/sql_table.cc:
  Initialize forgotten variable