diff options
| author | monty@mashka.mysql.fi <> | 2004-02-22 00:40:50 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2004-02-22 00:40:50 +0200 |
| commit | 349358a95ba34b03ee70a4f3935324f605d1e4ed (patch) | |
| tree | e158519da33d14c3eafeab1668dfb0f3f661a8ac | |
| parent | 9c636d3beb1550b81a8a9e407f4021938d04e5cd (diff) | |
| parent | fdc4a35c94b2d105f1134c0c962412f689eda1b0 (diff) | |
| download | mariadb-git-349358a95ba34b03ee70a4f3935324f605d1e4ed.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
| -rw-r--r-- | libmysql/libmysql.c | 3 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
2 files changed, 3 insertions, 1 deletions
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 diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 5add9199ad4..27217f24cde 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3364,6 +3364,7 @@ keyword: | MASTER_PASSWORD_SYM {} | MASTER_SERVER_ID_SYM {} | MASTER_CONNECT_RETRY_SYM {} + | MASTER_SERVER_ID_SYM {} | MAX_CONNECTIONS_PER_HOUR {} | MAX_QUERIES_PER_HOUR {} | MAX_UPDATES_PER_HOUR {} |