diff options
author | unknown <monty@hundin.mysql.fi> | 2002-04-02 17:54:57 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-04-02 17:54:57 +0300 |
commit | c95270b8c4b320c1080acc03da99e2a33c80440b (patch) | |
tree | 0918e7f417ac64ab19af6ea441c12c97e897c1b9 /sql/net_pkg.cc | |
parent | 546b6a679ff5f42e5ee5433982a2fb4daa256344 (diff) | |
download | mariadb-git-c95270b8c4b320c1080acc03da99e2a33c80440b.tar.gz |
Cleanups
Don't use DBUG library for struct st_my_thread_var to make code less complicated.
Docs/manual.texi:
Cleanup
acinclude.m4:
Search after openssl in /usr/local
client/mysql.cc:
Fix prompt
client/mysqladmin.c:
Cleanup
client/mysqltest.c:
Cleanup
include/my_pthread.h:
Move thread variables to the right location
include/my_sys.h:
Move thread variables to the right location
include/mysql.h:
Clean up client prototypes
libmysql/libmysql.c:
Clean up client prototypes
mysys/my_static.h:
Cleanup
mysys/my_thr_init.c:
Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
Small optimization
sql/net_pkg.cc:
Cleanup
sql/sql_parse.cc:
Allow VARCHAR(0)
Diffstat (limited to 'sql/net_pkg.cc')
-rw-r--r-- | sql/net_pkg.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sql/net_pkg.cc b/sql/net_pkg.cc index 9e52e4580e6..1ab3e18424f 100644 --- a/sql/net_pkg.cc +++ b/sql/net_pkg.cc @@ -108,10 +108,12 @@ net_printf(NET *net, uint errcode, ...) thd->query_error = 1; // if we are here, something is wrong :-) query_cache_abort(net); // Safety va_start(args,errcode); - // Sasha: this is needed to make net_printf() work with 0 argument for - // errorcode and use the argument after that as the format string. This - // is usefull for rare errors that are not worth the hassle to put in - // errmsg.sys, but at the same time, the message is not fixed text + /* + The following is needed to make net_printf() work with 0 argument for + errorcode and use the argument after that as the format string. This + is useful for rare errors that are not worth the hassle to put in + errmsg.sys, but at the same time, the message is not fixed text + */ format=errcode ? ER(errcode) : va_arg(args,char*); offset= net->return_errno ? 2 : 0; text_pos=(char*) net->buff+head_length+offset+1; |