Commit 25d215aa authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1
parents 118a8556 a242d574

sql/share/japanese-sjis/errmsg.txt

+2 −2
Original line number Diff line number Diff line
@@ -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",