Merge on pull

BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged

sql/share/korean/errmsg.txt

@@ -1,5 +1,18 @@
-/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
-   This 화일 is public domain and comes with NO WARRANTY of any kind */
+/* Copyright (C) 2003 MySQL AB
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 character-set=euckr
 
@@ -79,7 +92,7 @@ character-set=euckr
 "BLOB 칼럼 '%-.64s'는 키 정의에서 사용될 수 없습니다.",
 "칼럼 '%-.64s'의 칼럼 길이가 너무 깁니다 (최대 = %d). 대신에 BLOB를 사용하세요.",
 "부정확한 테이블 정의; 테이블은 하나의 auto 칼럼이 존재하고 키로 정의되어져야 합니다.",
-"%s: 연결 준비중입니다.\n",
+"%s: ¿¬°á ÁغñÁßÀÔ´Ï´Ù",
 "%s: 정상적인 shutdown\n",
 "%s: %d 신호가 들어왔음. 중지!\n",
 "%s: Shutdown 이 완료됨!\n",
@@ -304,7 +317,8 @@ character-set=euckr
 "Unknown or incorrect time zone: '%-.64s'",
 "Invalid TIMESTAMP value in column '%s' at row %ld",
 "Invalid %s character string: '%.64s'",
-"Result of %s() was larger than max_allowed_packet (%d) - truncated"
+"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
+"Conflicting declarations: '%s%s' and '%s%s'"
 "Can't create a %s from within another stored routine"
 "%s %s already exists"
 "%s %s does not exist"