auto-merge (238c5bfa) · Commits · Software / OSDI20 Artifacts / mariadb

extra/perror.c

+38 −2

Original line number	Diff line number	Diff line
		@@ -185,11 +185,36 @@ static const char *get_ha_error_msg(int code)
		}


		#if defined(__WIN__)
		static my_bool print_win_error_msg(DWORD error, my_bool verbose)
		{
		LPTSTR s;
		if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER \|
		FORMAT_MESSAGE_FROM_SYSTEM,
		NULL, error, 0, (LPTSTR)&s, 0,
		NULL))
		{
		if (verbose)
		printf("Win32 error code %d: %s", error, s);
		else
		puts(s);
		LocalFree(s);
		return 0;
		}
		return 1;
		}
		#endif



		int main(int argc,char *argv[])
		{
		int error,code,found;
		const char *msg;
		char *unknown_error = 0;
		#if defined(__WIN__)
		my_bool skip_win_message= 0;
		#endif
		MY_INIT(argv[0]);

		if (get_options(&argc,&argv))
		@@ -286,8 +311,15 @@ int main(int argc,char *argv[])
		/* Error message still not found, look in handler error codes */
		if (!(msg=get_ha_error_msg(code)))
		{
		#if defined(__WIN__)
		if (!(skip_win_message= !print_win_error_msg((DWORD)code, verbose)))
		{
		#endif
		fprintf(stderr,"Illegal error code: %d\n",code);
		error=1;
		#if defined(__WIN__)
		}
		#endif
		}
		else
		{
		@@ -298,6 +330,10 @@ int main(int argc,char *argv[])
		puts(msg);
		}
		}
		#if defined(__WIN__)
		if (!skip_win_message)
		print_win_error_msg((DWORD)code, verbose);
		#endif
		}
		}

mysql-test/r/perror-win.result

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		MySQL error code 150: Foreign key constraint is incorrectly formed
		Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
		OS error code 23: Too many open files in system
		Win32 error code 23: Data error (cyclic redundancy check).
		Win32 error code 15000: The specified channel path is invalid.

mysql-test/t/perror-win.test

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		# Windows-specific tests
		--source include/windows.inc
		--require r/have_perror.require
		disable_query_log;
		eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
		enable_query_log;


		--exec $MY_PERROR 150
		--exec $MY_PERROR 23
		--exec $MY_PERROR 15000

sql/field.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -5372,6 +5372,7 @@ int Field_newdate::store_time(MYSQL_TIME *ltime, timestamp_type time_type)
		{
		char buff[MAX_DATE_STRING_REP_LENGTH];
		String str(buff, sizeof(buff), &my_charset_latin1);
		tmp= 0;
		make_date((DATE_TIME_FORMAT *) 0, ltime, &str);
		set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
		str.ptr(), str.length(), MYSQL_TIMESTAMP_DATE, 1);
		@@ -5608,6 +5609,7 @@ int Field_datetime::store_time(MYSQL_TIME *ltime,timestamp_type time_type)
		{
		char buff[MAX_DATE_STRING_REP_LENGTH];
		String str(buff, sizeof(buff), &my_charset_latin1);
		tmp= 0;
		make_datetime((DATE_TIME_FORMAT *) 0, ltime, &str);
		set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN, WARN_DATA_TRUNCATED,
		str.ptr(), str.length(), MYSQL_TIMESTAMP_DATETIME,1);

tests/mysql_client_test.c

+81 −0

Original line number	Diff line number	Diff line
		@@ -16218,7 +16218,87 @@ static void test_bug38486(void)
		DBUG_VOID_RETURN;
		}

		static void test_bug40365(void)
		{
		uint rc, i, count= 1;
		MYSQL_STMT *stmt= 0;
		MYSQL_BIND my_bind[2];
		my_bool is_null[2]= {0};
		MYSQL_TIME tm[2];

		DBUG_ENTER("test_bug40365");

		rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
		myquery(rc);
		rc= mysql_query(mysql, "CREATE TABLE t1(c1 DATETIME, \
		c2 DATE)");
		myquery(rc);

		stmt= mysql_simple_prepare(mysql, "INSERT INTO t1 VALUES(?, ?)");
		check_stmt(stmt);
		verify_param_count(stmt, 2);

		bzero((char*) my_bind, sizeof(my_bind));
		my_bind[0].buffer_type= MYSQL_TYPE_DATETIME;
		my_bind[1].buffer_type= MYSQL_TYPE_DATE;
		for (i= 0; i < (int) array_elements(my_bind); i++)
		{
		my_bind[i].buffer= (void *) &tm[i];
		my_bind[i].is_null= &is_null[i];
		}

		rc= mysql_stmt_bind_param(stmt, my_bind);
		check_execute(stmt, rc);

		for (i= 0; i < (int) array_elements(my_bind); i++)
		{
		tm[i].neg= 0;
		tm[i].second_part= 0;
		tm[i].year= 2009;
		tm[i].month= 2;
		tm[i].day= 29;
		tm[i].hour= 0;
		tm[i].minute= 0;
		tm[i].second= 0;
		}
		rc= mysql_stmt_execute(stmt);
		check_execute(stmt, rc);

		rc= mysql_commit(mysql);
		myquery(rc);
		mysql_stmt_close(stmt);

		stmt= mysql_simple_prepare(mysql, "SELECT * FROM t1");
		check_stmt(stmt);

		rc= mysql_stmt_bind_result(stmt, my_bind);
		check_execute(stmt, rc);

		rc= mysql_stmt_execute(stmt);
		check_execute(stmt, rc);

		rc= mysql_stmt_store_result(stmt);
		check_execute(stmt, rc);

		rc= mysql_stmt_fetch(stmt);
		check_execute(stmt, rc);

		if (!opt_silent)
		fprintf(stdout, "\n");

		for (i= 0; i < array_elements(my_bind); i++)
		{
		if (!opt_silent)
		fprintf(stdout, "\ntime[%d]: %02d-%02d-%02d ",
		i, tm[i].year, tm[i].month, tm[i].day);
		DIE_UNLESS(tm[i].year == 0);
		DIE_UNLESS(tm[i].month == 0);
		DIE_UNLESS(tm[i].day == 0);
		}
		mysql_stmt_close(stmt);

		DBUG_VOID_RETURN;
		}
		/*
		Read and parse arguments and MySQL options from my.cnf
		*/
		@@ -16514,6 +16594,7 @@ static struct my_tests_st my_tests[]= {
		{ "test_bug31669", test_bug31669 },
		{ "test_bug32265", test_bug32265 },
		{ "test_bug38486", test_bug38486 },
		{ "test_bug40365", test_bug40365 },
		{ 0, 0 }
		};