mariadb/scripts
unknown 4f1cbb6031 4.1 -> 5.0 merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/derived.result:
  Auto merged
mysql-test/r/func_str.result:
  Simple merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/derived.test:
  Automatic merge
mysql-test/t/func_str.test:
  Simple merge
mysql-test/t/subselect.test:
  Automatic merge
mysys/my_handler.c:
  Automatic merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  Automatic merge
scripts/make_binary_distribution.sh:
  Automatic merge
scripts/mysql_install_db.sh:
  Automatic merge
sql/examples/ha_archive.cc:
  Simple merge
sql/ha_innodb.cc:
  Automatic merge
sql/item.cc:
  Merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_func.cc:
  Simple merge
sql/item_func.h:
  Automatic merge
sql/item_strfunc.cc:
  Automatic merge
sql/item_strfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Automatic merge
sql/mysqld.cc:
  Automatic merge
sql/set_var.cc:
  Automatic merge
sql/sql_base.cc:
  Automatic merge
sql/sql_class.cc:
  Automatic merge
sql/sql_class.h:
  Automatic merge
sql/sql_lex.cc:
  Automatic merge
sql/sql_lex.h:
  Automatic merge
sql/sql_parse.cc:
  Automatic merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Automatic merge
sql/sql_update.cc:
  Simple merge
strings/ctype-big5.c:
  Automatic merge
strings/ctype-bin.c:
  Automatic merge
strings/ctype-gbk.c:
  Automatic merge
strings/ctype-latin1.c:
  Automatic merge
strings/ctype-mb.c:
  Automatic merge
strings/ctype-simple.c:
  Automatic merge
strings/ctype-sjis.c:
  Automatic merge
strings/ctype-tis620.c:
  Automatic merge
strings/ctype-ucs2.c:
  Automatic merge
strings/ctype-utf8.c:
  Automatic merge
vio/viosocket.c:
  Automatic merge
vio/viossl.c:
  Automatic merge
2005-02-03 13:18:30 +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 fill_help_tables.sh: 2004-12-18 14:22:20 -06:00
make_binary_distribution.sh 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
make_sharedlib_distribution.sh - match shared library file name suffixes on Mac OS X (.dylib) 2004-07-23 12:44:09 +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 make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh: 2005-01-01 21:13:09 +01:00
Makefile.am small Makefile.am cleanup 2005-01-28 17:14:03 +01:00
msql2mysql.sh Import changeset 2000-07-31 21:29:14 +02:00
mysql_config.sh Merge mysql.com:/home/jwinstead2/mysql-4.1-7021 2005-01-06 20:03:06 +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 Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +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 Merge with 4.1 2004-12-22 13:54:39 +02:00
mysql_fix_privilege_tables.sql Create columns_priv with correct column lengths (the alter table 2005-01-07 19:50:41 +01:00
mysql_install_db.sh Merge 2005-01-14 10:40:05 -08: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 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0 2005-01-13 11:12:00 +01:00
mysqlbug.sh merge with 3.23 2004-03-25 22:05:09 +02:00
mysqld_multi.sh Added checking for my.cnf file from environment variable MYSQL_HOME 2005-01-04 20:13:47 +02:00
mysqld_safe-watch.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysqld_safe.sh Merge mysql.com:/home/jwinstead2/mysql-4.1-clean 2005-01-06 21:39:57 +01:00
mysqldumpslow.sh Fixed myslqdumpslow for new log format. 2002-03-26 11:54:05 +02:00
mysqlhotcopy.sh Merge 2004-10-08 15:43:27 +03:00