mariadb/scripts
unknown 0825bad93a Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
client/mysqltest.c:
  Manual merge
2006-08-02 16:46:55 +04:00
..
.cvsignore
fill_func_tables.sh
fill_help_tables.sh
fill_help_tables.sql
make_binary_distribution.sh Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-07-29 13:43:34 +04:00
make_sharedlib_distribution.sh
make_win_src_distribution.sh Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql 2006-08-02 16:46:55 +04:00
Makefile.am
msql2mysql.sh
mysql_config.sh
mysql_convert_table_format.sh
mysql_create_system_tables.sh
mysql_explain_log.sh Bug #19779: mysql_explain_log documentation is outdated. 2006-07-13 10:48:34 -04:00
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh
mysql_fix_privilege_tables.sql
mysql_install_db.sh
mysql_prepare_privilege_tables_for_5.sql
mysql_secure_installation.sh
mysql_setpermission.sh
mysql_tableinfo.sh
mysql_upgrade_shell.sh
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh
mysqld_multi.sh
mysqld_safe-watch.sh Bug#19298 mysqld_safe still uses obsolete --skip-locking parameter 2006-06-27 18:07:23 -04:00
mysqld_safe.sh
mysqldumpslow.sh
mysqlhotcopy.sh