Commit 15f626c2 authored by unknown's avatar unknown
Browse files

BUG#12532: Fixes after review 


sql/log_event.cc:
  Review fixes
sql/sql_parse.cc:
  Review fixes
parent 7271ea25

sql/log_event.cc

+6 −7
Original line number Diff line number Diff line
@@ -1330,13 +1330,12 @@ Query_log_event::Query_log_event(const char* buf, uint event_len, 
  

  if (!(start= data_buf = (char*) my_malloc(catalog_len + 1 +

                                            time_zone_len + 1 +

                                            data_len + 1 +

#ifndef MYSQL_CLIENT

#ifdef HAVE_QUERY_CACHE

					    QUERY_CACHE_FLAGS_SIZE +

#endif

                                            data_len + 1

#if !defined(MYSQL_CLIENT) && defined(HAVE_QUERY_CACHE)

					    + QUERY_CACHE_FLAGS_SIZE +

					    db_len + 1

#endif

					    db_len + 1, MYF(MY_WME))))

					    , MYF(MY_WME))))

      DBUG_VOID_RETURN;

  if (catalog_len)                                  // If catalog is given

  {

sql/sql_parse.cc

+2 −1
Original line number Diff line number Diff line
@@ -1218,7 +1218,8 @@ extern "C" pthread_handler_decl(handle_bootstrap,arg) 
      length--;

    buff[length]=0;

    thd->query_length=length;

    thd->query= thd->memdup_w_gap(buff, length+1, thd->db_length+1);

    thd->query= thd->memdup_w_gap(buff, length+1, 

				  thd->db_length+1+QUERY_CACHE_FLAGS_SIZE);

    thd->query[length] = '\0';

    /*

      We don't need to obtain LOCK_thread_count here because in bootstrap