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

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

CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -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_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")

    SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")

    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")

include/config-win.h

+1 −3
Original line number Diff line number Diff line
@@ -158,14 +158,12 @@ typedef uint rf_SetTimer; 


#define Socket_defined

#define my_socket SOCKET

#define bool BOOL

#define SIGPIPE SIGINT

#define RETQSORTTYPE void

#define QSORT_TYPE_IS_VOID

#define RETSIGTYPE void

#define SOCKET_SIZE_TYPE int

#define my_socket_defined

#define bool_defined

#define byte_defined

#define HUGE_PTR

#define STDCALL __stdcall	    /* Used by libmysql.dll */
@@ -472,4 +470,4 @@ inline double ulonglong2double(ulonglong value) 
#define HAVE_CHARSET_ujis 1

#define HAVE_CHARSET_utf8 1

#define HAVE_UCA_COLLATIONS 1

#define HAVE_BOOL 1

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ typedef uint8 int7; /* Most effective integer 0 <= x <= 127 */ 
typedef short		int15;	/* Most effective integer 0 <= x <= 32767 */

typedef int		myf;	/* Type of MyFlags in my_funcs */

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 */

#endif

	/* Macros for converting *constants* to the right type */

sql/mysql_priv.h

+9 −9
Original line number Diff line number Diff line
@@ -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_delete_precheck(THD *thd, TABLE_LIST *tables);

bool mysql_multi_update_prepare(THD *thd);

bool mysql_multi_delete_prepare(THD *thd);

int mysql_multi_update_prepare(THD *thd);

int mysql_multi_delete_prepare(THD *thd);

bool mysql_insert_select_prepare(THD *thd);

bool update_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); 
bool login_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_rm_db(THD *thd,char *db,bool if_exists, bool silent);

bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db);
@@ -1022,7 +1022,7 @@ void init_max_user_conn(void); 
void init_update_queries(void);

void free_max_user_conn(void);

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 dispatch_command(enum enum_server_command command, THD *thd,

		      char* packet, uint packet_length);
@@ -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,

                                           TABLE_LIST *table_list);

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,

                  SQL_LIST *order, ha_rows rows, ulonglong options,

                  bool reset_auto_increment);
@@ -1472,14 +1472,14 @@ void wait_for_condition(THD *thd, pthread_mutex_t *mutex, 
                        pthread_cond_t *cond);

int open_tables(THD *thd, TABLE_LIST **tables, uint *counter, uint flags);

/* 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 */

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);

}

/* 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);

}
@@ -1708,7 +1708,7 @@ inline TABLE_LIST *find_table_in_local_list(TABLE_LIST *table, 
bool eval_const_cond(COND *cond);



/* 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> &set_values_list,

                enum enum_duplicates handle_duplicates, bool ignore,

sql/procedure.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ class Procedure { 
  virtual int send_row(List<Item> &fields)=0;

  virtual bool change_columns(List<Item> &fields)=0;

  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,