mariadb/scripts
unknown c635d37479 Merge 4.1 -> 5.0.
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_change_master.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/r/rpl_flush_log_loop.result:
  Auto merged
mysql-test/r/rpl_flush_tables.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_m.result:
  Auto merged
mysql-test/r/rpl_loaddata_rule_s.result:
  Auto merged
mysql-test/r/rpl_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_reset_slave.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/rpl_until.result:
  Auto merged
mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/rpl_change_master.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/compile-netware-all:
  Auto merged
netware/BUILD/compile-netware-standard:
  Auto merged
mysql-test/t/rpl_empty_master_crash.test:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
mysql-test/t/rpl_flush_log_loop.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
  Auto merged
mysql-test/t/rpl_loaddata_rule_s.test:
  Auto merged
mysql-test/t/rpl_max_relay_size.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_relayrotate-slave.opt:
  Auto merged
mysql-test/t/rpl_reset_slave.test:
  Auto merged
mysql-test/t/rpl_trunc_binlog.test:
  Auto merged
mysql-test/t/rpl_until.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql-common/client.c:
  Auto merged
tests/client_test.c:
  Auto merged
2004-04-07 19:07:44 +02: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 made more fine error message in scripts/fill_help_tables.sh 2003-10-19 16:57:17 -04:00
make_binary_distribution.sh Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02: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 Major work on Windows build automation-- add binary packaging, suffixes 2004-02-19 19:04:47 -01:00
make_win_src_distribution.sh Portability fixes for Windows 2003-12-08 12:25:37 +02: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 Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +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 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 Added test to show bug in current union implementation 2004-03-19 18:33:38 +02:00
mysql_fix_privilege_tables.sql Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
mysql_install_db.sh Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02: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 Fixed a problem with mysqld_multi log file. The default is now datadir/mysqld_multi.log, 2004-04-06 17:57:32 +03:00
mysqld_safe-watch.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysqld_safe.sh - fixed early removing of socket file when multiple instances of mysqld are 2004-01-15 16:14:30 +01:00
mysqldumpslow.sh Fixed myslqdumpslow for new log format. 2002-03-26 11:54:05 +02:00
mysqlhotcopy.sh Added option chroot to mysqlhotcopy. 2004-03-04 18:30:28 +00:00