database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into myvenu.com:/home/venu/bk/src-4.1
This commit is contained in:
venu@myvenu.com
2002-12-05 11:34:15 -08:00
parent dac10a8c81 91558620e0
commit 7ffe639d6e
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysql_priv.h
View File

@ -323,7 +323,6 @@ void free_items(Item *item);
bool alloc_query(THD *thd, char *packet, ulong packet_length); bool alloc_query(THD *thd, char *packet, ulong packet_length);
void mysql_init_select(LEX *lex); void mysql_init_select(LEX *lex);
void mysql_init_query(THD *thd); void mysql_init_query(THD *thd);
void mysql_reset_errors(THD *thd);
bool mysql_new_select(LEX *lex, bool move_down); bool mysql_new_select(LEX *lex, bool move_down);
void create_select_for_variable(const char *var_name); void create_select_for_variable(const char *var_name);
void mysql_init_multi_delete(LEX *lex); void mysql_init_multi_delete(LEX *lex);
@ -528,6 +527,8 @@ int check_insert_fields(THD *thd,TABLE *table,List<Item> &fields,
/* sql_error.cc */ /* sql_error.cc */
void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code, void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code,
const char *msg); const char *msg);
void store_warning(THD *thd, uint errcode, ...);
void mysql_reset_errors(THD *thd);
my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show); my_bool mysqld_show_warnings(THD *thd, ulong levels_to_show);
/* sql_handler.cc */ /* sql_handler.cc */

8
sql/sql_db.cc
View File

@ -331,8 +331,12 @@ int mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
error= -1; error= -1;
my_error(ER_DB_DROP_EXISTS,MYF(0),db); my_error(ER_DB_DROP_EXISTS,MYF(0),db);
} }
else if (!silent) else
send_ok(thd,0); {
store_warning(thd,ER_DB_DROP_EXISTS,db);
if (!silent)
send_ok(thd,0);
}
goto exit; goto exit;
} }
pthread_mutex_lock(&LOCK_open); pthread_mutex_lock(&LOCK_open);

26
sql/sql_error.cc
View File

@ -104,6 +104,32 @@ void push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code,
thd->total_warn_count++; thd->total_warn_count++;
} }
/*
Store warning to the list
*/
void store_warning(THD *thd, uint errcode, ...)
{
va_list args;
const char *format;
char warning[ERRMSGSIZE+20];
DBUG_ENTER("store_warning");
DBUG_PRINT("enter",("warning: %u",errcode));
va_start(args,errcode);
if (errcode)
format= ER(errcode);
else
{
format=va_arg(args,char*);
errcode= ER_UNKNOWN_ERROR;
}
(void) vsprintf (warning,format,args);
va_end(args);
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, errcode, warning);
DBUG_VOID_RETURN;
}
/* /*
Send all notes, errors or warnings to the client in a result set Send all notes, errors or warnings to the client in a result set

6
sql/sql_table.cc
View File

@ -163,8 +163,10 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
if (access(path,F_OK)) if (access(path,F_OK))
{ {
if (!if_exists) if (if_exists)
error=1; store_warning(thd, ER_BAD_TABLE_ERROR, table->real_name);
else
error= 1;
} }
else else
{ {