diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-23 21:49:28 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-23 21:49:28 +0200 |
| commit | 36b25ee59a4779e5f34c922bdf78360c58d4c108 (patch) | |
| tree | 375d93b375cef0b45b2ea1747ebad44e8f99b534 /libmysqld | |
| parent | 897c374bca3277448de09177351cda6fee56676e (diff) | |
| download | mariadb-git-36b25ee59a4779e5f34c922bdf78360c58d4c108.tar.gz | |
Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements)
include/errmsg.h:
Remove compiler warning
libmysql/libmysql.c:
Avoid memory overruns when buffer_length is too small
libmysqld/lib_sql.cc:
Fixed function name
sql/mysqld.cc:
Code cleanup; Added back shared memory support (which was accidently deleted)
sql/sql_parse.cc:
Clean up multi-query
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/lib_sql.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 04aeca71a20..714d9cc02f7 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -47,8 +47,9 @@ static bool check_user(THD *thd, enum_server_command command, char * get_mysql_home(){ return mysql_home;}; char * get_mysql_real_data_home(){ return mysql_real_data_home;}; -my_bool simple_command(MYSQL *mysql,enum enum_server_command command, const char *arg, - ulong length, my_bool skipp_check) +my_bool simple_command(MYSQL *mysql,enum enum_server_command command, + const char *arg, + ulong length, my_bool skipp_check) { my_bool result= 1; THD *thd=(THD *) mysql->thd; @@ -56,7 +57,8 @@ my_bool simple_command(MYSQL *mysql,enum enum_server_command command, const char /* Check that we are calling the client functions in right order */ if (mysql->status != MYSQL_STATUS_READY) { - strmov(thd->net.last_error,ER(thd->net.last_errno=CR_COMMANDS_OUT_OF_SYNC)); + strmov(thd->net.last_error, + ER(thd->net.last_errno=CR_COMMANDS_OUT_OF_SYNC)); return 1; } @@ -199,7 +201,7 @@ int STDCALL mysql_server_init(int argc, char **argv, char **groups) if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0]) opt_mysql_tmpdir=(char*) P_tmpdir; /* purecov: inspected */ - if (init_thread_environement()) + if (init_thread_environment()) { mysql_server_end(); return 1; |