mariadb/scripts
unknown 2e5a6f9eaa Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
Docs/Makefile.am:
  Auto merged
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_handler.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Manual merge with import of upstream yaSSL
2006-12-04 19:28:38 +01:00
..
.cvsignore
fill_func_tables.sh Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1 2006-08-09 22:23:41 -04:00
fill_help_tables.sh
fill_help_tables.sql
make_binary_distribution.sh Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 2006-11-14 14:48:29 +01:00
make_sharedlib_distribution.sh
make_win_bin_dist make_win_bin_dist: 2006-10-21 00:57:08 +02:00
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 included make_win_bin_dist (required for pushbuild) into distribution (make dist) 2006-09-01 16:55:35 +02:00
msql2mysql.sh
mysql_config.sh Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 2006-09-25 01:32:55 +02:00
mysql_convert_table_format.sh
mysql_create_system_tables.sh
mysql_explain_log.sh Bug : 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 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my41-bug17700 2006-11-15 09:55:24 -05:00
mysql_fix_privilege_tables.sql Bug#20589 Missing some table level privileges after upgrade 2006-11-29 12:04:29 +01:00
mysql_install_db.sh mysql_install_db.sh: 2006-12-02 23:16:47 +01:00
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
mysqld_safe.sh
mysqldumpslow.sh
mysqlhotcopy.sh Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 2006-10-03 09:05:34 +02:00