summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-11-21 21:39:37 +0100
committerunknown <msvensson@neptunus.(none)>2006-11-21 21:39:37 +0100
commit6fb83ba6960fcb5fee0dd366c78c3f8ecd86498c (patch)
tree27b1824765804d5efac1bd1990edabe28b00cf0f
parent261c90d0638158ce17734efa114999d850624174 (diff)
downloadmariadb-git-6fb83ba6960fcb5fee0dd366c78c3f8ecd86498c.tar.gz
When runnig from binary dist the .sql files are found in share/ directory
scripts/mysql_fix_privilege_tables.sql: Remove annoying single '
-rwxr-xr-xmysql-test/mysql-test-run.pl3
-rw-r--r--scripts/mysql_fix_privilege_tables.sql2
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 0da28d79e56..73bde3b3e57 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1417,7 +1417,8 @@ sub executable_setup () {
# Look for mysql_fix_privilege_tables.sql script
$file_mysql_fix_privilege_tables=
- mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql");
+ mtr_file_exists("$glob_basedir/scripts/mysql_fix_privilege_tables.sql",
+ "$path_share/mysql_fix_privilege_tables.sql");
if ( ! $opt_skip_ndbcluster and executable_setup_ndb())
{
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 3044e51a4fd..28c9aced618 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -435,7 +435,7 @@ PRIMARY KEY TranTime (Transition_time)
#
-# Create proc table if it doesn't exists
+# Create proc table if it does not exists
#
CREATE TABLE IF NOT EXISTS proc (