unknown e2d25910f8 manual merge ...

client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

2004-07-20 15:34:57 +02:00

..

.cvsignore

Import changeset

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

fill_func_tables.sh

Added missing root user to mysql.user on windows. (Bug #4242)

2004-06-25 18:49:36 +03:00

fill_help_tables.sh

- reverted change to fill_help_tables.sh ("Added checking of maximum

2004-04-30 14:31:52 +02:00

make_binary_distribution.sh

Merge with 4.1.3-beta

2004-07-07 11:29:39 +03:00

make_sharedlib_distribution.sh

- added make_sharedlib_distribution.sh to the source distribution

2003-10-08 12:35:24 +02:00

make_win_binary_distribution.sh

Add missing .cnf files to windows installation (Bug #4216)

2004-06-25 18:54:43 +03:00

make_win_src_distribution.sh

Fix to be able to cross-compile for modesto

2004-06-27 18:20:06 +03:00

Makefile.am

merge with 4.0

2004-02-22 09:50:59 +02:00

msql2mysql.sh

Import changeset

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

mysql_config.sh

\| is sed is on-portable

2004-02-20 12:02:34 +01: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

changes in system db creation procedure for view privileges

2004-07-16 12:25:26 +03: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

manual merge

2004-07-20 15:34:57 +02:00

mysql_fix_privilege_tables.sql

mysql_fix_privilege_tables.sql:

2004-07-18 22:16:42 -05:00

mysql_install_db.sh

Added missing root user to mysql.user on windows. (Bug #4242)

2004-06-25 18:49:36 +03: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

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

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

Fix to get correct metadata when using temporary tables to create result. (Bug #2654)

2004-03-30 19:24:28 +03:00

mysqlbug.sh

merge with 3.23

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

mysqld_multi.sh

Merge with 4.0

2004-04-26 15:53:31 +03:00

mysqld_safe-watch.sh

Changed safe_mysqld -> mysqld_safe

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

mysqld_safe.sh

warn about multiple mysqld --user parameters only if their arguments differ

2004-06-10 13:56:58 +02:00

mysqldumpslow.sh

Fixed myslqdumpslow for new log format.

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

mysqlhotcopy.sh

- Avoid the error message "Can't read index header from..."

2004-07-15 21:18:31 +02:00