diff options
| author | unknown <svoj@april.(none)> | 2007-01-25 01:44:30 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-01-25 01:44:30 +0400 |
| commit | 1cf811786303b6626a16807425c264835ff22857 (patch) | |
| tree | b1cc56ee11a118751bf1f6774d9f8f0737db5f1d /scripts | |
| parent | e57ef96a08b7339a9e6a546fd8a603d98a6aa072 (diff) | |
| parent | e8ca911f5d527b6364844dfd573877d578b0d095 (diff) | |
| download | mariadb-git-1cf811786303b6626a16807425c264835ff22857.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/symlink.test:
Auto merged
sql/lock.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/table.cc:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
mysql-test/r/myisam.result:
Manually merged.
mysql-test/t/myisam.test:
Manually merged.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fill_help_tables.sh | 1 | ||||
| -rw-r--r-- | scripts/mysql_create_system_tables.sh | 1 | ||||
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh index 1dff7edd268..e600d24032b 100644 --- a/scripts/fill_help_tables.sh +++ b/scripts/fill_help_tables.sh @@ -521,6 +521,7 @@ print <<EOF; -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA EOF +print "set sql_mode='';\n"; print "delete from help_topic;\n"; print "delete from help_category;\n"; print "delete from help_keyword;\n"; diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index f9e776a8df4..dfe9a1bcbd2 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -873,6 +873,7 @@ fi cat << END_OF_DATA use mysql; +set sql_mode=''; set storage_engine=myisam; $c_d $i_d diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 056761f3ad0..9cdea507493 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -8,6 +8,7 @@ # this sql script. # On windows you should do 'mysql --force mysql < mysql_fix_privilege_tables.sql' +set sql_mode=''; set storage_engine=MyISAM; CREATE TABLE IF NOT EXISTS func ( |