Commit 261acdbb authored by tnurnberg@sin.intern.azundris.com's avatar tnurnberg@sin.intern.azundris.com
Browse files

Merge sin.intern.azundris.com:/home/tnurnberg/27198/41-27198 

into  sin.intern.azundris.com:/home/tnurnberg/27198/50-27198
parents 0a308745 7dbf738f

sql/mysql_priv.h

+10 −8
Original line number Diff line number Diff line
@@ -617,6 +617,16 @@ enum enum_mysql_completiontype { 
int end_trans(THD *thd, enum enum_mysql_completiontype completion);



Item *negate_expression(THD *thd, Item *expr);



/* log.cc */

void sql_perror(const char *message);



void vprint_msg_to_log(enum loglevel level, const char *format, va_list args);

void sql_print_error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);

void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);

void sql_print_information(const char *format, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);



#include "sql_class.h"

#include "sql_acl.h"

#include "tztime.h"
@@ -1198,14 +1208,6 @@ bool is_key_used(TABLE *table, uint idx, List<Item> &fields); 
int key_cmp(KEY_PART_INFO *key_part, const byte *key, uint key_length);



bool init_errmessage(void);

void sql_perror(const char *message);



void vprint_msg_to_log(enum loglevel level, const char *format, va_list args);

void sql_print_error(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);

void sql_print_warning(const char *format, ...) ATTRIBUTE_FORMAT(printf, 1, 2);

void sql_print_information(const char *format, ...)

  ATTRIBUTE_FORMAT(printf, 1, 2);





bool fn_format_relative_to_data_home(my_string to, const char *name,

				     const char *dir, const char *extension);

sql/sql_class.h

+19 −3
Original line number Diff line number Diff line
@@ -1588,11 +1588,27 @@ class THD :public Statement, 
    proc_info = old_msg;

    pthread_mutex_unlock(&mysys_var->mutex);

  }



  static inline void safe_time(time_t *t)

  {

    /**

       Wrapper around time() which retries on error (-1)



       @details

       This is needed because, despite the documentation, time() may fail

       in some circumstances.  Here we retry time() until it succeeds, and

       log the failure so that performance problems related to this can be

       identified.

    */

    while(unlikely(time(t) == ((time_t) -1)))

      sql_print_information("time() failed with %d", errno);

  }



  inline time_t query_start() { query_start_used=1; return start_time; }

  inline void	set_time()    { if (user_time) start_time=time_after_lock=user_time; else time_after_lock=time(&start_time); }

  inline void	end_time()    { time(&start_time); }

  inline void	set_time()    { if (user_time) start_time=time_after_lock=user_time; else { safe_time(&start_time); time_after_lock= start_time; }}

  inline void	end_time()    { safe_time(&start_time); }

  inline void	set_time(time_t t) { time_after_lock=start_time=user_time=t; }

  inline void	lock_time()   { time(&time_after_lock); }

  inline void	lock_time()   { safe_time(&time_after_lock); }

  inline void	insert_id(ulonglong id_arg)

  {

    last_insert_id= id_arg;