Skip to content

M
mariadb
Commit f6871c0d authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files
Options

Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
parents 9d03658b dff2a4c3
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 33 deletions
CMakeLists.txt
View file @ f6871c0d
...@@ -104,6 +104,10 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF ...@@ -104,6 +104,10 @@ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
#TODO: update the code and remove the disabled warnings
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")
IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996") SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
......
include/config-win.h
View file @ f6871c0d
...@@ -158,14 +158,12 @@ typedef uint rf_SetTimer; ...@@ -158,14 +158,12 @@ typedef uint rf_SetTimer;
#define Socket_defined #define Socket_defined
#define my_socket SOCKET #define my_socket SOCKET
#define bool BOOL
#define SIGPIPE SIGINT #define SIGPIPE SIGINT
#define RETQSORTTYPE void #define RETQSORTTYPE void
#define QSORT_TYPE_IS_VOID #define QSORT_TYPE_IS_VOID
#define RETSIGTYPE void #define RETSIGTYPE void
#define SOCKET_SIZE_TYPE int #define SOCKET_SIZE_TYPE int
#define my_socket_defined #define my_socket_defined
#define bool_defined
#define byte_defined #define byte_defined
#define HUGE_PTR #define HUGE_PTR
#define STDCALL __stdcall /* Used by libmysql.dll */ #define STDCALL __stdcall /* Used by libmysql.dll */
...@@ -472,4 +470,4 @@ inline double ulonglong2double(ulonglong value) ...@@ -472,4 +470,4 @@ inline double ulonglong2double(ulonglong value)
#define HAVE_CHARSET_ujis 1 #define HAVE_CHARSET_ujis 1
#define HAVE_CHARSET_utf8 1 #define HAVE_CHARSET_utf8 1
#define HAVE_UCA_COLLATIONS 1 #define HAVE_UCA_COLLATIONS 1
#define HAVE_BOOL 1
include/my_global.h
View file @ f6871c0d
...@@ -1067,7 +1067,7 @@ typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ ...@@ -1067,7 +1067,7 @@ typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */
typedef short int15; /* Most effective integer 0 <= x <= 32767 */ typedef short int15; /* Most effective integer 0 <= x <= 32767 */
typedef int myf; /* Type of MyFlags in my_funcs */ typedef int myf; /* Type of MyFlags in my_funcs */
typedef char my_bool; /* Small bool */ typedef char my_bool; /* Small bool */
#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) #if !defined(bool) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
typedef char bool; /* Ordinary boolean values 0 1 */ typedef char bool; /* Ordinary boolean values 0 1 */
#endif #endif
/* Macros for converting *constants* to the right type */ /* Macros for converting *constants* to the right type */
......
sql/mysql_priv.h
View file @ f6871c0d
...@@ -741,8 +741,8 @@ inline bool check_some_routine_access(THD *thd, const char *db, ...@@ -741,8 +741,8 @@ inline bool check_some_routine_access(THD *thd, const char *db,
bool multi_update_precheck(THD *thd, TABLE_LIST *tables); bool multi_update_precheck(THD *thd, TABLE_LIST *tables);
bool multi_delete_precheck(THD *thd, TABLE_LIST *tables); bool multi_delete_precheck(THD *thd, TABLE_LIST *tables);
bool mysql_multi_update_prepare(THD *thd); int mysql_multi_update_prepare(THD *thd);
bool mysql_multi_delete_prepare(THD *thd); int mysql_multi_delete_prepare(THD *thd);
bool mysql_insert_select_prepare(THD *thd); bool mysql_insert_select_prepare(THD *thd);
bool update_precheck(THD *thd, TABLE_LIST *tables); bool update_precheck(THD *thd, TABLE_LIST *tables);
bool delete_precheck(THD *thd, TABLE_LIST *tables); bool delete_precheck(THD *thd, TABLE_LIST *tables);
...@@ -978,7 +978,7 @@ bool setup_connection_thread_globals(THD *thd); ...@@ -978,7 +978,7 @@ bool setup_connection_thread_globals(THD *thd);
bool login_connection(THD *thd); bool login_connection(THD *thd);
void end_connection(THD *thd); void end_connection(THD *thd);
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent); int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create, bool silent);
bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create); bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create);
bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent); bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent);
bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db); bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db);
...@@ -1022,7 +1022,7 @@ void init_max_user_conn(void); ...@@ -1022,7 +1022,7 @@ void init_max_user_conn(void);
void init_update_queries(void); void init_update_queries(void);
void free_max_user_conn(void); void free_max_user_conn(void);
pthread_handler_t handle_bootstrap(void *arg); pthread_handler_t handle_bootstrap(void *arg);
bool mysql_execute_command(THD *thd); int mysql_execute_command(THD *thd);
bool do_command(THD *thd); bool do_command(THD *thd);
bool dispatch_command(enum enum_server_command command, THD *thd, bool dispatch_command(enum enum_server_command command, THD *thd,
char* packet, uint packet_length); char* packet, uint packet_length);
...@@ -1198,7 +1198,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields, ...@@ -1198,7 +1198,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table,List<Item> &fields,
int check_that_all_fields_are_given_values(THD *thd, TABLE *entry, int check_that_all_fields_are_given_values(THD *thd, TABLE *entry,
TABLE_LIST *table_list); TABLE_LIST *table_list);
void prepare_triggers_for_insert_stmt(TABLE *table); void prepare_triggers_for_insert_stmt(TABLE *table);
bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds); int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds);
bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
SQL_LIST *order, ha_rows rows, ulonglong options, SQL_LIST *order, ha_rows rows, ulonglong options,
bool reset_auto_increment); bool reset_auto_increment);
...@@ -1472,14 +1472,14 @@ void wait_for_condition(THD *thd, pthread_mutex_t *mutex, ...@@ -1472,14 +1472,14 @@ void wait_for_condition(THD *thd, pthread_mutex_t *mutex,
pthread_cond_t *cond); pthread_cond_t *cond);
int open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags); int open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags);
/* open_and_lock_tables with optional derived handling */ /* open_and_lock_tables with optional derived handling */
bool open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived); int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived);
/* simple open_and_lock_tables without derived handling */ /* simple open_and_lock_tables without derived handling */
inline bool simple_open_n_lock_tables(THD *thd, TABLE_LIST *tables) inline int simple_open_n_lock_tables(THD *thd, TABLE_LIST *tables)
{ {
return open_and_lock_tables_derived(thd, tables, FALSE); return open_and_lock_tables_derived(thd, tables, FALSE);
} }
/* open_and_lock_tables with derived handling */ /* open_and_lock_tables with derived handling */
inline bool open_and_lock_tables(THD *thd, TABLE_LIST *tables) inline int open_and_lock_tables(THD *thd, TABLE_LIST *tables)
{ {
return open_and_lock_tables_derived(thd, tables, TRUE); return open_and_lock_tables_derived(thd, tables, TRUE);
} }
...@@ -1708,7 +1708,7 @@ inline TABLE_LIST *find_table_in_local_list(TABLE_LIST *table, ...@@ -1708,7 +1708,7 @@ inline TABLE_LIST *find_table_in_local_list(TABLE_LIST *table,
bool eval_const_cond(COND *cond); bool eval_const_cond(COND *cond);
/* sql_load.cc */ /* sql_load.cc */
bool mysql_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list, int mysql_load(THD *thd, sql_exchange *ex, TABLE_LIST *table_list,
List<Item> &fields_vars, List<Item> &set_fields, List<Item> &fields_vars, List<Item> &set_fields,
List<Item> &set_values_list, List<Item> &set_values_list,
enum enum_duplicates handle_duplicates, bool ignore, enum enum_duplicates handle_duplicates, bool ignore,
......
sql/procedure.h
View file @ f6871c0d
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
virtual int send_row(List<Item> &fields)=0; virtual int send_row(List<Item> &fields)=0;
virtual bool change_columns(List<Item> &fields)=0; virtual bool change_columns(List<Item> &fields)=0;
virtual void update_refs(void) {} virtual void update_refs(void) {}
virtual bool end_of_records() { return 0; } virtual int end_of_records() { return 0; }
}; };
Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result, Procedure *setup_procedure(THD *thd,ORDER *proc_param,select_result *result,
......
sql/sql_acl.cc
View file @ f6871c0d
...@@ -1521,7 +1521,7 @@ bool acl_check_host(const char *host, const char *ip) ...@@ -1521,7 +1521,7 @@ bool acl_check_host(const char *host, const char *ip)
1 ERROR ; In this case the error is sent to the client. 1 ERROR ; In this case the error is sent to the client.
*/ */
bool check_change_password(THD *thd, const char *host, const char *user, int check_change_password(THD *thd, const char *host, const char *user,
char *new_password, uint new_password_len) char *new_password, uint new_password_len)
{ {
if (!initialized) if (!initialized)
...@@ -2922,7 +2922,7 @@ table_error: ...@@ -2922,7 +2922,7 @@ table_error:
TRUE error TRUE error
*/ */
bool mysql_table_grant(THD *thd, TABLE_LIST *table_list, int mysql_table_grant(THD *thd, TABLE_LIST *table_list,
List <LEX_USER> &user_list, List <LEX_USER> &user_list,
List <LEX_COLUMN> &columns, ulong rights, List <LEX_COLUMN> &columns, ulong rights,
bool revoke_grant) bool revoke_grant)
...@@ -6087,7 +6087,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name, ...@@ -6087,7 +6087,7 @@ bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
< 0 Error. Error message not yet sent. < 0 Error. Error message not yet sent.
*/ */
bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, int sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name,
bool is_proc) bool is_proc)
{ {
Security_context *sctx= thd->security_ctx; Security_context *sctx= thd->security_ctx;
......
sql/sql_acl.h
View file @ f6871c0d
...@@ -222,13 +222,13 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd, ...@@ -222,13 +222,13 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd,
bool acl_getroot_no_password(Security_context *sctx, char *user, char *host, bool acl_getroot_no_password(Security_context *sctx, char *user, char *host,
char *ip, char *db); char *ip, char *db);
bool acl_check_host(const char *host, const char *ip); bool acl_check_host(const char *host, const char *ip);
bool check_change_password(THD *thd, const char *host, const char *user, int check_change_password(THD *thd, const char *host, const char *user,
char *password, uint password_len); char *password, uint password_len);
bool change_password(THD *thd, const char *host, const char *user, bool change_password(THD *thd, const char *host, const char *user,
char *password); char *password);
bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list, bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list,
ulong rights, bool revoke); ulong rights, bool revoke);
bool mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list, int mysql_table_grant(THD *thd, TABLE_LIST *table, List <LEX_USER> &user_list,
List <LEX_COLUMN> &column_list, ulong rights, List <LEX_COLUMN> &column_list, ulong rights,
bool revoke); bool revoke);
bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc, bool mysql_routine_grant(THD *thd, TABLE_LIST *table, bool is_proc,
...@@ -264,7 +264,7 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant, ...@@ -264,7 +264,7 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant,
const char *db, const char *table); const char *db, const char *table);
bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name, bool sp_revoke_privileges(THD *thd, const char *sp_db, const char *sp_name,
bool is_proc); bool is_proc);
bool sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name, int sp_grant_privileges(THD *thd, const char *sp_db, const char *sp_name,
bool is_proc); bool is_proc);
bool check_routine_level_acl(THD *thd, const char *db, const char *name, bool check_routine_level_acl(THD *thd, const char *db, const char *name,
bool is_proc); bool is_proc);
......
sql/sql_analyse.cc
View file @ f6871c0d
...@@ -682,7 +682,7 @@ int analyse::send_row(List<Item> & /* field_list */) ...@@ -682,7 +682,7 @@ int analyse::send_row(List<Item> & /* field_list */)
} // analyse::send_row } // analyse::send_row
bool analyse::end_of_records() int analyse::end_of_records()
{ {
field_info **f = f_info; field_info **f = f_info;
char buff[MAX_FIELD_WIDTH]; char buff[MAX_FIELD_WIDTH];
......
sql/sql_analyse.h
View file @ f6871c0d
...@@ -350,7 +350,7 @@ public: ...@@ -350,7 +350,7 @@ public:
virtual bool change_columns(List<Item> &fields); virtual bool change_columns(List<Item> &fields);
virtual int send_row(List<Item> &field_list); virtual int send_row(List<Item> &field_list);
virtual void end_group(void) {} virtual void end_group(void) {}
virtual bool end_of_records(void); virtual int end_of_records(void);
friend Procedure *proc_analyse_init(THD *thd, ORDER *param, friend Procedure *proc_analyse_init(THD *thd, ORDER *param,
select_result *result, select_result *result,
List<Item> &field_list); List<Item> &field_list);
......
sql/sql_base.cc
View file @ f6871c0d
...@@ -4865,7 +4865,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type, ...@@ -4865,7 +4865,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type,
the third argument set appropriately. the third argument set appropriately.
*/ */
bool open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived) int open_and_lock_tables_derived(THD *thd, TABLE_LIST *tables, bool derived)
{ {
uint counter; uint counter;
bool need_reopen; bool need_reopen;
......
sql/sql_db.cc
View file @ f6871c0d
...@@ -606,7 +606,7 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name) ...@@ -606,7 +606,7 @@ CHARSET_INFO *get_default_db_collation(THD *thd, const char *db_name)
*/ */
bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, int mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
bool silent) bool silent)
{ {
char path[FN_REFLEN+16]; char path[FN_REFLEN+16];
......
sql/sql_delete.cc
View file @ f6871c0d
...@@ -411,7 +411,7 @@ cleanup: ...@@ -411,7 +411,7 @@ cleanup:
FALSE OK FALSE OK
TRUE error TRUE error
*/ */
bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds)
{ {
Item *fake_conds= 0; Item *fake_conds= 0;
SELECT_LEX *select_lex= &thd->lex->select_lex; SELECT_LEX *select_lex= &thd->lex->select_lex;
...@@ -474,7 +474,7 @@ extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b) ...@@ -474,7 +474,7 @@ extern "C" int refpos_order_cmp(void* arg, const void *a,const void *b)
TRUE Error TRUE Error
*/ */
bool mysql_multi_delete_prepare(THD *thd) int mysql_multi_delete_prepare(THD *thd)
{ {
LEX *lex= thd->lex; LEX *lex= thd->lex;
TABLE_LIST *aux_tables= (TABLE_LIST *)lex->auxiliary_table_list.first; TABLE_LIST *aux_tables= (TABLE_LIST *)lex->auxiliary_table_list.first;
......
sql/sql_load.cc
View file @ f6871c0d
...@@ -110,7 +110,7 @@ static bool write_execute_load_query_log_event(THD *thd, ...@@ -110,7 +110,7 @@ static bool write_execute_load_query_log_event(THD *thd,
TRUE - error / FALSE - success TRUE - error / FALSE - success
*/ */
bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
List<Item> &fields_vars, List<Item> &set_fields, List<Item> &fields_vars, List<Item> &set_fields,
List<Item> &set_values, List<Item> &set_values,
enum enum_duplicates handle_duplicates, bool ignore, enum enum_duplicates handle_duplicates, bool ignore,
......
sql/sql_parse.cc
View file @ f6871c0d
...@@ -1856,10 +1856,10 @@ bool sp_process_definer(THD *thd) ...@@ -1856,10 +1856,10 @@ bool sp_process_definer(THD *thd)
TRUE Error TRUE Error
*/ */
bool int
mysql_execute_command(THD *thd) mysql_execute_command(THD *thd)
{ {
bool res= FALSE; int res= FALSE;
bool need_start_waiting= FALSE; // have protection against global read lock bool need_start_waiting= FALSE; // have protection against global read lock
int up_result= 0; int up_result= 0;
LEX *lex= thd->lex; LEX *lex= thd->lex;
......
sql/sql_prepare.cc
View file @ f6871c0d
...@@ -1415,7 +1415,7 @@ error: ...@@ -1415,7 +1415,7 @@ error:
*/ */
static bool select_like_stmt_test(Prepared_statement *stmt, static bool select_like_stmt_test(Prepared_statement *stmt,
bool (*specific_prepare)(THD *thd), int (*specific_prepare)(THD *thd),
ulong setup_tables_done_option) ulong setup_tables_done_option)
{ {
DBUG_ENTER("select_like_stmt_test"); DBUG_ENTER("select_like_stmt_test");
...@@ -1452,7 +1452,7 @@ static bool select_like_stmt_test(Prepared_statement *stmt, ...@@ -1452,7 +1452,7 @@ static bool select_like_stmt_test(Prepared_statement *stmt,
static bool static bool
select_like_stmt_test_with_open(Prepared_statement *stmt, select_like_stmt_test_with_open(Prepared_statement *stmt,
TABLE_LIST *tables, TABLE_LIST *tables,
bool (*specific_prepare)(THD *thd), int (*specific_prepare)(THD *thd),
ulong setup_tables_done_option) ulong setup_tables_done_option)
{ {
DBUG_ENTER("select_like_stmt_test_with_open"); DBUG_ENTER("select_like_stmt_test_with_open");
...@@ -1638,7 +1638,7 @@ error: ...@@ -1638,7 +1638,7 @@ error:
uses local tables lists. uses local tables lists.
*/ */
static bool mysql_insert_select_prepare_tester(THD *thd) static int mysql_insert_select_prepare_tester(THD *thd)
{ {
SELECT_LEX *first_select= &thd->lex->select_lex; SELECT_LEX *first_select= &thd->lex->select_lex;
TABLE_LIST *second_table= ((TABLE_LIST*)first_select->table_list.first)-> TABLE_LIST *second_table= ((TABLE_LIST*)first_select->table_list.first)->
......
sql/sql_update.cc
View file @ f6871c0d
...@@ -930,7 +930,7 @@ static table_map get_table_map(List<Item> *items) ...@@ -930,7 +930,7 @@ static table_map get_table_map(List<Item> *items)
TRUE Error TRUE Error
*/ */
bool mysql_multi_update_prepare(THD *thd) int mysql_multi_update_prepare(THD *thd)
{ {
LEX *lex= thd->lex; LEX *lex= thd->lex;
TABLE_LIST *table_list= lex->query_tables; TABLE_LIST *table_list= lex->query_tables;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7