More test fixes

mariadb-corporation · Jun 24, 2021 · 353e99f · 353e99f
1 parent 47df15e
commit 353e99f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/unittest/libmariadb/connection.c b/unittest/libmariadb/connection.c
@@ -1486,7 +1486,7 @@ static int test_conc317(MYSQL *unused __attribute__((unused)))
 
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "");
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
 
@@ -1534,11 +1534,12 @@ static int test_conc327(MYSQL *unused __attribute__((unused)))
   mysql= mysql_init(NULL);
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "");
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
   remove(cnf_file2);
 
+  diag("new charset: %s", mysql->options.charset_name);
   FAIL_IF(strcmp(mysql_character_set_name(mysql), "latin2"), "expected charset latin2");
   mysql_get_optionv(mysql, MYSQL_OPT_RECONNECT, &reconnect);
   FAIL_IF(reconnect != 1, "expected reconnect=1");
@@ -1557,7 +1558,7 @@ static int test_conc327(MYSQL *unused __attribute__((unused)))
   mysql= mysql_init(NULL);
   mysql_options(mysql, MYSQL_READ_DEFAULT_FILE, cnf_file2);
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
   remove(cnf_file2);

diff --git a/unittest/libmariadb/misc.c b/unittest/libmariadb/misc.c
@@ -242,6 +242,8 @@ static int test_frm_bug(MYSQL *mysql)
   char       test_frm[1024];
   int        rc;
 
+  SKIP_MYSQL(mysql);
+
   mysql_autocommit(mysql, TRUE);
 
   rc= mysql_query(mysql, "drop table if exists test_frm_bug");
@@ -1157,7 +1159,7 @@ static int test_mdev12965(MYSQL *unused __attribute__((unused)))
 
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "");
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
 
@@ -1441,7 +1443,7 @@ static int test_conc395(MYSQL *unused __attribute__((unused)))
 
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "");
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
 
@@ -1481,7 +1483,7 @@ static int test_sslenforce(MYSQL *unused __attribute__((unused)))
 
   mysql_options(mysql, MYSQL_READ_DEFAULT_GROUP, "");
   my_test_connect(mysql, hostname, username, password,
-                  schema, 0, socketname, 0);
+                  schema, port, socketname, 0);
 
   remove(cnf_file1);
 

diff --git a/unittest/libmariadb/t_conc173.c b/unittest/libmariadb/t_conc173.c
@@ -45,7 +45,7 @@ static int test_conc_173(MYSQL *unused __attribute__((unused)))
 
     mysql_options(&mysql, MYSQL_OPT_PROTOCOL, &arg);
 
-    if(!mysql_real_connect(&mysql, hostname, username, password, schema, 0, 0, 0))  {
+    if(!mysql_real_connect(&mysql, hostname, username, password, schema, port, 0, 0))  {
       fprintf(stderr, "Failed to connect to database after %d iterations: Error: %s\n", i, mysql_error(&mysql));
       return 1;
     }