diff options
| author | unknown <monty@mishka.local> | 2005-04-16 04:35:54 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-04-16 04:35:54 +0300 |
| commit | 2be63528bc0f7d524df4660cea4fcc002604c42e (patch) | |
| tree | 4432c91a9b8ee8482b369f2a066a5e9a9d87b399 /scripts | |
| parent | 88538066ba1cbf80da5f88b0d4188f8b875127c9 (diff) | |
| parent | 9b224e9180d26aa5b7e087537255c60c5c061ad3 (diff) | |
| download | mariadb-git-2be63528bc0f7d524df4660cea4fcc002604c42e.tar.gz | |
Merge with 4.1
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/set_var.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/handler.cc:
Merge
sql/handler.h:
Merge
sql/mysqld.cc:
Merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 1 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index bb4c2f08193..e76fc935b03 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -722,6 +722,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 dee4ebd3d2f..00fe5c053d0 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, |