unknown a8e5dcb449 Resolve merge colflict ...

mysql-test/r/create.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
include/mysqld_error.h:
  Resolve merge colflict by changing the warning codes

2003-05-21 00:12:09 -07:00

..

.cvsignore

Import changeset

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

fill_func_tables.sh

fix a bug in derived tables

2003-02-13 17:56:01 +02:00

fill_help_tables.sh

Fixes for fill_help_tables.sql

2003-03-21 18:53:55 +02:00

make_binary_distribution.sh

Merge with 4.0

2003-04-03 21:19:12 +03:00

make_win_src_distribution.sh

Resolve merge colflict

2003-05-21 00:12:09 -07:00

Makefile.am

Fixes for fill_help_tables.sql

2003-03-21 18:53:55 +02:00

msql2mysql.sh

Import changeset

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

mysql_config.sh

Fix

2002-08-14 13:05:38 +05:00

mysql_convert_table_format.sh

- fixed typo in scripts/mysql_convert_table_format.sh

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

mysql_explain_log.sh

fixed so that --ssl and --skip-ssl works with the MySQL clients.

2002-09-17 23:46:53 +03:00

mysql_find_rows.sh

configure fixes

2000-09-14 15:10:06 +03: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

Merge with 4.0.9

2003-01-18 03:13:37 +02:00

mysql_install_db.sh

Fixes for fill_help_tables.sql

2003-03-21 18:53:55 +02:00

mysql_secure_installation.sh

Oops, missed the actual file.

2002-06-08 23:12:39 -05:00

mysql_setpermission.sh

configure fixes

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

mysql_tableinfo.sh

Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify

2003-03-14 16:07:15 +01:00

mysql_zap.sh

Give better error from reconnect()

2002-08-24 05:44:16 +03:00

mysqlaccess.conf

configure fixes

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

mysqlaccess.sh

- Yves mail address does not seem to be valid anymore - changed mail

2003-02-05 11:49:51 +01:00

mysqlbug.sh

Changed thd variables max_join_size and select_limit to type ha_rows.

2002-12-20 14:58:27 +02:00

mysqld_multi.sh

Fixed a problem with reading some innodb options that may contain semicolin.

2002-11-12 11:39:52 +02:00

mysqld_safe-watch.sh

Changed safe_mysqld -> mysqld_safe

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

mysqld_safe.sh

merged

2003-03-13 13:44:03 +01:00

mysqldumpslow.sh

Fixed myslqdumpslow for new log format.

2002-03-26 11:54:05 +02:00

mysqlhotcopy.sh

Applied a patch which fixes a quoting problem with

2003-02-24 16:57:54 +02:00