1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge with 5.1

Fixes to get Aria handler tests to work.
Fixes LP#697597 "HANDLER + Aria asserts in maria-5.3-handler"
This commit is contained in:
Michael Widenius
2011-01-11 15:36:41 +02:00
141 changed files with 2549 additions and 1297 deletions

View File

@ -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,