Merge (542096df) · Commits · Software / OSDI20 Artifacts / mariadb

client/mysqltest.c

+12 −7

Original line number	Diff line number	Diff line
		@@ -844,10 +844,10 @@ int do_source(struct st_query* q)
		1 error
		*/

		int do_exec(struct st_query* q)
		static void do_exec(struct st_query* q)
		{
		int error= 0;
		DYNAMIC_STRING *ds;
		int error;
		DYNAMIC_STRING ds = NULL; / Assign just to avoid warning */
		DYNAMIC_STRING ds_tmp;
		char buf[1024];
		FILE *res_file;
		@@ -884,7 +884,15 @@ int do_exec(struct st_query* q)

		while (fgets(buf, sizeof(buf), res_file))
		replace_dynstr_append_mem(ds, buf, strlen(buf));
		}

		error= pclose(res_file);

		if (error != 0)
		die("command \"%s\" failed: %s", cmd, errno);

		if (!disable_result_log)
		{
		if (glob_replace)
		free_replace();

		@@ -902,9 +910,6 @@ int do_exec(struct st_query* q)
		if (ds == &ds_tmp)
		dynstr_free(&ds_tmp);
		}
		pclose(res_file);

		DBUG_RETURN(error);
		}


		@@ -2811,7 +2816,7 @@ int main(int argc, char **argv)
		(void) mysql_ping(&cur_con->mysql);
		break;
		case Q_EXEC:
		(void) do_exec(q);
		do_exec(q);
		break;
		default: processed = 0; break;
		}

tests/client_test.c

+44 −30

Original line number	Diff line number	Diff line
		@@ -27,11 +27,18 @@
		#include <my_getopt.h>
		#include <m_string.h>
		#include <assert.h>
		#ifdef HAVE_SYS_PARAM_H
		#include <sys/param.h>
		#endif

		#ifndef MAXPATHLEN
		#define MAXPATHLEN 256
		#endif

		#define MAX_TEST_QUERY_LENGTH 300 /* MAX QUERY BUFFER LENGTH */

		/* set default options */
		static int opt_testcase = 0;
		static char *opt_db= 0;
		static char *opt_user= 0;
		static char *opt_password= 0;
		@@ -183,7 +190,7 @@ static void client_connect()
		if (!(mysql= mysql_init(NULL)))
		{
		myerror("mysql_init() failed");
		exit(0);
		exit(1);
		}

		if (!(mysql_real_connect(mysql, opt_host, opt_user,
		@@ -193,7 +200,7 @@ static void client_connect()
		myerror("connection failed");
		mysql_close(mysql);
		fprintf(stdout, "\n Check the connection options using --help or -?\n");
		exit(0);
		exit(1);
		}

		fprintf(stdout, " OK");
		@@ -4071,14 +4078,14 @@ static void test_stmt_close()
		if (!(lmysql= mysql_init(NULL)))
		{
		myerror("mysql_init() failed");
		exit(0);
		exit(1);
		}
		if (!(mysql_real_connect(lmysql, opt_host, opt_user,
		opt_password, current_db, opt_port,
		opt_unix_socket, 0)))
		{
		myerror("connection failed");
		exit(0);
		exit(1);
		}
		fprintf(stdout, " OK");

		@@ -4688,7 +4695,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n drop table failed");
		fprintf(stderr, "\n %s", mysql_error(mysql));
		exit(0);
		exit(1);
		}
		if (mysql_query(mysql, "CREATE TABLE test_table(col1 int, col2 varchar(50), \
		col3 smallint, \
		@@ -4696,7 +4703,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n create table failed");
		fprintf(stderr, "\n %s", mysql_error(mysql));
		exit(0);
		exit(1);
		}

		/* Prepare a insert query with 3 parameters */
		@@ -4705,7 +4712,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n prepare, insert failed");
		fprintf(stderr, "\n %s", mysql_error(mysql));
		exit(0);
		exit(1);
		}
		fprintf(stdout, "\n prepare, insert successful");

		@@ -4716,7 +4723,7 @@ static void test_manual_sample()
		if (param_count != 3) /* validate parameter count */
		{
		fprintf(stderr, "\n invalid parameter count returned by MySQL");
		exit(0);
		exit(1);
		}

		/* Bind the data for the parameters */
		@@ -4747,7 +4754,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n param bind failed");
		fprintf(stderr, "\n %s", mysql_stmt_error(stmt));
		exit(0);
		exit(1);
		}

		/* Specify the data */
		@@ -4762,7 +4769,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n execute 1 failed");
		fprintf(stderr, "\n %s", mysql_stmt_error(stmt));
		exit(0);
		exit(1);
		}

		/* Get the total rows affected */
		@@ -4772,7 +4779,7 @@ static void test_manual_sample()
		if (affected_rows != 1) /* validate affected rows */
		{
		fprintf(stderr, "\n invalid affected rows by MySQL");
		exit(0);
		exit(1);
		}

		/* Re-execute the insert, by changing the values */
		@@ -4786,7 +4793,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n execute 2 failed");
		fprintf(stderr, "\n %s", mysql_stmt_error(stmt));
		exit(0);
		exit(1);
		}

		/* Get the total rows affected */
		@@ -4796,7 +4803,7 @@ static void test_manual_sample()
		if (affected_rows != 1) /* validate affected rows */
		{
		fprintf(stderr, "\n invalid affected rows by MySQL");
		exit(0);
		exit(1);
		}

		/* Close the statement */
		@@ -4804,7 +4811,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n failed while closing the statement");
		fprintf(stderr, "\n %s", mysql_stmt_error(stmt));
		exit(0);
		exit(1);
		}
		assert(2 == my_stmt_result("SELECT * FROM test_table"));

		@@ -4813,7 +4820,7 @@ static void test_manual_sample()
		{
		fprintf(stderr, "\n drop table failed");
		fprintf(stderr, "\n %s", mysql_error(mysql));
		exit(0);
		exit(1);
		}
		fprintf(stdout, "Success !!!");
		}
		@@ -4865,7 +4872,7 @@ static void test_prepare_alter()
		check_execute(stmt, rc);

		if (thread_query((char *)"ALTER TABLE test_prep_alter change id id_new varchar(20)"))
		exit(0);
		exit(1);

		is_null= 1;
		rc= mysql_stmt_execute(stmt);
		@@ -6486,7 +6493,7 @@ static void test_prepare_grant()
		ER_UNKNOWN_COM_ERROR= 1047
		*/
		if (mysql_errno(mysql) != 1047)
		exit(0);
		exit(1);
		}
		else
		{
		@@ -6497,7 +6504,7 @@ static void test_prepare_grant()
		if (!(lmysql= mysql_init(NULL)))
		{
		myerror("mysql_init() failed");
		exit(0);
		exit(1);
		}
		if (!(mysql_real_connect(lmysql, opt_host, "test_grant",
		"", current_db, opt_port,
		@@ -6505,7 +6512,7 @@ static void test_prepare_grant()
		{
		myerror("connection failed");
		mysql_close(lmysql);
		exit(0);
		exit(1);
		}
		fprintf(stdout, " OK");

		@@ -6559,8 +6566,8 @@ static void test_frm_bug()
		MYSQL_RES *result;
		MYSQL_ROW row;
		FILE *test_file;
		char data_dir[NAME_LEN];
		char test_frm[255];
		char data_dir[MAXPATHLEN];
		char test_frm[MAXPATHLEN];
		int rc;

		myheader("test_frm_bug");
		@@ -6605,7 +6612,7 @@ static void test_frm_bug()
		{
		fprintf(stdout, "\n ERROR: my_fopen failed for '%s'", test_frm);
		fprintf(stdout, "\n test cancelled");
		return;
		exit(1);
		}
		fprintf(test_file, "this is a junk file for test");

		@@ -6894,7 +6901,7 @@ static void test_drop_temp()
		ER_UNKNOWN_COM_ERROR= 1047
		*/
		if (mysql_errno(mysql) != 1047)
		exit(0);
		exit(1);
		}
		else
		{
		@@ -6904,7 +6911,7 @@ static void test_drop_temp()
		if (!(lmysql= mysql_init(NULL)))
		{
		myerror("mysql_init() failed");
		exit(0);
		exit(1);
		}

		rc= mysql_query(mysql, "flush privileges");
		@@ -6917,7 +6924,7 @@ static void test_drop_temp()
		mysql= lmysql;
		myerror("connection failed");
		mysql_close(lmysql);
		exit(0);
		exit(1);
		}
		fprintf(stdout, " OK");

		@@ -10447,6 +10454,8 @@ static struct my_option client_test_long_options[] =
		(char **) &opt_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"socket", 'S', "Socket file to use for connection", (char **) &opt_unix_socket,
		(char **) &opt_unix_socket, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
		{"testcase", 'c', "Runs as mysql-test-run testcase.",
		0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
		{"count", 't', "Number of times test to be executed", (char **) &opt_count,
		(char **) &opt_count, 0, GET_UINT, REQUIRED_ARG, 1, 0, 0, 0, 0, 0},
		{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
		@@ -10490,6 +10499,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
		case '#':
		DBUG_PUSH(argument ? argument : default_dbug_option);
		break;
		case 'c':
		opt_testcase = 1;
		break;
		case 'p':
		if (argument)
		{
		@@ -10630,6 +10642,7 @@ int main(int argc, char **argv)
		test_warnings(); /* show warnings test */
		test_errors(); /* show errors test */
		test_prepare_resultset();/* prepare meta info test */
		if (!opt_testcase) /* FIXME: skipped because it hangs */
		test_stmt_close(); /* mysql_stmt_close() test -- hangs */
		test_prepare_field_result(); /* prepare meta info */
		test_multi_stmt(); /* multi stmt test */
		@@ -10658,6 +10671,7 @@ int main(int argc, char **argv)
		#ifndef EMBEDDED_LIBRARY
		test_prepare_grant(); /* Test the GRANT command, bug #89 */
		#endif
		if (!opt_testcase) /* FIXME: skipped because it fails */
		test_frm_bug(); /* test the crash when .frm is invalid, bug #93 */
		test_explain_bug(); /* test for the EXPLAIN, bug #115 */
		test_decimal_bug(); /* test for the decimal bug */
		@@ -10721,6 +10735,7 @@ int main(int argc, char **argv)
		dates in the server */
		test_bug5399(); /* check that statement id uniquely identifies
		statement */
		if (!opt_testcase)
		test_bug5194(); /* bulk inserts in prepared mode */
		test_bug5315(); /* check that mysql_change_user closes all
		prepared statements */
		@@ -10740,6 +10755,5 @@ int main(int argc, char **argv)
		print_test_output();
		my_end(0);

		return(0);
		exit(0);
		}