1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into mashka.mysql.fi:/home/my/mysql-4.0
This commit is contained in:
monty@mashka.mysql.fi 2004-02-22 00:40:50 +02:00
commit 349358a95b
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libmysql/libmysql.c
View File

@ -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

1
sql/sql_yacc.yy
View File

@ -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 {}