merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-test-ssl~ed0a50364f2a51d7:
  Auto merged
include/Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/md5.c:
  Auto merged
sql/Makefile.am:
  Auto merged

.bzrignore

@@ -152,6 +152,7 @@ client/mysqlbinlog
 client/mysqlcheck
 client/mysqldump
 client/mysqlimport
+client/mysqlmanagerc
 client/mysqlshow
 client/mysqltest
 client/mysys_priv.h
@@ -203,6 +204,16 @@ libmysqld/backup_dir
 libmysqld/convert.cc
 libmysqld/derror.cc
 libmysqld/errmsg.c
+libmysqld/examples/completion_hash.cc
+libmysqld/examples/completion_hash.h
+libmysqld/examples/my_readline.h
+libmysqld/examples/mysql
+libmysqld/examples/mysql.cc
+libmysqld/examples/mysqltest
+libmysqld/examples/mysqltest.c
+libmysqld/examples/readline.cc
+libmysqld/examples/sql_string.cc
+libmysqld/examples/sql_string.h
 libmysqld/field.cc
 libmysqld/field_conv.cc
 libmysqld/filesort.cc
@@ -402,13 +413,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-libmysqld/examples/completion_hash.cc
-libmysqld/examples/completion_hash.h
-libmysqld/examples/my_readline.h
-libmysqld/examples/mysql.cc
-libmysqld/examples/mysqltest.c
-libmysqld/examples/readline.cc
-libmysqld/examples/sql_string.cc
-libmysqld/examples/sql_string.h
-libmysqld/examples/mysql
-libmysqld/examples/mysqltest

client/Makefile.am

@@ -23,7 +23,7 @@ noinst_HEADERS =		client_priv.h
 LIBS =				@CLIENT_LIBS@
 LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
 bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \
- mysqldump mysqlimport mysqltest mysqlbinlog
+ mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc
 noinst_PROGRAMS =		insert_test select_test thread_test
 noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h
 mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
@@ -36,14 +36,16 @@ mysqldump_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES)
 mysqlimport_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-mysqltest_SOURCES=		mysqltest.c
+mysqltest_SOURCES=			mysqltest.c
 mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-mysqlbinlog_SOURCES =		mysqlbinlog.cc 
+mysqlbinlog_SOURCES =   mysqlbinlog.cc 
 mysqlbinlog_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-sql_src=			log_event.h log_event.cc
+mysqlmanagerc_SOURCES =   mysqlmanagerc.c 
+mysqlmanagerc_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
+sql_src=log_event.h log_event.cc
 
 # Fix for mit-threads
-DEFS=				-DUNDEF_THREADS_HACK
+DEFS =			-DUNDEF_THREADS_HACK
 
 link_sources:
 	for f in $(sql_src) ; do \

client/mysqlmanagerc.c

