diff options
| author | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-03 12:39:38 +0200 |
| commit | 47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50 (patch) | |
| tree | 85bce6df7d0ce9d809ff3fc13fa4486590463d00 /scripts | |
| parent | afbe601302fc59c498437321b296ed6c8d360564 (diff) | |
| download | mariadb-git-47bbf768d4bdb9ca0abd2ef94bd9a734dafeed50.tar.gz | |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 89b96f2bc6e..2d6434a0eb5 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -176,7 +176,7 @@ then s_echo "done" else s_echo "Got a failure from command:" - s_echo "$cmd" + s_echo "cat $sql_file | $cmd" s_echo "Please check the above output and try again." if test $verbose = 0 then |