Merge mysql.com:/home/gluh/MySQL/Merge/5.1

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/queues.c:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  manual merge
mysql-test/r/myisam.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/r/user_var.result:
  manual merge
mysql-test/t/myisam.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var.test:
  manual merge
sql/item.h:
  manual merge
sql/item_func.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge

3 files changed, 1 insertions, 179 deletions

diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 249e6294c22..b761907ec9d 100755
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -126,9 +126,6 @@ ENDIF(WIN32)
 ADD_DEPENDENCIES(libmysql GenError)
 TARGET_LINK_LIBRARIES(libmysql wsock32)
 
-ADD_EXECUTABLE(myTest mytest.c)
-TARGET_LINK_LIBRARIES(myTest libmysql)
-
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("myTest" "asInvoker")
 ENDIF(EMBED_MANIFESTS)
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index e5005553467..21f8f372d0f 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -31,7 +31,7 @@ include $(srcdir)/Makefile.shared
 libmysqlclient_la_SOURCES = $(target_sources)
 libmysqlclient_la_LIBADD = $(target_libadd) $(yassl_las)
 libmysqlclient_la_LDFLAGS = $(target_ldflags)
-EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c CMakeLists.txt
+EXTRA_DIST = Makefile.shared libmysql.def dll.c CMakeLists.txt
 noinst_HEADERS = client_settings.h
 
 link_sources:
diff --git a/libmysql/mytest.c b/libmysql/mytest.c
deleted file mode 100644
index 2d5c576b72a..00000000000
--- a/libmysql/mytest.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*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....	*/
-/****************************************************************/
-
-
-#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 ] ;
-  const  char   *pszT;
-  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");
-	printf("net:\t%3d %3d\n",(int) sizeof(myData->net),
-	       (int) offsetof(MYSQL,net));
-	printf("host:\t%3d %3d\n",(int) sizeof(myData->host),
-	       (int) offsetof(MYSQL,host));
-	printf("port:\t%3d %3d\n", (int) sizeof(myData->port),
-	       (int) offsetof(MYSQL,port));
-	printf("protocol_version:\t%3d %3d\n",
-	       (int) sizeof(myData->protocol_version),
-	       (int) offsetof(MYSQL,protocol_version));
-	printf("thread_id:\t%3d %3d\n",(int) sizeof(myData->thread_id),
-	       (int) offsetof(MYSQL,thread_id));
-	printf("affected_rows:\t%3d %3d\n",(int) sizeof(myData->affected_rows),
-	       (int) offsetof(MYSQL,affected_rows));
-	printf("packet_length:\t%3d %3d\n",(int) sizeof(myData->packet_length),
-	       (int) offsetof(MYSQL,packet_length));
-	printf("status:\t%3d %3d\n",(int) sizeof(myData->status),
-	       (int) offsetof(MYSQL,status));
-	printf("fields:\t%3d %3d\n",(int) sizeof(myData->fields),
-	       (int) offsetof(MYSQL,fields));
-	printf("field_alloc:\t%3d %3d\n",(int) sizeof(myData->field_alloc),
-	       (int) offsetof(MYSQL,field_alloc));
-	printf("free_me:\t%3d %3d\n",(int) sizeof(myData->free_me),
-	       (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 ) )
-    {
-      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 ;
-
-}