mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters Changed field length to 2 byte in .frm files configure.in: After merge fixes include/ft_global.h: Fixed copyright include/my_sys.h: Remove compiler warnings include/mysql.h: Added lengths for all MYSQL_FIELD string parameters include/mysql_com.h: Remove compiler warning myisam/ft_boolean_search.c: Removed compiler warnings myisam/ft_dump.c: Removed compiler warnings myisam/ft_stopwords.c: Copy file from MySQL 4.0 myisam/mi_delete.c: Fixed compiler warning myisam/sort.c: Indentation changes myisam/sp_test.c: Remove compiler warnings mysql-test/r/func_group.result: After merge fixes mysql-test/r/group_by.result: After merge fixes mysql-test/r/rpl_insert_id.result: After merge fixes mysql-test/r/rpl_master_pos_wait.result: After merge fixes mysql-test/t/rpl000009.test: After merge fixes mysql-test/t/rpl_insert_id.test: After merge fixes mysql-test/t/subselect.test: After merge fixes sql/item_cmpfunc.cc: After merge fixes sql/item_cmpfunc.h: After merge fixes sql/item_func.cc: After merge fixes sql/item_func.h: After merge fixes sql/item_strfunc.cc: After merge fixes sql/item_strfunc.h: After merge fixes sql/log.cc: After merge fixes sql/mysql_priv.h: After merge fixes sql/mysqld.cc: After merge fixes sql/sql_db.cc: After merge fixes sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_show.cc: After merge fixes sql/sql_udf.cc: After merge fixes sql/table.cc: Changed field length to 2 byte in .frm files sql/unireg.cc: Changed field length to 2 byte in .frm files
This commit is contained in:
parent
2ff82a7b15
commit
d66e60248c
34 changed files with 259 additions and 181 deletions
|
|
@ -137,7 +137,7 @@ extern ulonglong safemalloc_mem_limit;
|
|||
#define CALLER_INFO , __FILE__, __LINE__
|
||||
#define ORIG_CALLER_INFO , sFile, uLine
|
||||
#else
|
||||
#define my_checkmalloc() (0)
|
||||
#define my_checkmalloc()
|
||||
#undef TERMINATE
|
||||
#define TERMINATE(A) {}
|
||||
#define QUICK_SAFEMALLOC
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue