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

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
parents e57eaf0c ff0aac17

CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,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
@@ -157,14 +157,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 */
@@ -457,4 +455,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
@@ -980,7 +980,7 @@ typedef int myf; /* Type of MyFlags in my_funcs */ 
typedef char		byte;	/* Smallest addressable unit */

#endif

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/handler.h

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ class handler :public Sql_alloc 
  { return HA_ADMIN_NOT_IMPLEMENTED; }

  /* end of the list of admin commands */



  virtual bool check_and_repair(THD *thd) { return HA_ERR_WRONG_COMMAND; }

  virtual bool check_and_repair(THD *thd) { return TRUE; }

  virtual int dump(THD* thd, int fd = -1) { return HA_ERR_WRONG_COMMAND; }

  virtual int disable_indexes(uint mode) { return HA_ERR_WRONG_COMMAND; }

  virtual int enable_indexes(uint mode) { return HA_ERR_WRONG_COMMAND; }

sql/mysql_priv.h

+7 −7
Original line number Diff line number Diff line
@@ -597,8 +597,8 @@ bool check_merge_table_access(THD *thd, char *db, 
bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc);

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);
@@ -691,7 +691,7 @@ struct Query_cache_query_flags 


uint build_table_path(char *buff, size_t bufflen, const char *db,

                      const char *table, const char *ext);

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

void mysql_binlog_send(THD* thd, char* log_ident, my_off_t pos, ushort flags);
@@ -731,7 +731,7 @@ pthread_handler_t handle_one_connection(void *arg); 
pthread_handler_t handle_bootstrap(void *arg);

void end_thread(THD *thd,bool put_in_cache);

void flush_thread_cache();

bool mysql_execute_command(THD *thd);

int mysql_execute_command(THD *thd);

bool dispatch_command(enum enum_server_command command, THD *thd,

		      char* packet, uint packet_length);

void log_slow_statement(THD *thd);
@@ -862,7 +862,7 @@ void prepare_triggers_for_insert_stmt(THD *thd, TABLE *table, 
                                      enum_duplicates duplic);

void mark_fields_used_by_triggers_for_insert_stmt(THD *thd, TABLE *table,

                                                  enum_duplicates duplic);

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);
@@ -1106,7 +1106,7 @@ int init_ftfuncs(THD *thd, SELECT_LEX* select, bool no_order); 
void wait_for_refresh(THD *thd);

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

int simple_open_n_lock_tables(THD *thd,TABLE_LIST *tables);

bool open_and_lock_tables(THD *thd,TABLE_LIST *tables);

int open_and_lock_tables(THD *thd,TABLE_LIST *tables);

bool open_normal_and_derived_tables(THD *thd, TABLE_LIST *tables, uint flags);

int lock_tables(THD *thd, TABLE_LIST *tables, uint counter, bool *need_reopen);

TABLE *open_temporary_table(THD *thd, const char *path, const char *db,
@@ -1177,7 +1177,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,