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

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

configure.in:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged

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

scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--

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

mysql-test/r/lowercase_table2.result:
  results updated

(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)

mysql-test/r/func_group.result:
  fixed
mysql-test/r/ps.result:
  SHOW TABLE STATUS test
mysql-test/t/ps.test:
  SHOW TABLE STATUS test
sql/sql_parse.cc:
  Use lex->describe instead of lex->select_lex.options
sql/sql_yacc.yy:
  removed unneed initialization of lex->select_lex.options

mysql-test/r/ps.result:
  eq() for parameters test
mysql-test/t/ps.test:
  eq() for parameters test
sql/item.h:
  correct eq() method for Item_param

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

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

mysql-test/r/flush_table.result:
  after merge fixed
  duplicated tests removed
mysql-test/t/flush_table.test:
  after merge fixed
  duplicated tests removed
sql/sql_yacc.yy:
  alias is not db-qualified

BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql.cc
scripts/make_win_src_distribution.sh:
  Don't copy InstallShield files if we are in a normal bk tree
scripts/mysql_create_system_tables.sh:
  Remove duplicate entry

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

  4.1 tree must use installshield project files due to new tables


scripts/make_win_src_distribution.sh:
  4.1 tree must use installshield project files due to new tables

  fix to user table during make_win_src_distribution


scripts/mysql_create_system_tables.sh:
  fix to user table during make_win_src_distribution

include/my_global.h:
  Fix for libmysql compilation failure on high-byte-first systems:
  - add typecasting to char * in shortstore, longstore, doublestore macros
libmysql/libmysql.c:
  - suppress possible warnings

sql/sql_select.cc:
  Auto merged

sql/opt_range.cc:
  incorrect fix removed. range optimizer is made slightly more stable vs. compiler optimizations

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

called without NDB enabled.

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


sql/mysql_priv.h:
  Auto merged

include/mysql.h:
  Cleanup
sql-common/client.c:
  Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
  Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
  Fixed typo during merge
sql/sql_insert.cc:
  Fixed indentation

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