mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-24 17:25:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

10.0-monty merge

Browse source 
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
This commit is contained in:
Sergei Golubchik 2013-07-21 16:39:19 +02:00
commit b7b5f6f1ab
1378 changed files with 124559 additions and 47549 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/CMakeLists.txt
View file

@ -34,4 +34,6 @@ FIND_LIBRARY(EVENT_LIBRARY event)
IF(HAVE_EVENT_H AND EVENT_LIBRARY)
ADD_EXECUTABLE(async_queries async_queries.c)
TARGET_LINK_LIBRARIES(async_queries mysqlclient ${EVENT_LIBRARY})
SET_TARGET_PROPERTIES(async_queries PROPERTIES LINKER_LANGUAGE CXX)
ENDIF()

2
tests/mysql_client_fw.c
View file

@ -583,7 +583,7 @@ static int my_process_stmt_result(MYSQL_STMT *stmt)
return row_count;
}
field_count= min(mysql_num_fields(result), MAX_RES_FIELDS);
field_count= MY_MIN(mysql_num_fields(result), MAX_RES_FIELDS);
bzero((char*) buffer, sizeof(buffer));
bzero((char*) length, sizeof(length));

5
tests/mysql_client_test.c
View file

@ -17342,11 +17342,10 @@ static void test_wl4166_3()
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
/*
Sic: only one warning, instead of two. The warning
about data truncation when assigning a parameter is lost.
The warning about data truncation when assigning a parameter is lost.
This is a bug.
*/
my_process_warnings(mysql, 1);
my_process_warnings(mysql, 0);
verify_col_data("t1", "year", "0000-00-00 00:00:00");