unknown 33f82b1789 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 ... into mysql.com:/home/gluh/MySQL/Merge/5.0-opt client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/mysql_com.h: Auto merged libmysql/CMakeLists.txt: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/delayed.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/t/merge.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/variables.test: Auto merged sql/field.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_class.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/func_misc.result: manual merge mysql-test/r/innodb_mysql.result: manual merge mysql-test/t/func_misc.test: manual merge mysql-test/t/innodb_mysql.test: manual merge sql/sql_insert.cc: manual merge		2007-12-13 14:52:49 +04:00
..
.cvsignore
CMakeLists.txt	CMakeLists.txt, README, configure.js	2007-08-03 21:51:37 +02:00
comp_sql.c
fill_help_tables.sql
make_binary_distribution.sh	Generate "config.h" directly into the "include" directory, later copied	2007-07-30 21:09:45 +02:00
make_sharedlib_distribution.sh
make_win_bin_dist	Fixed build failures on Windows introduced by the patch for bug #32221.	2007-11-22 17:13:12 +03:00
make_win_src_distribution_old.sh	make_win_src_distribution_old.sh:	2007-08-14 00:03:05 +02:00
Makefile.am	Merge trift2.:/MySQL/M50/bug31644-5.0	2007-10-19 19:19:15 +02:00
msql2mysql.sh
mysql_config.sh	Merge ramayana.hindu.god:/home/tsmith/m/bk/50	2007-09-28 10:54:49 -06:00
mysql_convert_table_format.sh
mysql_explain_log.sh
mysql_find_rows.sh
mysql_fix_extensions.sh
mysql_fix_privilege_tables.sh	Bug #15327: configure: --with-tcp-port option being partially ignored	2007-09-13 16:19:46 +02:00
mysql_install_db.sh	Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release	2007-12-10 12:02:02 +01:00
mysql_prepare_privilege_tables_for_5.sql
mysql_secure_installation.sh
mysql_setpermission.sh	Option 6 tries to grant global privileges at the database level	2007-08-01 11:58:25 +02:00
mysql_system_tables.sql
mysql_system_tables_data.sql	Bug #32219: too many hosts in default grant tables 6.0.3	2007-11-30 06:14:43 +01:00
mysql_system_tables_fix.sql	Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZERO_DATE	2007-05-19 18:15:08 +02:00
mysql_tableinfo.sh
mysql_test_data_timezone.sql
mysql_upgrade_shell.sh
mysql_zap.sh
mysqlaccess.conf
mysqlaccess.sh
mysqlbug.sh	Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original	2007-10-18 12:03:30 +02:00
mysqld_multi.sh
mysqld_safe-watch.sh	Bug #15327: configure: --with-tcp-port option being partially ignored	2007-09-13 16:19:46 +02:00
mysqld_safe.sh	Change URLs.	2007-10-05 13:16:54 -04:00
mysqldumpslow.sh
mysqlhotcopy.sh	Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003	2007-08-20 11:00:51 -06:00