summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@mishka.local <>2005-04-16 04:12:30 +0300
committermonty@mishka.local <>2005-04-16 04:12:30 +0300
commit2b322f36d8e458927845e81e6585a61e8dfff038 (patch)
treec6558677169ec70b7372c2433dedcadd0510fc2e /scripts
parent8d919770c71178cc430fd515eaed3859e65792da (diff)
downloadmariadb-git-2b322f36d8e458927845e81e6585a61e8dfff038.tar.gz
Ensure that all privilege tables are created in MyISAM
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_create_system_tables.sh1
-rw-r--r--scripts/mysql_fix_privilege_tables.sql2
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh
index 993efcb0fda..4c642423879 100644
--- a/scripts/mysql_create_system_tables.sh
+++ b/scripts/mysql_create_system_tables.sh
@@ -629,6 +629,7 @@ fi
cat << END_OF_DATA
use mysql;
+set table_type=myisam;
$c_d
$i_d
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index 8f398689bd9..0d7d32fd6a9 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -9,6 +9,8 @@
-- this sql script.
-- On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql'
+set table_type=MyISAM;
+
CREATE TABLE IF NOT EXISTS func (
name char(64) binary DEFAULT '' NOT NULL,
ret tinyint(1) DEFAULT '0' NOT NULL,