OS2 patch

Docs/manual.texi:
  Updated section of how to change the socket file.
  Changelog for 3.23.43
include/merge.h:
  Fixed typo
include/my_pthread.h:
  Fixed bug for WIN32
include/myisam.h:
  Fixed typo
include/nisam.h:
  Fixed typo
sql/handler.h:
  Fixed typo
sql/sql_table.cc:
  Fixed typo
sql/unireg.cc:
  F

1 files changed, 31 insertions, 0 deletions

diff --git a/client/client_priv.h b/client/client_priv.h
new file mode 100644
index 00000000000..7bee03a8ab5
--- /dev/null
+++ b/client/client_priv.h
@@ -0,0 +1,31 @@
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
+
+/* Common defines for all clients */
+
+#include <global.h>
+#include <my_sys.h> 
+#include <m_string.h>
+#include <mysql.h>
+#include <errmsg.h>
+#include <getopt.h>
+
+/* We have to define 'enum options' identical in all files to keep OS2 happy */
+
+enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET,
+	       OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,
+	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,
+	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES};