Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51


BUILD/SETUP.sh:
  Auto merged
client/Makefile.am:
  Auto merged
dbug/Makefile.am:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/Makefile.am:
  Auto merged
mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysys/my_seek.c:
  Auto merged
regex/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/stacktrace.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/stacktrace.h:
  Auto merged
storage/innobase/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-mytest.c:
  Delete: libmysql/mytest.c
BitKeeper/deleted/.del-make_win_bin_dist:
  Delete: scripts/make_win_bin_dist
BitKeeper/deleted/.del-message.mc~1:
  Delete: sql/message.mc
Makefile.am:
  Manual merge (use local)
configure.in:
  Manual merge (use local)
BitKeeper/deleted/.del-Makefile.in:
  Manual merge (use local)
client/mysqlbinlog.cc:
  Manual merge (use local)
extra/Makefile.am:
  Manual merge (use local)
extra/comp_err.c:
  Manual merge (use local)
extra/yassl/Makefile.am:
  Manual merge (use local)
extra/yassl/taocrypt/Makefile.am:
  Manual merge (use local)
include/my_dbug.h:
  Manual merge (use local)
mysql-test/mysql-test-run.pl:
  Manual merge (use local)
mysql-test/lib/mtr_process.pl:
  Manual merge (use local)
mysys/Makefile.am:
  Manual merge (use local)
server-tools/Makefile.am:
  Manual merge (use local)
sql/Makefile.am:
  Manual merge (use local)
sql/sp.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_class.h:
  Manual merge (use local)
sql/sql_select.cc:
  SCCS merged
sql/table.cc:
  Manual merge
storage/archive/ha_archive.cc:
  Manual merge
storage/heap/Makefile.am:
  Manual merge (use local)
storage/myisam/Makefile.am:
  Manual merge (use local)
storage/myisammrg/Makefile.am:
  Manual merge (use local)
strings/Makefile.am:
  Manual merge (use local)
vio/Makefile.am:
  Manual merge (use local)
zlib/Makefile.am:
  Manual merge (use local)

1 files changed, 138 insertions, 285 deletions

diff --git a/libmysql/mytest.c b/libmysql/mytest.c
index e1acf3e2136..2d5c576b72a 100644
--- a/libmysql/mytest.c
+++ b/libmysql/mytest.c
@@ -1,103 +1,54 @@
-/*C4*/

+/*C4*/
+/****************************************************************/
+/*	Author:	Jethro Wright, III	TS :  3/ 4/1998  9:15	*/
+/*	Date:	02/18/1998					*/
+/*	mytest.c :  do some testing of the libmySQL.DLL....	*/
+/*								*/
+/*	History:						*/
+/*		02/18/1998  jw3  also sprach zarathustra....	*/
+/****************************************************************/
 
-/****************************************************************/

 
-/*	Author:	Jethro Wright, III	TS :  3/ 4/1998  9:15	*/

+#include        <windows.h>
+#include	<stdio.h>
+#include	<string.h>
 
-/*	Date:	02/18/1998					*/

+#include	<mysql.h>
 
-/*	mytest.c :  do some testing of the libmySQL.DLL....	*/

+#define		DEFALT_SQL_STMT	"SELECT * FROM db"
+#ifndef offsetof
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
 
-/*								*/

 
-/*	History:						*/

+/********************************************************
+**
+**		main  :-
+**
+********************************************************/
 
-/*		02/18/1998  jw3  also sprach zarathustra....	*/

-
-/****************************************************************/

-

-

-
-
-
-#include        <windows.h>

-
-#include	<stdio.h>

-
-#include	<string.h>

-

-
-
-#include	<mysql.h>

-

-
-
-#define		DEFALT_SQL_STMT	"SELECT * FROM db"

-
-#ifndef offsetof

-
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)

-
-#endif

-

-

-
-
-
-/********************************************************

-
-**

-
-**		main  :-

-
-**

-
-********************************************************/

-

-
-
-int

-
-main( int argc, char * argv[] )

