Commit 1923ddea authored May 08, 2005 by unknown

Merge bk-internal:/home/bk/mysql-4.1

into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union

parents bee950bd 1a4fd96b

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ mwagner@cash.mwagner.org
		mwagner@evoq.mwagner.org
		mwagner@here.mwagner.org
		mwagner@mysql.com
		mwagner@ultrafly.mysql.com
		mwagner@work.mysql.com
		mydev@mysql.com
		mysql@home.(none)

sql/share/czech/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -331,3 +331,4 @@ character-set=latin2
		"Invalid %s character string: '%.64s'",
		"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
		"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/danish/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -322,3 +322,4 @@ character-set=latin1
		"Invalid %s character string: '%.64s'",
		"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
		"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/dutch/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -331,3 +331,4 @@ character-set=latin1
		"Invalid %s character string: '%.64s'",
		"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
		"Conflicting declarations: '%s%s' and '%s%s'"

sql/share/english/errmsg.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -319,3 +319,4 @@ character-set=latin1
		"Invalid %s character string: '%.64s'",
		"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
		"Conflicting declarations: '%s%s' and '%s%s'"