diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-12 13:26:30 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-12 13:26:30 -0800 |
| commit | 48d435b16f6d071fe2726f80c3dc080f5632cb21 (patch) | |
| tree | a998c1754983b8b4aba1c4acc4ff63214d4b3bef /scripts | |
| parent | dc11d498b25d6b2fd909b344f3f2837571cb38b0 (diff) | |
| download | mariadb-git-48d435b16f6d071fe2726f80c3dc080f5632cb21.tar.gz | |
This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work.
BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
New results
mysql-test/r/ctype_ujis.result:
New results
mysql-test/r/innodb_concurrent.result:
New results.
mysql-test/r/rpl_heap.result:
New results
mysql-test/r/warnings.result:
New results
mysql-test/t/ctype_ujis.test:
Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
Fixed test for engine
mysql-test/t/rpl_heap.test:
Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
Fixed setup.
mysql-test/t/warnings.test:
Removed deprecated tests
scripts/fill_func_tables.sh:
Fixed script
scripts/mysql_convert_table_format.sh:
Fixed script
sql/ha_innodb.cc:
Fixed comment
sql/sql_yacc.yy:
Removed deprecated syntax
tests/fork_big.pl:
Fixed scipt
tests/fork_big2.pl:
Fixed script
tests/mail_to_db.pl:
Fixed script
tests/mysql_client_test.c:
Fixed test
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fill_func_tables.sh | 6 | ||||
| -rw-r--r-- | scripts/mysql_convert_table_format.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fill_func_tables.sh b/scripts/fill_func_tables.sh index 203c730dd9a..83501886d88 100644 --- a/scripts/fill_func_tables.sh +++ b/scripts/fill_func_tables.sh @@ -140,7 +140,7 @@ print " max_args tinyint,"; print " date_created datetime not null,"; print " last_modified timestamp not null,"; print " primary key (func_id)"; -print ") type=myisam;\n\n"; +print ") ENGINE=MYISAM;\n\n"; print "DROP TABLE IF EXISTS function_category_name;\n"; print "CREATE TABLE function_category_name ("; @@ -150,14 +150,14 @@ print " url char(128) not null,"; print " date_created datetime not null,"; print " last_modified timestamp not null,"; print " primary key (cat_id)"; -print ") type=myisam;\n\n"; +print ") ENGINE=MYISAM;\n\n"; print "DROP TABLE IF EXISTS function_category;\n"; print "CREATE TABLE function_category ("; print " cat_id smallint unsigned not null references function_category_name,"; print " func_id int unsigned not null references function,"; print " primary key (cat_id, func_id)"; -print ") type=myisam;\n\n"; +print ") ENGINE=MYISAM;\n\n"; print "DELETE FROM function_category_name;\n"; print "DELETE FROM function_category;\n"; diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh index c1955e632fb..4b68d6c5039 100644 --- a/scripts/mysql_convert_table_format.sh +++ b/scripts/mysql_convert_table_format.sh @@ -69,7 +69,7 @@ foreach $table (@ARGV) } } print "converting $table\n" if ($opt_verbose); - if (!$dbh->do("ALTER TABLE $table type=$opt_type")) + if (!$dbh->do("ALTER TABLE $table ENGINE=$opt_type")) { print STDERR "Can't convert $table: Error $DBI::errstr\n"; exit(1) if (!$opt_force); @@ -114,7 +114,7 @@ Conversion of a MySQL tables to other table types. --socket='/path/to/socket' Socket to connect with. ---type='table-type' +--ENGINE='table-type' Converts tables to the given table type (Default: $opt_type) MySQL 3.23 supports at least the BDB, ISAM and MYISAM types. |