+/* 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 */
+
+#define MANAGER_CLIENT_VERSION "1.0"
+
+#include <global.h>
+#include <my_sys.h>
+#include <m_string.h>
+#include <mysql.h>
+#include <mysql_version.h>
+#include <m_ctype.h>
+#ifdef OS2
+#include <config-os2.h>
+#else
+#include <my_config.h>
+#endif
+#include <my_dir.h>
+#include <hash.h>
+#include <mysqld_error.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <getopt.h>
+#include <stdarg.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <errno.h>
+#include <violite.h>
+
+#ifndef MYSQL_MANAGER_PORT
+#define MYSQL_MANAGER_PORT 23546
+#endif
+
+static void die(const char* fmt, ...);
+
+const char* user="root",*host="localhost";
+char* pass=0;
+int quiet=0;
+uint port=MYSQL_MANAGER_PORT;
+static const char *load_default_groups[]= { "mysqlmanagerc",0 };
+char** default_argv;
+MYSQL_MANAGER *manager;
+FILE* fp, *fp_out;
+
+struct option long_options[] =
+{
+  {"host",required_argument,0,'h'},
+  {"user",required_argument,0,'u'},
+  {"password",optional_argument,0,'p',},
+  {"port",required_argument,0,'P'},
+  {"help",no_argument,0,'?'},
+  {"version",no_argument,0,'V'},
+  {"quiet",no_argument,0,'q'},
+  {0,0,0,0}
+};
+
+static void die(const char* fmt, ...)
+{
+  va_list args;
+  DBUG_ENTER("die");
+  va_start(args, fmt);
+  if (fmt)
+  {
+    fprintf(stderr, "%s: ", my_progname);
+    vfprintf(stderr, fmt, args);
+    fprintf(stderr, "\n");
+    fflush(stderr);
+  }
+  va_end(args);
+  exit(1);
+}
+
+static void print_version(void)
+{
+  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,
+	 MANAGER_CLIENT_VERSION,
+	 MYSQL_SERVER_VERSION,SYSTEM_TYPE,MACHINE_TYPE);
+}
+
+void usage()
+{
+  print_version();
+  printf("MySQL AB, by Sasha, Matt & Monty\n");
+  printf("This software comes with ABSOLUTELY NO WARRANTY\n\n");
+  printf("Runs a test against the mysql server and compares output with a results file.\n\n");
+  printf("Usage: %s [OPTIONS] < command_file\n", my_progname);
+  printf("\n\
+  -?, --help               Display this help and exit.\n");
+  printf("\
+  -h, --host=...           Connect to host.\n\
+  -u, --user=...           User for login.\n\
+  -p[password], --password[=...]\n\
+                           Password to use when connecting to server.\n\
+  -P, --port=...           Port number to use for connection.\n\
+  -q, --quiet, --silent    Suppress all normal output.\n\
+  -V, --version            Output version information and exit.\n\
+  --no-defaults            Don't read default options from any options file.\n\n");
+}
+int parse_args(int argc, char **argv)
+{
+  int c, option_index = 0;
+  my_bool tty_password=0;
+
+  load_defaults("my",load_default_groups,&argc,&argv);
+  default_argv= argv;
+
+  while ((c = getopt_long(argc, argv, "h:p::u:P:?Vq",
+			 long_options, &option_index)) != EOF)
+    {
+      switch (c)
+      {
+      case 'h':
+	host=optarg;
+	break;
+      case 'u':
+	user=optarg;
+	break;
+      case 'p':
+	if (optarg)
+	{
+	  my_free(pass,MYF(MY_ALLOW_ZERO_PTR));
+	  pass=my_strdup(optarg,MYF(MY_FAE));
+	  while (*optarg) *optarg++= 'x';		/* Destroy argument */
+	}
+	else
+	  tty_password=1;
+	break;
+      case 'P':
+	port=atoi(optarg);
+	break;
+      case 'q':
+	quiet=1;
+	break;
+      case 'V':
+	print_version();
+	exit(0);
+      case '?':
+	usage();
+	exit(1);				/* Unknown option */
+      default:
+	usage();
+	exit(1);
+      }
+    }
+ return 0;
+}
+int main(int argc, char** argv)
+{
+  MY_INIT(argv[0]);
+  fp=stdin;
+  fp_out=stdout;
+  parse_args(argc,argv);
+  if (!(manager=mysql_manager_init(0)))
+    die("Failed in mysql_manager_init()");
+  if (!mysql_manager_connect(manager,host,user,pass,port))
+    die("Could not connect to MySQL manager: %s(%d)",manager->last_error,
+	manager->last_errno);
+  for (;!feof(fp);)
+  {
+    char buf[1024];
+    if (!fgets(buf,sizeof(buf),fp))
+      break;
+    if (mysql_manager_command(manager,buf,strlen(buf)))
+      die("Error in command: %s(%d)",manager->last_error,manager->last_errno);
+    while (!manager->eof)
+    {
+      if (mysql_manager_fetch_line(manager,buf,sizeof(buf)))
+	die("Error fetching result line: %s(%d)", manager->last_error,
+	    manager->last_errno);
+      fprintf(fp_out,"%s\n",buf);
+    }
+  }
+  mysql_manager_close(manager);
+  return 0;
+}
+
+

