From f816e51096d7c920504d4a3d0adff74cd9684917 Mon Sep 17 00:00:00 2001 From: "monty@mashka.mysql.fi" <> Date: Fri, 20 Feb 2004 17:58:34 +0200 Subject: [PATCH 1/2] Added missing argument to strxnmov() (Applies for windows debug mode) --- libmysql/libmysql.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index febae456fb2..f86435712dc 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -696,7 +696,8 @@ mysql_debug(const char *debug __attribute__((unused))) #else { char buff[80]; - strxnmov(buff,sizeof(buff),"libmysql: ", env); + buff[sizeof(buff)-1]= 0; + strxnmov(buff,sizeof(buff)-1,"libmysql: ", env, NullS); MessageBox((HWND) 0,"Debugging variable MYSQL_DEBUG used",buff,MB_OK); } #endif From fdc4a35c94b2d105f1134c0c962412f689eda1b0 Mon Sep 17 00:00:00 2001 From: "monty@mashka.mysql.fi" <> Date: Sun, 22 Feb 2004 00:38:05 +0200 Subject: [PATCH 2/2] change that master_server_id is not a restricted word --- sql/sql_yacc.yy | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 4b8e73f35ce..870e640ebe0 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3363,6 +3363,7 @@ keyword: | MASTER_USER_SYM {} | MASTER_PASSWORD_SYM {} | MASTER_CONNECT_RETRY_SYM {} + | MASTER_SERVER_ID_SYM {} | MAX_CONNECTIONS_PER_HOUR {} | MAX_QUERIES_PER_HOUR {} | MAX_UPDATES_PER_HOUR {}