mariadb/scripts
unknown 2b16d5457b Merging 4.1 into 5.0 (second pass; post-merge fixes).
One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(


mysql-test/r/sp-error.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
2003-07-09 17:07:12 +02:00
..
.cvsignore
fill_func_tables.sh fix a bug in derived tables 2003-02-13 17:56:01 +02:00
fill_help_tables.sh new version of help 2003-05-29 17:47:31 -04:00
make_binary_distribution.sh rlyon-5.0.0-alpha.patch 2003-05-29 14:28:02 -04:00
make_win_src_distribution.sh Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
Makefile.am - make sure that scripts/*.sql files are being added to the source 2003-06-20 13:57:51 +02:00
msql2mysql.sh
mysql_config.sh Fix 2002-08-14 13:05:38 +05: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 Merging 4.1 into 5.0 (second pass; post-merge fixes). 2003-07-09 17:07:12 +02:00
mysql_explain_log.sh fixed so that --ssl and --skip-ssl works with the MySQL clients. 2002-09-17 23:46:53 +03: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 Fixed some new memory leaks 2003-06-24 12:10:35 +03:00
mysql_fix_privilege_tables.sql - changed "password" to "Password" as suggested by Paul DuBois to be 2003-06-16 10:32:49 +02:00
mysql_install_db.sh Fixes for make_win_src_distributions 2003-06-15 23:24:37 +03:00
mysql_secure_installation.sh Oops, missed the actual file. 2002-06-08 23:12:39 -05: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 Give better error from reconnect() 2002-08-24 05:44:16 +03:00
mysqlaccess.conf configure fixes 2000-09-14 15:10:06 +03:00
mysqlaccess.sh - Yves mail address does not seem to be valid anymore - changed mail 2003-02-05 11:49:51 +01:00
mysqlbug.sh Changed thd variables max_join_size and select_limit to type ha_rows. 2002-12-20 14:58:27 +02:00
mysqld_multi.sh Fixed a problem with reading some innodb options that may contain semicolin. 2002-11-12 11:39:52 +02:00
mysqld_safe-watch.sh Changed safe_mysqld -> mysqld_safe 2001-06-28 10:49:16 +03:00
mysqld_safe.sh - added missing dashes to parameter "open-files-limit" in mysqld_safe 2003-04-15 16:11:37 +02:00
mysqldumpslow.sh Fixed myslqdumpslow for new log format. 2002-03-26 11:54:05 +02:00
mysqlhotcopy.sh - applied patch from Tim Bunce (new --addtodest option that adds copied 2003-05-03 16:16:52 +02:00