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

into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_yacc.yy:
  Auto merged

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

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