From 8a8e4be22f0806e2a606659de7b6c9069f4ef2e4 Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Sun, 16 Jun 2002 17:06:12 +0300
Subject: Cleanup of checking of user resources Added missing checking of
 no_keyread

Docs/manual.texi:
  Fixed wrong example
myisam/myisamchk.c:
  Removed not needed include file
mysys/my_pthread.c:
  Fix for HPUX
mysys/my_thr_init.c:
  Removed not needed warning
scripts/mysql_fix_privilege_tables.sh:
  Cleanup
sql/sql_lex.cc:
  Removed not needed initialization
sql/sql_parse.cc:
  Cleanup of checking of user resources
sql/sql_select.cc:
  Added checking of no_keyread
---
 scripts/mysql_fix_privilege_tables.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/mysql_fix_privilege_tables.sh')

diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh
index ead0350093a..7fc18aa1e2f 100644
--- a/scripts/mysql_fix_privilege_tables.sh
+++ b/scripts/mysql_fix_privilege_tables.sh
@@ -151,7 +151,7 @@ add Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Super_priv,
 add Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_tmp_table_priv,
 add Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv,
 add Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Execute_priv,
-add Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv
+add Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv;
 END_OF_DATA
 
 if test $? -eq "0"
@@ -160,7 +160,7 @@ then
   echo ""
   echo "Updating new privileges in MySQL 4.0.2 from old ones"
   @bindir@/mysql --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA
-  update user set show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv
+  update user set show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv;
 END_OF_DATA
   echo ""
 fi
-- 
cgit v1.2.1