include/Makefile.am

@@ -28,7 +28,7 @@ noinst_HEADERS =	config-win.h \
 			my_dir.h mysys_err.h my_base.h \
 			my_nosys.h my_alarm.h queues.h \
 			my_tree.h hash.h thr_alarm.h thr_lock.h \
-			getopt.h t_ctype.h violite.h \
+			getopt.h t_ctype.h violite.h md5.h \
 			mysql_version.h.in
 
 # mysql_version.h are generated

include/mysql.h

@@ -223,7 +223,31 @@ typedef struct st_mysql_res {
   my_bool	eof;			/* Used my mysql_fetch_row */
 } MYSQL_RES;
 
+#define MAX_MYSQL_MANAGER_ERR 256  
+#define MAX_MYSQL_MANAGER_MSG 256
 
+#define MANAGER_OK           200
+#define MANAGER_INFO         250
+#define MANAGER_ACCESS       401
+#define MANAGER_CLIENT_ERR   450
+#define MANAGER_INTERNAL_ERR 500
+
+
+  
+typedef struct st_mysql_manager
+{
+  Vio* vio;
+  char *host,*user,*passwd;
+  unsigned int port;
+  my_bool free_me;
+  my_bool eof;
+  int cmd_status;
+  int last_errno;
+  char* net_buf,*net_buf_pos,*net_data_end;
+  int net_buf_size;
+  char last_error[MAX_MYSQL_MANAGER_ERR];
+} MYSQL_MANAGER;
+  
 /* Set up and bring down the server; to ensure that applications will
  * work when linked against either the standard client library or the
  * embedded server library, these functions should be called. */
@@ -368,7 +392,18 @@ char *		STDCALL mysql_odbc_escape_string(MYSQL *mysql,
 						  unsigned long *length));
 void 		STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
 unsigned int	STDCALL mysql_thread_safe(void);
-
+MYSQL_MANAGER*  STDCALL mysql_manager_init(MYSQL_MANAGER* con);  
+MYSQL_MANAGER*  STDCALL mysql_manager_connect(MYSQL_MANAGER* con,
+					      const char* host,
+					      const char* user,
+					      const char* passwd,
+					      unsigned int port);
+void            STDCALL mysql_manager_close(MYSQL_MANAGER* con);
+int             STDCALL mysql_manager_command(MYSQL_MANAGER* con,
+						const char* cmd, int cmd_len);
+int             STDCALL mysql_manager_fetch_line(MYSQL_MANAGER* con,
+						  char* res_buf,
+						 int res_buf_size);
 #define mysql_reload(mysql) mysql_refresh((mysql),REFRESH_GRANT)
 
 #ifdef USE_OLD_FUNCTIONS

include/mysql_com.h

@@ -164,6 +164,8 @@ int	net_write_command(NET *net,unsigned char command,const char *packet,
 			  unsigned long len);
 int	net_real_write(NET *net,const char *packet,unsigned long len);
 unsigned long my_net_read(NET *net);
