summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqlaccess.sh6
-rw-r--r--scripts/safe_mysqld.sh2
2 files changed, 6 insertions, 2 deletions
diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index dfc88ecad98..355eb53d2b5 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -8,7 +8,7 @@ use Fcntl;
BEGIN {
# ****************************
# static information...
- $VERSION = "2.05, 17 Feb 2000";
+ $VERSION = "2.06, 20 Dec 2000";
$0 =~ m%/([^/]+)$%o;
$script = $1;
$script = 'MySQLAccess' unless $script;
@@ -302,6 +302,8 @@ Release Notes:
2.05: (2000-02-17) Monty
Moved the log file from /tmp to ~
+ 2.06: Don't print '+++USING FULL WHERE CLAUSE+++'
+
_RELEASE
$TODO = <<_TODO;
@@ -1468,7 +1470,7 @@ sub Sort_table {
# server version 3.21 has a full where clause :-)
if ($MySQLaccess::Host::SERVER >= '3.21') {
-print "+++USING FULL WHERE CLAUSE+++\n";
+ # print "+++USING FULL WHERE CLAUSE+++\n";
$start = "SELECT *,UCASE(host) as ucase_host FROM $tbl WHERE ";
$end = ' ORDER BY ' . join(',', @order) . ";\n";
}
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index f1efcb292e7..9325cee4f33 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -46,7 +46,9 @@ parse_arguments() {
# safe_mysqld-specific options - must be set in my.cnf ([safe_mysqld])!
--ledir=*) ledir=`echo "$arg" | sed -e "s;--ledir=;;"` ;;
--err-log=*) err_log=`echo "$arg" | sed -e "s;--err-log=;;"` ;;
+ # QQ The --open-files should be removed
--open-files=*) open_files=`echo "$arg" | sed -e "s;--open-files=;;"` ;;
+ --open-files-limit=*) open_files=`echo "$arg" | sed -e "s;--open-files-limit=;;"` ;;
--core-file-size=*) core_file_size=`echo "$arg" | sed -e "s;--core_file_size=;;"` ;;
--timezone=*) TZ=`echo "$arg" | sed -e "s;--timezone=;;"` ; export TZ; ;;
*)