mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-02 13:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge Mysql 5.1.39 merge into MariaDB trunk

Browse source
This commit is contained in:
unknown 2009-11-06 18:22:32 +01:00
commit ad368a2b54
148 changed files with 6248 additions and 1039 deletions
Download patch file Download diff file Expand all files Collapse all files

14
tests/mysql_client_test.c
View file

@ -4267,7 +4267,7 @@ static void test_fetch_date()
myheader("test_fetch_date");
/* Will not work if sql_mode is NO_ZERO_DATE (implicit if TRADITIONAL) /*/
/* Will not work if sql_mode is NO_ZERO_DATE (implicit if TRADITIONAL) */
rc= mysql_query(mysql, "SET SQL_MODE=''");
myquery(rc);
@ -17004,7 +17004,7 @@ static void test_bug20023()
{
MYSQL con;
int sql_big_selects_orig;
int sql_big_selects_orig= 0;
/*
Type of max_join_size is ha_rows, which might be ulong or off_t
depending on the platform or configure options. Preserve the string
@ -17012,10 +17012,10 @@ static void test_bug20023()
*/
char max_join_size_orig[32];
int sql_big_selects_2;
int sql_big_selects_3;
int sql_big_selects_4;
int sql_big_selects_5;
int sql_big_selects_2= 0;
int sql_big_selects_3= 0;
int sql_big_selects_4= 0;
int sql_big_selects_5= 0;
char query_buffer[MAX_TEST_QUERY_LENGTH];
@ -17154,7 +17154,7 @@ static void bug31418_impl()
MYSQL con;
my_bool is_null;
int rc;
int rc= 0;
/* Create a new connection. */