unknown e9c64ae296 Merge mysql.com:/home/jimw/my/mysql-4.1-clean ...

into  mysql.com:/home/jimw/my/mysql-5.0-clean


extra/perror.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/des_key_file.cc:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/t/select.test:
  Resolve conflicts
scripts/mysqld_safe.sh:
  Resolve conflict
sql/item.cc:
  Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
  can be longer in 5.0 than 4.1.
sql/log_event.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
  Resolve conflict

2005-07-19 11:05:49 -07:00

..

.cvsignore

Import changeset

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

fill_func_tables.sh

Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if

2005-03-22 21:52:01 +01:00

fill_help_tables.sh

- added copyright header on top of the fill_help_tables.sql file (BUG#5772)

2005-02-09 17:40:10 +01:00

fill_help_tables.sql

More changes to reflect the removal of manual.texi from the sources:

2005-04-13 18:29:23 +02:00

make_binary_distribution.sh

- reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1

2005-07-08 21:04:54 +02:00

make_sharedlib_distribution.sh

- match shared library file name suffixes on Mac OS X (.dylib)

2004-07-23 12:44:09 +02:00

make_win_binary_distribution.sh

mysql-test-run.pl:

2005-03-09 01:34:22 +01:00

make_win_src_distribution.sh

Merge with 4.1

2005-07-03 14:17:52 +03:00

Makefile.am

- manual merge of mysql.spec.sh

2005-06-07 11:40:56 +02:00

msql2mysql.sh

Import changeset

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

mysql_config.sh

If mysql_config is a symlink, resolve it before trying to find the lib and

2005-06-24 17:59:19 -07:00

mysql_convert_table_format.sh

- fixed typo in scripts/mysql_convert_table_format.sh

2002-10-18 19:43:06 +02:00

mysql_create_system_tables.sh

Fixed BUG#11365: Stored Procedure: Crash on Procedure operation

2005-07-08 16:33:15 +02:00

mysql_explain_log.sh

- applied patch to mysql_explain_log.sh provided by Dennis Haney

2003-06-11 13:40:20 +02:00

mysql_find_rows.sh

Fix skipp -> skip once and for all.

2004-06-03 11:52:54 -05:00

mysql_fix_extensions.sh

mysql_fix_extensions.sh tool copied from 4.0 tree (referenced in manual).

2002-05-16 10:13:42 +10:00

mysql_fix_privilege_tables.sh

Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if

2005-03-22 21:52:01 +01:00

mysql_fix_privilege_tables.sql

Fixed BUG#11365: Stored Procedure: Crash on Procedure operation

2005-07-08 16:33:15 +02:00

mysql_install_db.sh

Manual merge of fix for bug #9913 into 5.0 tree.

2005-05-09 16:21:57 +04:00

mysql_prepare_privilege_tables_for_5.sql

a script that fixes anti-GRANT'ness of privilege tables.

2003-11-25 16:08:55 +01:00

mysql_secure_installation.sh

added to mysql_secure_installation

2003-10-24 15:20:46 -04:00

mysql_setpermission.sh

- Applied patch provided by Martin Mokrejs <mmokrejs@natur.cuni.cz>

2003-04-25 21:58:25 +02:00

mysql_tableinfo.sh

Informing of deprecation of mysql_tableinfo by INFORMATION_SCHEMA (and

2005-04-24 22:37:43 +02:00

mysql_zap.sh

Minor tweaks to help message of obscure script.

2004-04-04 18:48:41 -05:00

mysqlaccess.conf

configure fixes

2000-09-14 15:10:06 +03:00

mysqlaccess.sh

Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0

2005-01-13 11:12:00 +01:00

mysqlbug.sh

merge with 3.23

2004-03-25 22:05:09 +02:00

mysqld_multi.sh

Added a check for config-file.

2005-04-26 17:57:14 +03:00

mysqld_safe-watch.sh

Changed safe_mysqld -> mysqld_safe

2001-06-28 10:49:16 +03:00

mysqld_safe.sh

Merge mysql.com:/home/jimw/my/mysql-4.1-clean

2005-07-19 11:05:49 -07:00

mysqldumpslow.sh

mysqldumpslow.sh:

2005-03-09 15:00:40 +01:00

mysqlhotcopy.sh

BUG#7967 Fix mysqlhotcopy --record-log-position

2005-06-06 22:17:16 -04:00