Merge with 3.23.42

configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

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};