mariadb/scripts
unknown d988576610 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/limit.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/system_mysql_db_fix30020.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  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/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
extra/yassl/taocrypt/include/algebra.hpp:
  Remove fix as it conflicts with "import from yassl" and it's been
  fixed there
sql/ha_ndbcluster.cc:
  Merge fix of warnings
sql/sql_base.cc:
  Merge
2006-11-29 15:44:09 +01:00
..
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
fill_func_tables.sh Merge zim.(none):/home/brian/mysql/dep-5.0 2006-08-14 15:24:29 -07:00
fill_help_tables.sh - added copyright header on top of the fill_help_tables.sql file (BUG#5772) 2005-02-09 17:40:10 +01:00
fill_help_tables.sql More changes to reflect the removal of manual.texi from the sources: 2005-04-13 18:29:23 +02:00
make_binary_distribution.sh Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 2006-11-14 14:49:45 +01:00
make_sharedlib_distribution.sh make_sharedlib_distribution.sh: 2006-06-26 23:44:17 +02:00
make_win_bin_dist make_win_bin_dist: 2006-10-21 00:57:08 +02: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 Import changeset 2000-07-31 21:29:14 +02:00
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 This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
mysql_create_system_tables.sh Added --debug-info to most clients to detect memory leaks in mysql-test-run 2006-11-21 22:32:58 +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 zippy.cornsilk.net:/home/cmiller/work/mysql/bug17700/my50-bug17700 2006-11-15 09:56:01 -05:00
mysql_fix_privilege_tables.sql Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 2006-11-29 15:44:09 +01:00
mysql_install_db.sh Merge zim.(none):/home/brian/mysql/dep-5.1 2006-08-14 21:26:33 -07: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_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 Manual merge of the fix for bug#16106. 2006-01-16 16:48:05 +01:00
mysqld_safe.sh Merge rama.(none):/home/jimw/my/tmp_merge 2006-07-28 15:51:48 -07:00
mysqldumpslow.sh mysqldumpslow.sh: 2005-03-09 15:00:40 +01:00
mysqlhotcopy.sh Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 2006-10-03 09:05:34 +02:00