diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-17 23:46:53 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-17 23:46:53 +0300 |
| commit | f0fbecca27b1a5b754636b9372b37454c28ec336 (patch) | |
| tree | c51e7c970efa7653918302f4513422428385158d /sql/net_pkg.cc | |
| parent | ddcc49ec62c271a4f022a673b39c8693ed4e7a86 (diff) | |
| download | mariadb-git-f0fbecca27b1a5b754636b9372b37454c28ec336.tar.gz | |
fixed so that --ssl and --skip-ssl works with the MySQL clients.
Fixed core dump bug when sending wrong string to AES_DECRYPT()
BitKeeper/deleted/.del-explain_log.sh~e570be5f63576fe1:
Delete: scripts/explain_log.sh
Docs/manual.texi:
Updated bug reporting. Added somew new changelog entries and changed some old
client/mysql.cc:
Fixed so that --ssl and --skip-ssl works
client/mysqladmin.c:
Fixed so that --ssl and --skip-ssl works
client/mysqlcheck.c:
Fixed so that --ssl and --skip-ssl works
client/mysqldump.c:
Fixed so that --ssl and --skip-ssl works
client/mysqlimport.c:
Fixed so that --ssl and --skip-ssl works
client/mysqlshow.c:
Fixed so that --ssl and --skip-ssl works
include/sslopt-case.h:
Fixed so that --ssl and --skip-ssl works
mysql-test/r/func_str.result:
Test of problem with AES_DECRYPT()
mysql-test/t/func_str.test:
Test of problem with AES_DECRYPT()
mysys/my_aes.c:
Fixed problem with wrong decrypt string.
scripts/mysql_explain_log.sh:
Applied missed patch
sql/item_strfunc.cc:
Fixed aes_encrypt() and aes_decrypt() to be safer and avoid some mallocs()
sql/net_pkg.cc:
Return ER_UNKNOWN_ERROR instead of errocode 0 in some cases.
Diffstat (limited to 'sql/net_pkg.cc')
| -rw-r--r-- | sql/net_pkg.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/net_pkg.cc b/sql/net_pkg.cc index 55c9bd3cfab..8bb601cebcf 100644 --- a/sql/net_pkg.cc +++ b/sql/net_pkg.cc @@ -115,7 +115,13 @@ net_printf(NET *net, uint errcode, ...) 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*); + if (errcode) + format= ER(errcode); + else + { + format=va_arg(args,char*); + errcode= ER_UNKNOWN_ERROR; + } offset= net->return_errno ? 2 : 0; text_pos=(char*) net->buff+head_length+offset+1; (void) vsprintf(my_const_cast(char*) (text_pos),format,args); |