Commit d87f4998 authored Mar 02, 2001 by jcole@tetra.spaceapes.com

Merge work.mysql.com:/home/bk/mysql

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql

parents ebf34516 ab60ef6d

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		heikki@donna.mysql.fi
		jcole@tetra.spaceapes.com
		mwagner@evoq.mwagner.org
		sasha@mysql.sashanet.com
		serg@serg.mysql.com

include/mysqld_error.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -204,4 +204,5 @@
		#define ER_MASTER_INFO 1201
		#define ER_SLAVE_THREAD 1202
		#define ER_TOO_MANY_USER_CONNECTIONS 1203
		#define ER_ERROR_MESSAGES 204
		#define ER_SET_CONSTANTS_ONLY 1204
		#define ER_ERROR_MESSAGES 205

sql/share/czech/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,3 +214,4 @@
		"Could not initialize master info structure, check permisions on master.info",
		"Could not create slave thread, check system resources",
		"User %-.64s has already more than 'max_user_connections' active connections",
		"You may only use constant expressions with SET",

sql/share/danish/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -208,3 +208,4 @@
		"Could not initialize master info structure, check permisions on master.info",
		"Could not create slave thread, check system resources",
		"User %-.64s has already more than 'max_user_connections' active connections",
		"You may only use constant expressions with SET",

sql/share/dutch/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -205,3 +205,4 @@
		"Could not initialize master info structure, check permisions on master.info",
		"Could not create slave thread, check system resources",
		"User %-.64s has already more than 'max_user_connections' active connections",
		"You may only use constant expressions with SET",