-
-{

-

-
-
-  char		szSQL[ 200 ], aszFlds[ 25 ][ 25 ], szDB[ 50 ] ;

+int
+main( int argc, char * argv[] )
+{
 
+  char		szSQL[ 200 ], aszFlds[ 25 ][ 25 ], szDB[ 50 ] ;
   const  char   *pszT;
-  int			i, j, k, l, x ;

-
-  MYSQL		* myData ;

-
-  MYSQL_RES	* res ;

-
-  MYSQL_FIELD	* fd ;

-
-  MYSQL_ROW	row ;

-

-
-
-  //....just curious....

+  int			i, j, k, l, x ;
+  MYSQL		* myData ;
+  MYSQL_RES	* res ;
+  MYSQL_FIELD	* fd ;
+  MYSQL_ROW	row ;
 
+  //....just curious....
   printf( "sizeof( MYSQL ) == %d\n", (int) sizeof( MYSQL ) ) ;
-  if ( argc == 2 )

-
-    {

-
-      strcpy( szDB, argv[ 1 ] ) ;

-
-      strcpy( szSQL, DEFALT_SQL_STMT ) ;

-
-      if (!strcmp(szDB,"--debug"))

-
-      {

-
-	strcpy( szDB, "mysql" ) ;

-
-	printf("Some mysql struct information (size and offset):\n");

-
+  if ( argc == 2 )
+    {
+      strcpy( szDB, argv[ 1 ] ) ;
+      strcpy( szSQL, DEFALT_SQL_STMT ) ;
+      if (!strcmp(szDB,"--debug"))
+      {
+	strcpy( szDB, "mysql" ) ;
+	printf("Some mysql struct information (size and offset):\n");
 	printf("net:\t%3d %3d\n",(int) sizeof(myData->net),
 	       (int) offsetof(MYSQL,net));
 	printf("host:\t%3d %3d\n",(int) sizeof(myData->host),
@@ -123,200 +74,102 @@ main( int argc, char * argv[] )
 	       (int) offsetof(MYSQL,free_me));
 	printf("options:\t%3d %3d\n",(int) sizeof(myData->options),
 	       (int) offsetof(MYSQL,options));
-	puts("");

-
-      }

-
-    }		

-
-  else if ( argc > 2 ) {

-
-    strcpy( szDB, argv[ 1 ] ) ;

-
-    strcpy( szSQL, argv[ 2 ] ) ;

-
-  }

-
-  else {

-
-    strcpy( szDB, "mysql" ) ;

-
-    strcpy( szSQL, DEFALT_SQL_STMT ) ;

-
-  }

-
-  //....

-
-		  

-
-  if ( (myData = mysql_init((MYSQL*) 0)) && 

-
-       mysql_real_connect( myData, NULL, NULL, NULL, NULL, MYSQL_PORT,

-
-			   NULL, 0 ) )

-
-    {

-
+	puts("");
+      }
+    }		
+  else if ( argc > 2 ) {
+    strcpy( szDB, argv[ 1 ] ) ;
+    strcpy( szSQL, argv[ 2 ] ) ;
+  }
+  else {
+    strcpy( szDB, "mysql" ) ;
+    strcpy( szSQL, DEFALT_SQL_STMT ) ;
+  }
+  //....
+		  
+  if ( (myData = mysql_init((MYSQL*) 0)) && 
+       mysql_real_connect( myData, NULL, NULL, NULL, NULL, MYSQL_PORT,
+			   NULL, 0 ) )
+    {
       myData->reconnect= 1;
-      if ( mysql_select_db( myData, szDB ) < 0 ) {

-
-	printf( "Can't select the %s database !\n", szDB ) ;

-
-	mysql_close( myData ) ;

-
-	return 2 ;

-
-      }

-
-    }

-
-  else {

-
-    printf( "Can't connect to the mysql server on port %d !\n",

-
-	    MYSQL_PORT ) ;

-
-    mysql_close( myData ) ;

-
-    return 1 ;

-
-  }

-
-  //....

-
-  if ( ! mysql_query( myData, szSQL ) ) {

-
-    res = mysql_store_result( myData ) ;

-
-    i = (int) mysql_num_rows( res ) ; l = 1 ;

-
-    printf( "Query:  %s\nNumber of records found:  %ld\n", szSQL, i ) ;

-
-    //....we can get the field-specific characteristics here....

-
-    for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )

-
-      strcpy( aszFlds[ x ], fd->name ) ;

-
-    //....

-
-    while ( row = mysql_fetch_row( res ) ) {

-
-      j = mysql_num_fields( res ) ;

-
-      printf( "Record #%ld:-\n", l++ ) ;

-
-      for ( k = 0 ; k < j ; k++ )

-
-	printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],

-
-		(((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;

-
-      puts( "==============================\n" ) ;

-
-    }

-
-    mysql_free_result( res ) ;

-
-  }

-
-  else printf( "Couldn't execute %s on the server !\n", szSQL ) ;

-
-  //....

-
-  puts( "====  Diagnostic info  ====" ) ;

-
-  pszT = mysql_get_client_info() ;

-
-  printf( "Client info: %s\n", pszT ) ;

-
-  //....

-
-  pszT = mysql_get_host_info( myData ) ;

-
-  printf( "Host info: %s\n", pszT ) ;

-
-  //....

-
-  pszT = mysql_get_server_info( myData ) ;

-
-  printf( "Server info: %s\n", pszT ) ;

-
-  //....

-
-  res = mysql_list_processes( myData ) ; l = 1 ;

-
-  if (res)

-
-    {

-
-      for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )

-
-	strcpy( aszFlds[ x ], fd->name ) ;

-
-      while ( row = mysql_fetch_row( res ) ) {

-
-	j = mysql_num_fields( res ) ;

-
-	printf( "Process #%ld:-\n", l++ ) ;

-
-	for ( k = 0 ; k < j ; k++ )

-
-	  printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],

-
-		  (((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;

-
-	puts( "==============================\n" ) ;

-
-      }

-
-    }

-
-  else

-
-    {

-
-      printf("Got error %s when retreiving processlist\n",mysql_error(myData));

-
-    }

-
-  //....

-
-  res = mysql_list_tables( myData, "%" ) ; l = 1 ;

-
-  for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )

-
-    strcpy( aszFlds[ x ], fd->name ) ;

-
-  while ( row = mysql_fetch_row( res ) ) {

-
-    j = mysql_num_fields( res ) ;

-
-    printf( "Table #%ld:-\n", l++ ) ;

-
-    for ( k = 0 ; k < j ; k++ )

-
-      printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],

-
-	      (((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;

-
-    puts( "==============================\n" ) ;

-
-  }

-
-  //....

-
-  pszT = mysql_stat( myData ) ;

-
-  puts( pszT ) ;

-
-  //....

-
-  mysql_close( myData ) ;

-
-  return 0 ;

-

-
-
-}

-
+      if ( mysql_select_db( myData, szDB ) < 0 ) {
+	printf( "Can't select the %s database !\n", szDB ) ;
+	mysql_close( myData ) ;
+	return 2 ;
+      }
+    }
+  else {
+    printf( "Can't connect to the mysql server on port %d !\n",
+	    MYSQL_PORT ) ;
+    mysql_close( myData ) ;
+    return 1 ;
+  }
+  //....
+  if ( ! mysql_query( myData, szSQL ) ) {
+    res = mysql_store_result( myData ) ;
+    i = (int) mysql_num_rows( res ) ; l = 1 ;
+    printf( "Query:  %s\nNumber of records found:  %ld\n", szSQL, i ) ;
+    //....we can get the field-specific characteristics here....
+    for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
+      strcpy( aszFlds[ x ], fd->name ) ;
+    //....
+    while ( row = mysql_fetch_row( res ) ) {
+      j = mysql_num_fields( res ) ;
+      printf( "Record #%ld:-\n", l++ ) ;
+      for ( k = 0 ; k < j ; k++ )
+	printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
+		(((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
+      puts( "==============================\n" ) ;
+    }
+    mysql_free_result( res ) ;
+  }
+  else printf( "Couldn't execute %s on the server !\n", szSQL ) ;
+  //....
+  puts( "====  Diagnostic info  ====" ) ;
+  pszT = mysql_get_client_info() ;
+  printf( "Client info: %s\n", pszT ) ;
+  //....
+  pszT = mysql_get_host_info( myData ) ;
+  printf( "Host info: %s\n", pszT ) ;
+  //....
+  pszT = mysql_get_server_info( myData ) ;
+  printf( "Server info: %s\n", pszT ) ;
+  //....
+  res = mysql_list_processes( myData ) ; l = 1 ;
+  if (res)
+    {
+      for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
+	strcpy( aszFlds[ x ], fd->name ) ;
+      while ( row = mysql_fetch_row( res ) ) {
+	j = mysql_num_fields( res ) ;
+	printf( "Process #%ld:-\n", l++ ) ;
+	for ( k = 0 ; k < j ; k++ )
+	  printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
+		  (((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
+	puts( "==============================\n" ) ;
+      }
+    }
+  else
+    {
+      printf("Got error %s when retreiving processlist\n",mysql_error(myData));
+    }
+  //....
+  res = mysql_list_tables( myData, "%" ) ; l = 1 ;
+  for ( x = 0 ; fd = mysql_fetch_field( res ) ; x++ )
+    strcpy( aszFlds[ x ], fd->name ) ;
+  while ( row = mysql_fetch_row( res ) ) {
+    j = mysql_num_fields( res ) ;
+    printf( "Table #%ld:-\n", l++ ) ;
+    for ( k = 0 ; k < j ; k++ )
+      printf( "  Fld #%d (%s): %s\n", k + 1, aszFlds[ k ],
+	      (((row[k]==NULL)||(!strlen(row[k])))?"NULL":row[k])) ;
+    puts( "==============================\n" ) ;
+  }
+  //....
+  pszT = mysql_stat( myData ) ;
+  puts( pszT ) ;
+  //....
+  mysql_close( myData ) ;
+  return 0 ;
+
+}