1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge bk@192.168.21.1:mysql-5.1-opt

into  mysql.com:/home/hf/work/25097/my51-25097


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/log.cc:
  Auto merged
This commit is contained in:
unknown
2008-02-27 13:54:34 +04:00
6 changed files with 36 additions and 17 deletions

View File

@@ -38,6 +38,8 @@ C_MODE_START
#include <sql_common.h>
#include "embedded_priv.h"
extern unsigned int mysql_server_last_errno;
extern char mysql_server_last_error[MYSQL_ERRMSG_SIZE];
static my_bool emb_read_query_result(MYSQL *mysql);
@@ -1122,3 +1124,12 @@ bool Protocol::net_store_data(const uchar *from, size_t length)
return FALSE;
}
int vprint_msg_to_log(enum loglevel level __attribute__((unused)),
const char *format, va_list argsi)
{
vsnprintf(mysql_server_last_error, sizeof(mysql_server_last_error),
format, argsi);
mysql_server_last_errno= CR_UNKNOWN_ERROR;
return 0;
}