database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Gluh asked me to do it

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2003-01-31 11:41:39 +04:00
parent c7485119ab
commit 37fdb93d7c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/mysqlbinlog.cc
View File

@ -18,6 +18,7 @@
#undef MYSQL_SERVER #undef MYSQL_SERVER
#include "client_priv.h" #include "client_priv.h"
#include <time.h> #include <time.h>
#include <assert.h>
#include "log_event.h" #include "log_event.h"
#define BIN_LOG_HEADER_SIZE 4 #define BIN_LOG_HEADER_SIZE 4

7
sql/log_event.cc
View File

@ -1999,7 +1999,7 @@ int Rand_log_event::exec_event(struct st_relay_log_info* rli)
User_var_log_event::pack_info() User_var_log_event::pack_info()
****************************************************************************/ ****************************************************************************/
#ifndef MYSQL_CLIENT #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
void User_var_log_event::pack_info(Protocol* protocol) void User_var_log_event::pack_info(Protocol* protocol)
{ {
char *buf= 0; char *buf= 0;
@ -2112,9 +2112,7 @@ int User_var_log_event::write_data(IO_CACHE* file)
pos= val; pos= val;
break; break;
case ROW_RESULT: case ROW_RESULT:
#ifndef MYSQL_CLIENT
DBUG_ASSERT(1); DBUG_ASSERT(1);
#endif
return 0; return 0;
} }
return (my_b_safe_write(file, (byte*) buf, sizeof(buf)) || return (my_b_safe_write(file, (byte*) buf, sizeof(buf)) ||
@ -2166,6 +2164,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
fprintf(file, ":='%s';\n", val); fprintf(file, ":='%s';\n", val);
break; break;
case ROW_RESULT: case ROW_RESULT:
DBUG_ASSERT(1);
return; return;
} }
} }
@ -2178,7 +2177,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
User_var_log_event::exec_event() User_var_log_event::exec_event()
****************************************************************************/ ****************************************************************************/
#ifndef MYSQL_CLIENT #if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
int User_var_log_event::exec_event(struct st_relay_log_info* rli) int User_var_log_event::exec_event(struct st_relay_log_info* rli)
{ {
Item *it= 0; Item *it= 0;