Commit 82257f94 authored by unknown's avatar unknown
Browse files

after merge 


sql/item_row.cc:
  ds20 compat fix
parent 94a39ec6

sql/item_row.cc

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ bool Item_row::fix_fields(THD *thd, TABLE_LIST *tabl, Item **ref) 
    // we can't assign 'item' before, because fix_fields() can change arg

    Item *item= *arg;

    used_tables_cache |= item->used_tables();

    if (const_item_cache&= item->const_item() && !with_null)

    const_item_cache&= item->const_item() && !with_null;

    if (const_item_cache)

    {

      if (item->cols() > 1)

	with_null|= item->null_inside();

sql/log.cc

+19 −19
Original line number Diff line number Diff line
@@ -2200,6 +2200,8 @@ void MYSQL_LOG::report_pos_in_innodb() 
                                               my_b_tell(&log_file));

  }

#endif

  DBUG_VOID_RETURN;

}



#ifdef __NT__

void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen)
@@ -2241,7 +2243,6 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen) 
  if (buffptr != buff)

    delete[] buffptr;





  DBUG_VOID_RETURN;

}

#endif
@@ -2267,7 +2268,6 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen) 
void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)

{

  char   buff[1024];



  DBUG_ENTER("vprint_msg_to_log");



  my_vsnprintf(buff, sizeof(buff)-5, format, args);

sql/sql_base.cc

+2 −2
Original line number Diff line number Diff line
@@ -2450,7 +2450,7 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name, 
  {

    /* convert database to lower case for comparison */

    strmake(name_buff, db_name, sizeof(name_buff)-1);

    casedn_str( name_buff );

    my_casedn_str(system_charset_info,name_buff);

    db_name = name_buff;

  }

tests/client_test.c

+1 −1
Original line number Diff line number Diff line
@@ -10142,7 +10142,7 @@ static void get_options(int argc, char **argv) 
  int ho_error;



  if ((ho_error= handle_options(&argc, &argv, client_test_long_options,

                                get_one_option)))

                                get_one_option, 0)))

    exit(ho_error);



  if (tty_password)