Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
8f0cdf54 · joreland@mysql.com · 670de075 · 07be090e · 8f0cdf54
Commit 8f0cdf54 authored Jan 20, 2005 by joreland@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/share/japanese-sjis/errmsg.txt sql/share/japanese-sjis/errmsg.txt +2 -2

No files found.
--- a/sql/share/japanese-sjis/errmsg.txt
+++ b/sql/share/japanese-sjis/errmsg.txt
@@ -15,10 +15,10 @@
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 /*
-   3.22.10-beta   euc-japanese (ujis) text
+   Shift-JIS Japanese
 */
-character-set=ujis
+character-set=sjis
 "hashchk",
 "isamchk",