diff options
author | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
---|---|---|
committer | unknown <venu@myvenu.com> | 2003-02-20 14:14:37 -0800 |
commit | 20e237e5eb2ff47622d7ad12c4085e5e8e4f843a (patch) | |
tree | 5acab851085621a0ba8465cb1069b4dc1e3377cc /sql/protocol.cc | |
parent | 6963b121da9f583c962827dba046b97c2ad8c9a0 (diff) | |
download | mariadb-git-20e237e5eb2ff47622d7ad12c4085e5e8e4f843a.tar.gz |
Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
strings/strto.c:
Windows won't compile for a wrong argument passing, expects a charset pointer
sql/filesort.cc:
Remove unused variable
sql/lex.h:
Change POINT->POINT_SYM due to redefination error from windef.h
sql/mysqld.cc:
Fix Embedded Server related code
sql/protocol.cc:
Remove unused variables from Embedded Server
sql/sql_class.h:
Remove silly usage
sql/sql_derived.cc:
Windows won't let you compile for this kind of assignments
sql/sql_help.cc:
Need a cast to make it compile
sql/sql_parse.cc:
Remove unused variables from Embedded server
sql/sql_yacc.yy:
Change POINT->POINT_SYM due to redefination error from windef.h
mysys/mf_keycache.c:
Add a correct cast and remove the unused variables
libmysqld/lib_sql.cc:
Remove unused variable
libmysqld/libmysqld.c:
Port the netware change to remove mysql_once_init to libmysqld
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index ebee87806db..9a7a913f874 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -55,8 +55,10 @@ inline bool Protocol::convert_str(const char *from, uint length) void send_error(THD *thd, uint sql_errno, const char *err) { +#ifndef EMBEDDED_LIBRARY uint length; char buff[MYSQL_ERRMSG_SIZE+2]; +#endif NET *net= &thd->net; DBUG_ENTER("send_error"); DBUG_PRINT("enter",("sql_errno: %d err: %s", sql_errno, |