- error redirection merged from MYSQL_4_00 branch

[packages/mysql.git] / mysql-fix_privilege_tables.patch

diff --git a/mysql-fix_privilege_tables.patch b/mysql-fix_privilege_tables.patch
index ac2b9b653cb667e8180c6d92d2b320ca963fbff7..2ee99bac734d02070729ba4d2ffaa10eb4317695 100644 (file)
--- a/mysql-fix_privilege_tables.patch
+++ b/mysql-fix_privilege_tables.patch
@@ -1,12 +1,12 @@
-diff -uNr old-mysql-4.0.14/scripts/mysql_fix_privilege_tables.sh mysql-4.0.14/scripts/mysql_fix_privilege_tables.sh
---- old-mysql-4.0.14/scripts/mysql_fix_privilege_tables.sh     Fri Jul 18 14:57:48 2003
-+++ mysql-4.0.14/scripts/mysql_fix_privilege_tables.sh Wed Oct  1 07:03:28 2003
-@@ -2,7 +2,7 @@
- 
- root_password="$1"
+diff -urN mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh
+--- mysql-4.1.7.org/scripts/mysql_fix_privilege_tables.sh      2004-10-27 01:35:56.000000000 +0200
++++ mysql-4.1.7/scripts/mysql_fix_privilege_tables.sh  2004-10-27 12:13:42.159439392 +0200
+@@ -5,7 +5,7 @@
+ # Default values (Can be changed in my.cnf)
+ password=""
  host="localhost"
 -user="root"
 +user="mysql"
- 
- if test -z $1 ; then
-   cmd="@bindir@/mysql -f --user=$user --host=$host mysql"
+ sql_only=0
+ basedir=""
+ verbose=0