database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

after merge

Browse Source
This commit is contained in:
serg@serg.mylan
2004-08-26 18:22:22 +02:00
parent 5633414c8f
commit 08f3ba0e29
4 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_row.cc
View File

@ -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 // we can't assign 'item' before, because fix_fields() can change arg
Item *item= *arg; Item *item= *arg;
used_tables_cache |= item->used_tables(); 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) if (item->cols() > 1)
with_null|= item->null_inside(); with_null|= item->null_inside();

4
sql/log.cc
View File

@ -2200,6 +2200,8 @@ void MYSQL_LOG::report_pos_in_innodb()
my_b_tell(&log_file)); my_b_tell(&log_file));
} }
#endif #endif
DBUG_VOID_RETURN;
}
#ifdef __NT__ #ifdef __NT__
void print_buffer_to_nt_eventlog(enum loglevel level, char *buff, int buffLen) 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) if (buffptr != buff)
delete[] buffptr; delete[] buffptr;
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
#endif #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) void vprint_msg_to_log(enum loglevel level, const char *format, va_list args)
{ {
char buff[1024]; char buff[1024];
DBUG_ENTER("vprint_msg_to_log"); DBUG_ENTER("vprint_msg_to_log");
my_vsnprintf(buff, sizeof(buff)-5, format, args); my_vsnprintf(buff, sizeof(buff)-5, format, args);

4
sql/sql_base.cc
View File

@ -2449,8 +2449,8 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
if (db_name && lower_case_table_names) if (db_name && lower_case_table_names)
{ {
/* convert database to lower case for comparison */ /* convert database to lower case for comparison */
strmake( name_buff, db_name, sizeof(name_buff)-1 ); 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; db_name = name_buff;
} }

2
tests/client_test.c
View File

@ -10142,7 +10142,7 @@ static void get_options(int argc, char **argv)
int ho_error; int ho_error;
if ((ho_error= handle_options(&argc, &argv, client_test_long_options, if ((ho_error= handle_options(&argc, &argv, client_test_long_options,
get_one_option))) get_one_option, 0)))
exit(ho_error); exit(ho_error);
if (tty_password) if (tty_password)