mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Cleanup of alarm macros.
Fixed data corruption bug in query cache. Made queries be dependent of the database in use. Docs/manual.texi: Update binary log reference client/mysql.cc: Removed warning include/thr_alarm.h: Cleanup of alarm macros. libmysql/libmysql.c: Portabiliy fix libmysql/net.c: Cleanup of alarm macros. mysql-test/t/rpl_get_lock.test: Fixed results after merge. mysys/my_bitmap.c: Removed warning. sql/log_event.cc: Use thd->db_length sql/mini_client.cc: Cleanup of alarm macros. sql/net_serv.cc: Cleanup of alarm macros. sql/sql_acl.cc: Use thd->db_length sql/sql_cache.cc: Store used database together with the query. sql/sql_class.cc: Use thd->db_length sql/sql_class.h: Use thd->db_length sql/sql_db.cc: Use thd->db_length sql/sql_parse.cc: Use thd->db_length sql/sql_udf.cc: Use thd->db_length
This commit is contained in:
@ -2225,8 +2225,8 @@ send_file_to_server(MYSQL *mysql, const char *filename)
|
||||
my_net_write(&mysql->net,"",0); /* Server needs one packet */
|
||||
net_flush(&mysql->net);
|
||||
mysql->net.last_errno=EE_FILENOTFOUND;
|
||||
snprintf(mysql->net.last_error,sizeof(mysql->net.last_error)-1,
|
||||
EE(mysql->net.last_errno),tmp_name, errno);
|
||||
my_snprintf(mysql->net.last_error,sizeof(mysql->net.last_error)-1,
|
||||
EE(mysql->net.last_errno),tmp_name, errno);
|
||||
goto err;
|
||||
}
|
||||
|
||||
@ -2250,8 +2250,8 @@ send_file_to_server(MYSQL *mysql, const char *filename)
|
||||
if (readcount < 0)
|
||||
{
|
||||
mysql->net.last_errno=EE_READ; /* the errmsg for not entire file read */
|
||||
snprintf(mysql->net.last_error,sizeof(mysql->net.last_error)-1,
|
||||
tmp_name,errno);
|
||||
my_snprintf(mysql->net.last_error,sizeof(mysql->net.last_error)-1,
|
||||
tmp_name,errno);
|
||||
goto err;
|
||||
}
|
||||
result=0; /* Ok */
|
||||
|
Reference in New Issue
Block a user