diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/big_record.pl | 6 | ||||
-rw-r--r-- | tests/check_async_queries.pl | 2 | ||||
-rwxr-xr-x | tests/consistent_snapshot.pl | 2 | ||||
-rwxr-xr-x | tests/drop_test.pl | 12 | ||||
-rwxr-xr-x | tests/fork_big.pl | 28 | ||||
-rw-r--r-- | tests/fork_big2.pl | 32 | ||||
-rwxr-xr-x | tests/grant.pl | 4 | ||||
-rwxr-xr-x | tests/index_corrupt.pl | 10 | ||||
-rwxr-xr-x | tests/insert_and_repair.pl | 10 | ||||
-rwxr-xr-x | tests/mail_to_db.pl | 6 | ||||
-rwxr-xr-x | tests/pmail.pl | 2 | ||||
-rwxr-xr-x | tests/rename_test.pl | 12 | ||||
-rwxr-xr-x | tests/test_delayed_insert.pl | 22 | ||||
-rwxr-xr-x | tests/truncate.pl | 6 |
14 files changed, 77 insertions, 77 deletions
diff --git a/tests/big_record.pl b/tests/big_record.pl index cb1f8998468..b2aeee27658 100755 --- a/tests/big_record.pl +++ b/tests/big_record.pl @@ -37,9 +37,9 @@ GetOptions("host=s","db=s","user=s", "password=s", "table=s", "rows=i", print "Connection to database $test_db\n"; $extra_options=""; -$extra_options.=":mysql_compression=1" if ($opt_compress); +$extra_options.=":mariadb_compression=1" if ($opt_compress); -$dbh = DBI->connect("DBI:mysql:$opt_db:$host$extra_options",$opt_user,$opt_password) || die "Can't connect: $DBI::errstr\n"; +$dbh = DBI->connect("DBI:MariaDB:$opt_db:$host$extra_options",$opt_user,$opt_password) || die "Can't connect: $DBI::errstr\n"; $dbh->do("drop table if exists $opt_table"); @@ -65,7 +65,7 @@ for ($i=0 ; $i < $opt_rows ; $i++) print "\nReading records\n"; -$sth=$dbh->prepare("select * from $opt_table", { "mysql_use_result" => 1}) or die $dbh->errstr; +$sth=$dbh->prepare("select * from $opt_table", { "mariadb_use_result" => 1}) or die $dbh->errstr; $sth->execute() or die $sth->errstr; diff --git a/tests/check_async_queries.pl b/tests/check_async_queries.pl index b599bc334d3..0039dd90eb9 100644 --- a/tests/check_async_queries.pl +++ b/tests/check_async_queries.pl @@ -13,7 +13,7 @@ my $D= []; die "Usage: $0 <host> <user> <password> <database>\n" unless @ARGV == 4; -my $dbh= DBI->connect("DBI:mysql:database=$ARGV[3];host=$ARGV[0]", +my $dbh= DBI->connect("DBI:MariaDB:database=$ARGV[3];host=$ARGV[0]", $ARGV[1], $ARGV[2], { RaiseError => 1, PrintError => 0 }); diff --git a/tests/consistent_snapshot.pl b/tests/consistent_snapshot.pl index 9e53eaea6a1..5c006b0092d 100755 --- a/tests/consistent_snapshot.pl +++ b/tests/consistent_snapshot.pl @@ -17,7 +17,7 @@ my $DURATION= 20; my $stop_time= time() + $DURATION; sub my_connect { - my $dbh= DBI->connect("dbi:mysql:mysql_socket=/tmp/mysql.sock;database=test", + my $dbh= DBI->connect("DBI:MariaDB:mariadb_socket=/tmp/mysql.sock;database=test", "root", undef, { RaiseError=>1, PrintError=>0, AutoCommit=>0}); $dbh->do("SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ"); $dbh->do("SET SESSION autocommit = 0"); diff --git a/tests/drop_test.pl b/tests/drop_test.pl index 329f65eb65d..15a75f4908c 100755 --- a/tests/drop_test.pl +++ b/tests/drop_test.pl @@ -50,7 +50,7 @@ $firsttable = "bench_f1"; $start_time=new Benchmark; if (!$opt_skip_create) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table if exists $firsttable, ${firsttable}_1, ${firsttable}_2"); @@ -81,7 +81,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table $firsttable"); @@ -103,7 +103,7 @@ sub test_insert { my ($dbh,$i); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -124,7 +124,7 @@ sub test_drop my ($id) = @_; my ($dbh,$i,$sth,$error_counter,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $error_counter=0; @@ -169,7 +169,7 @@ sub test_select { my ($dbh,$i,$sth,@row,$error_counter,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -206,7 +206,7 @@ sub test_flush { my ($dbh,$i,$sth,@row,$error_counter,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/fork_big.pl b/tests/fork_big.pl index 623377ab5cd..2f803b7fdd3 100755 --- a/tests/fork_big.pl +++ b/tests/fork_big.pl @@ -65,7 +65,7 @@ srand 100; # Make random numbers repeatable #### $start_time=new Benchmark; -$dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", +$dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; if (!$opt_skip_create) @@ -155,7 +155,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { my $table_def; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -189,7 +189,7 @@ sub test_insert $from_table=0; $to_table=$numtables-1; } - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -218,7 +218,7 @@ sub test_select { my ($dbh, $i, $j, $count, $loop, $count_query, $row_counts); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -255,7 +255,7 @@ sub test_select_count { my ($dbh, $i, $j, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -285,7 +285,7 @@ sub test_join { my ($dbh, $i, $j, $count, $loop, $count_query, $row_counts); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -326,7 +326,7 @@ sub test_delete $table_count=2; $count=0; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -360,7 +360,7 @@ sub test_delete sub test_update { my ($dbh, $i, $j, $row_counts, $count_query, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -403,7 +403,7 @@ sub test_update sub test_check { my ($dbh, $sth, $row, $i, $j, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -440,7 +440,7 @@ sub test_check sub test_repair { my ($dbh, $sth, $row, $i, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -474,7 +474,7 @@ sub test_flush { my ($dbh,$count,$tables); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -502,7 +502,7 @@ sub test_database { my ($database) = @_; my ($dbh, $sth, $row, $i, $type, $tables); - $dbh = DBI->connect("DBI:mysql:$database:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$database:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -535,7 +535,7 @@ sub test_database sub test_alter { my ($dbh, $sth, $row, $i, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -559,7 +559,7 @@ sub test_alter sub signal_abort { my ($dbh); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/fork_big2.pl b/tests/fork_big2.pl index c844d290834..a2b465734dc 100644 --- a/tests/fork_big2.pl +++ b/tests/fork_big2.pl @@ -81,7 +81,7 @@ if ($opt_time == 0 && $opt_insert == 0) } $start_time=new Benchmark; -$dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", +$dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; if (!$opt_skip_create) @@ -212,7 +212,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_drop && !$errors) { my $table_def; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -257,7 +257,7 @@ sub test_insert $from_table=0; $to_table=$numtables-1; } - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -286,7 +286,7 @@ sub test_select { my ($dbh, $i, $j, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -323,7 +323,7 @@ sub test_select_count { my ($dbh, $i, $j, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -353,7 +353,7 @@ sub test_join { my ($dbh, $i, $j, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -391,7 +391,7 @@ sub test_join_count { my ($dbh, $i, $j, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -446,7 +446,7 @@ sub test_delete $table_count=2; $count=0; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -480,7 +480,7 @@ sub test_delete sub test_update { my ($dbh, $i, $j, $row_counts, $count_query, $count, $loop); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -523,7 +523,7 @@ sub test_update sub test_check { my ($dbh, $row, $i, $j, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -560,7 +560,7 @@ sub test_check sub test_repair { my ($dbh, $row, $i, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -594,7 +594,7 @@ sub test_flush { my ($dbh,$count,$tables); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -621,7 +621,7 @@ sub test_resize { my ($dbh, $key_buffer_size); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -648,7 +648,7 @@ sub test_database { my ($database) = @_; my ($dbh, $row, $i, $type, $tables); - $dbh = DBI->connect("DBI:mysql:$database:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$database:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -681,7 +681,7 @@ sub test_database sub test_alter { my ($dbh, $row, $i, $type, $table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -705,7 +705,7 @@ sub test_alter sub signal_abort { my ($dbh); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/grant.pl b/tests/grant.pl index cd651643316..f8cdc1af4d5 100755 --- a/tests/grant.pl +++ b/tests/grant.pl @@ -60,7 +60,7 @@ unlink($tmp_table); # clear grant tables # -$dbh = DBI->connect("DBI:mysql:mysql:$opt_host", +$dbh = DBI->connect("DBI:MariaDB:mysql:$opt_host", $opt_root_user,$opt_password, { PrintError => 0}) || die "Can't connect to mysql server with user '$opt_root_user': $DBI::errstr\n"; @@ -653,7 +653,7 @@ sub user_connect print "Connecting $opt_user\n" if ($opt_verbose); $user_dbh->disconnect if (defined($user_dbh)); - $user_dbh=DBI->connect("DBI:mysql:$opt_database:$opt_host",$opt_user, + $user_dbh=DBI->connect("DBI:MariaDB:$opt_database:$opt_host",$opt_user, $password, { PrintError => 0}); if (!$user_dbh) { diff --git a/tests/index_corrupt.pl b/tests/index_corrupt.pl index 6b04ce8a59c..6f31b85bd61 100755 --- a/tests/index_corrupt.pl +++ b/tests/index_corrupt.pl @@ -51,7 +51,7 @@ $kill_file= "/tmp/mysqltest_index_corrupt.$$"; $start_time=new Benchmark; if (!$opt_skip_create) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table if exists $firsttable, $secondtable"); @@ -111,7 +111,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table $firsttable, $secondtable"); @@ -134,7 +134,7 @@ sub insert_in_bench { my ($dbh,$rows,$found,$i); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; for ($rows= 1; $rows <= $opt_loop_count ; $rows++) @@ -179,7 +179,7 @@ sub select_from_bench { my ($dbh,$rows,$cursor); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; for ($rows= 1; $rows < $opt_loop_count ; $rows++) @@ -206,7 +206,7 @@ sub delete_from_bench { my ($dbh,$row, $t_value, $t2_value, $statement, $cursor); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/insert_and_repair.pl b/tests/insert_and_repair.pl index 18091c92718..dfa490456cb 100755 --- a/tests/insert_and_repair.pl +++ b/tests/insert_and_repair.pl @@ -49,7 +49,7 @@ $secondtable = "bench_f2"; $start_time=new Benchmark; if (!$opt_skip_create) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table if exists $firsttable, $secondtable"); @@ -79,7 +79,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table $firsttable,$secondtable"); @@ -100,7 +100,7 @@ sub insert_in_bench1 { my ($dbh,$rows,$found,$i); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $rows=$found=0; @@ -123,7 +123,7 @@ sub insert_in_bench2 { my ($dbh,$rows,$found,$i); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $rows=$found=0; @@ -149,7 +149,7 @@ sub repair_and_check $table); $found1=$found2=0; $last_found1=$last_found2= -1; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/mail_to_db.pl b/tests/mail_to_db.pl index e50415d96f3..94f3955b2c3 100755 --- a/tests/mail_to_db.pl +++ b/tests/mail_to_db.pl @@ -110,12 +110,12 @@ sub main die "FATAL: Can't find inbox file: $ARGV[$i]\n" if (! -f $ARGV[$i]); } - $connect_arg = "DBI:mysql:"; + $connect_arg = "DBI:MariaDB:"; push @args, "database=$opt_db" if defined($opt_db); push @args, "host=$opt_host" if defined($opt_host); push @args, "port=$opt_port" if defined($opt_port); - push @args, "mysql_socket=$opt_socket" if defined($opt_socket); - push @args, "mysql_read_default_group=mail_to_db"; + push @args, "mariadb_socket=$opt_socket" if defined($opt_socket); + push @args, "mariadb_read_default_group=mail_to_db"; $connect_arg .= join ';', @args; $dbh = DBI->connect("$connect_arg", $opt_user, $opt_password, { PrintError => 0}) diff --git a/tests/pmail.pl b/tests/pmail.pl index 359256c25b3..de469923c7d 100755 --- a/tests/pmail.pl +++ b/tests/pmail.pl @@ -60,7 +60,7 @@ if ($opt_help || !$ARGV[0]) #### Connect and parsing the query to MySQL #### -$dbh= DBI->connect("DBI:mysql:$opt_db:$opt_host:port=$opt_port:mysql_socket=$opt_socket", $opt_user,$opt_password, { PrintError => 0}) +$dbh= DBI->connect("DBI:MariaDB:$opt_db:$opt_host:port=$opt_port:mariadb_socket=$opt_socket", $opt_user,$opt_password, { PrintError => 0}) || die $DBI::errstr; main(); diff --git a/tests/rename_test.pl b/tests/rename_test.pl index d7097df1e4e..ff1b73434e5 100755 --- a/tests/rename_test.pl +++ b/tests/rename_test.pl @@ -48,7 +48,7 @@ $firsttable = "bench_f1"; $start_time=new Benchmark; if (!$opt_skip_create) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table if exists $firsttable, ${firsttable}_1, ${firsttable}_2"); @@ -81,7 +81,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $dbh->do("drop table $firsttable"); @@ -103,7 +103,7 @@ sub test_insert { my ($dbh,$i,$error); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -128,7 +128,7 @@ sub test_rename my ($id) = @_; my ($dbh,$i,$error_counter,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; $error_counter=0; @@ -158,7 +158,7 @@ sub test_select { my ($dbh,$i,$sth,@row,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -192,7 +192,7 @@ sub test_flush { my ($dbh,$i,$sth,@row,$error_counter,$sleep_time); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/test_delayed_insert.pl b/tests/test_delayed_insert.pl index cb5b86a228d..2ebb42e08d1 100755 --- a/tests/test_delayed_insert.pl +++ b/tests/test_delayed_insert.pl @@ -50,7 +50,7 @@ $secondtable = "bench_f2"; $start_time=new Benchmark; if (!$opt_skip_create) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $Mysql::QUIET = 1; $dbh->do("drop table if exists $firsttable,$secondtable"); $Mysql::QUIET = 0; @@ -87,7 +87,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $dbh->do("drop table $firsttable"); $dbh->do("drop table $secondtable"); } @@ -107,7 +107,7 @@ sub test_1 { my ($dbh,$tmpvar,$rows,$found,$i); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=1; $rows=$found=0; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -131,7 +131,7 @@ sub test_delayed_1 { my ($dbh,$tmpvar,$rows,$found,$i,$id); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=1; $rows=$found=0; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -162,7 +162,7 @@ sub test_delayed_2 { my ($dbh,$tmpvar,$rows,$found,$i,$id); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=1; $rows=$found=0; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -196,7 +196,7 @@ sub test_2 { my ($dbh,$id,$tmpvar,$rows,$found,$i,$max_id,$tmp,$sth,$count); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=111111; $rows=$found=$max_id=$id=0; for ($i=0 ; $i < $opt_loop_count ; $i++) @@ -245,7 +245,7 @@ sub test_2 sub test_3 { my ($dbh,$id,$tmpvar,$rows,$i,$count); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=222222; $rows=0; for ($i=0 ; $i < $opt_loop_count ; $i++) @@ -269,7 +269,7 @@ sub test_3 sub test_4 { my ($dbh,$id,$tmpvar,$rows,$i,$count); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=333333; $rows=0; for ($i=0 ; $i < $opt_loop_count; $i++) @@ -288,7 +288,7 @@ sub test_4 sub test_5 { my ($dbh,$id,$tmpvar,$rows,$i,$max_id,$count,$sth); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $tmpvar=444444; $rows=$max_id=0; for ($i=0 ; $i < $opt_loop_count ; $i++) @@ -328,7 +328,7 @@ sub test_5 sub test_del { my ($dbh,$min_id,$i,$sth,$rows); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host") || die $DBI::errstr; + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host") || die $DBI::errstr; $rows=0; for ($i=0 ; $i < $opt_loop_count/3; $i++) { @@ -357,7 +357,7 @@ sub test_flush my ($dbh,$sth,$found1,$last_found1,$i,@row); $found1=0; $last_found1=-1; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; diff --git a/tests/truncate.pl b/tests/truncate.pl index 98791a15b2c..85a7888bc4a 100755 --- a/tests/truncate.pl +++ b/tests/truncate.pl @@ -47,7 +47,7 @@ print "Testing truncate from $opt_threads multiple connections $opt_loop_count t #### $start_time=new Benchmark; -$dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", +$dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; if (!$opt_skip_create) @@ -100,7 +100,7 @@ while (($pid=wait()) != -1) if (!$opt_skip_delete && !$errors) { my $table_def; - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; @@ -127,7 +127,7 @@ sub test_truncate { my ($dbh,$i,$j,$count,$table_def,$table); - $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $dbh = DBI->connect("DBI:MariaDB:$opt_db:$opt_host", $opt_user, $opt_password, { PrintError => 0}) || die $DBI::errstr; |