unknown 12a215b083 Merge with global tree ...

BitKeeper/etc/logging_ok:
  auto-union
client/mysqltest.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
libmysql/errmsg.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/derived.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged

2004-12-31 00:50:30 +02:00

..

.cvsignore

Import changeset

2000-07-31 21:29:14 +02:00

acinclude.m4

Import changeset

2000-07-31 21:29:14 +02:00

client_settings.h

merge with 4.1

2004-10-29 19:26:52 +03:00

conf_to_src.c

manually merged

2004-08-18 19:57:55 +02:00

dll.c

manually merged

2004-08-18 19:57:55 +02:00

errmsg.c

Merge with global tree

2004-12-31 00:50:30 +02:00

get_password.c

- rename: EXCEPTIONS->EXCEPTIONS-CLIENT

2004-08-05 17:05:11 +02:00

libmysql.c

Merge with global tree

2004-12-31 00:50:30 +02:00

libmysql.def

libmysql.def, libmysql.c:

2004-11-05 09:00:04 +04:00

Makefile.am

WL#1051, more maintanable error messages.

2004-12-13 22:51:54 +02:00

Makefile.shared

Activating the new string->number conversion functions

2004-09-25 17:20:50 +05:00

manager.c

A fix (bug #6057: Data Type Problem in manager.c).

2004-10-18 12:43:52 +05:00