summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-01-11 15:36:41 +0200
committerMichael Widenius <monty@askmonty.org>2011-01-11 15:36:41 +0200
commit050c004f5e6f152f5c4cdadda8a15e01d2f07a9a (patch)
treef5828daced42ff651d5f822af17844154fb9ffd1 /scripts
parente63b5546c597f65696868eaf69159107bc4a8e44 (diff)
parent2eaa76b84426b19f8574876ad1fa85ae6cfe3196 (diff)
downloadmariadb-git-050c004f5e6f152f5c4cdadda8a15e01d2f07a9a.tar.gz
Merge with 5.1
Fixes to get Aria handler tests to work. Fixes LP#697597 "HANDLER + Aria asserts in maria-5.3-handler"
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_convert_table_format.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysql_convert_table_format.sh b/scripts/mysql_convert_table_format.sh
index 6f586d0e8e0..7983982913c 100644
--- a/scripts/mysql_convert_table_format.sh
+++ b/scripts/mysql_convert_table_format.sh
@@ -28,7 +28,7 @@ $opt_port=0;
$exit_status=0;
GetOptions(
- "e|engine|type=s" => \$opt_type,
+ "e|engine|type=s" => \$opt_engine,
"f|force" => \$opt_force,
"help|?" => \$opt_help,
"h|host=s" => \$opt_host,