diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-09-03 10:06:10 +0300 |
| commit | 9dea4a4cd1ac246004dc9d223cfc606a7dea5567 (patch) | |
| tree | 47d958e5060fcfc773f2874d7abccdd221a738cf /sql/mysqld.cc | |
| parent | 3a9dabd6765e7dad0cbd6949ac275487f72696d2 (diff) | |
| parent | 3fbcafea9c5e85dc6315f0b89872ac5e273195c8 (diff) | |
| download | mariadb-git-9dea4a4cd1ac246004dc9d223cfc606a7dea5567.tar.gz | |
merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 59630644e5a..99099ff1bac 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1608,8 +1608,9 @@ static int my_message_sql(uint error, const char *str, NET *net; DBUG_ENTER("my_message_sql"); DBUG_PRINT("error",("Message: '%s'",str)); - if ((net=my_pthread_getspecific_ptr(NET*,THR_NET))) + if ((net= my_pthread_getspecific_ptr(NET*,THR_NET))) { + net->report_error= 1; if (!net->last_error[0]) // Return only first message { strmake(net->last_error,str,sizeof(net->last_error)-1); |