+int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
+	       uint timeout);
 
 struct rand_struct {
   unsigned long seed1,seed2,max_value;

libmysql/Makefile.shared

@@ -31,7 +31,7 @@ noinst_PROGRAMS = conf_to_src
 CHARSET_OBJS=@CHARSET_OBJS@
 LTCHARSET_OBJS= ${CHARSET_OBJS:.o=.lo}
 
-target_sources = libmysql.c net.c  password.c \
+target_sources = libmysql.c net.c  password.c manager.c \
 			    get_password.c errmsg.c
 
 mystringsobjects =	strmov.lo strxmov.lo strnmov.lo strmake.lo strend.lo \
@@ -56,7 +56,7 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
 			thr_mutex.lo mulalloc.lo string.lo default.lo \
 			my_compress.lo array.lo my_once.lo list.lo my_net.lo \
                         charset.lo hash.lo mf_iocache.lo my_seek.lo \
-			my_pread.lo mf_cache.lo my_vsnprintf.lo
+			my_pread.lo mf_cache.lo my_vsnprintf.lo md5.lo
 
 # Not needed in the minimum library
 mysysobjects2 =		getopt.lo getopt1.lo getvar.lo my_lib.lo

libmysql/libmysql.c

@@ -140,12 +140,12 @@ static MYSQL* spawn_init(MYSQL* parent, const char* host,
 * A modified version of connect().  connect2() allows you to specify
 * a timeout value, in seconds, that we should wait until we
 * derermine we can't connect to a particular host.  If timeout is 0,
-* connect2() will behave exactly like connect().
+* my_connect() will behave exactly like connect().
 *
 * Base version coded by Steve Bernacki, Jr. <steve@navinet.net>
 *****************************************************************************/
 
-static int connect2(my_socket s, const struct sockaddr *name, uint namelen,
+int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
 		    uint timeout)
 {
 #if defined(__WIN__) || defined(OS2)
@@ -1523,7 +1523,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
     bzero((char*) &UNIXaddr,sizeof(UNIXaddr));
     UNIXaddr.sun_family = AF_UNIX;
     strmov(UNIXaddr.sun_path, unix_socket);
-    if (connect2(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr),
+    if (my_connect(sock,(struct sockaddr *) &UNIXaddr, sizeof(UNIXaddr),
 		 mysql->options.connect_timeout) <0)
     {
       DBUG_PRINT("error",("Got error %d on connect to local server",socket_errno));
@@ -1623,7 +1623,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
     }
 #endif
     sock_addr.sin_port = (ushort) htons((ushort) port);
-    if (connect2(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
+    if (my_connect(sock,(struct sockaddr *) &sock_addr, sizeof(sock_addr),
 		 mysql->options.connect_timeout) <0)
     {
       DBUG_PRINT("error",("Got error %d on connect to '%s'",socket_errno,host));

mysys/Makefile.am

@@ -45,7 +45,7 @@ libmysys_a_SOURCES =	my_init.c my_getwd.c mf_getdate.c\
 			my_quick.c my_lockmem.c my_static.c \
 			getopt.c getopt1.c getvar.c my_mkdir.c \
 			default.c my_compress.c checksum.c raid.cc my_net.c \
-			my_vsnprintf.c charset.c my_bitmap.c
+			my_vsnprintf.c charset.c my_bitmap.c md5.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
 			thr_mutex.c thr_rwlock.c
 libmysys_a_LIBADD =	@THREAD_LOBJECTS@

sql/Makefile.am

@@ -55,7 +55,7 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			ha_heap.h ha_myisam.h ha_berkeley.h ha_innobase.h \
 			ha_gemini.h opt_range.h opt_ft.h \
 			sql_select.h structs.h table.h sql_udf.h hash_filo.h\
-			lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \
+			lex.h lex_symbol.h sql_acl.h sql_crypt.h  \
                         log_event.h mini_client.h sql_repl.h slave.h \
 			stacktrace.h sql_sort.h
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc \
@@ -82,7 +82,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
 			slave.cc sql_repl.cc sql_union.cc \
 			mini_client.cc mini_client_errors.c \
-			md5.c stacktrace.c 
+			stacktrace.c 
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
 

tools/managertest1.nc

-root secret
 def_exec server /usr/sbin/mysqld --socket=/tmp/temp.sock --skip-grant --skip-net --datadir=/tmp
 set_exec_con server root localhost /tmp/temp.sock
 start_exec server 3
@@ -9,4 +8,4 @@ start_exec server 3
 show_exec
 stop_exec server 3
 show_exec
-shutdown
+quit

tools/mysqlmanager-sample.pwd

+root:5ebe2294ecd0e0f08eab7690d2a6ee69