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

into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 10:12:26 +01:00 · 2005-01-20 10:12:26 +01:00 · 8f0cdf54ee
commit 8f0cdf54ee
parent 670de075ff 07be090e6e
1 changed files with 2 additions and 2 deletions
--- 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",