make dist changes for Cmake build

libmysql/mytest.c:
  Rename: BitKeeper/deleted/.del-mytest.c -> libmysql/mytest.c
sql/message.mc:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/message.mc

23 files changed, 211 insertions, 18 deletions

diff --git a/Makefile.am b/Makefile.am
index f0784a9baed..d48f0e24966 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ AUTOMAKE_OPTIONS =	foreign
 
 # These are built from source in the Docs directory
 EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
-			README COPYING EXCEPTIONS-CLIENT
+			README COPYING EXCEPTIONS-CLIENT CMakeLists.txt
 SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
@@ -33,7 +33,7 @@ DIST_SUBDIRS =		. include @docs_dirs@ zlib \
 			@thread_dirs@ pstack \
 			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
 			BUILD netware os2 @libmysqld_dirs@ \
-			@bench_dirs@ support-files @tools_dirs@
+			@bench_dirs@ support-files @tools_dirs@ win
 
 # Run these targets before any others, also make part of clean target,
 # to make sure we create new links after a clean.
diff --git a/bdb/Makefile.in b/bdb/Makefile.in
index c83d40ac8b2..d40fffed769 100644
--- a/bdb/Makefile.in
+++ b/bdb/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
 # distdir and top_distdir are set by the calling Makefile
 
 bdb_build = build_unix
-files = LICENSE Makefile Makefile.in README
+files = LICENSE Makefile Makefile.in README CMakeLists.txt
 subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \
   dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \
   db_dump185 db_load db_printlog db_recover db_stat db_upgrade \
diff --git a/client/Makefile.am b/client/Makefile.am
index b80357f68ea..d3c320db56c 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -60,6 +60,8 @@ DEFS =			-DUNDEF_THREADS_HACK \
 			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \
 			-DDATADIR="\"$(localstatedir)\"" 
 
+EXTRA_DIST =		get_password.c CMakeLists.txt
+
 link_sources:
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \
diff --git a/dbug/Makefile.am b/dbug/Makefile.am
index 38705e63847..57288d32431 100644
--- a/dbug/Makefile.am
+++ b/dbug/Makefile.am
@@ -22,7 +22,8 @@ noinst_HEADERS =        dbug_long.h
 libdbug_a_SOURCES =     dbug.c sanity.c
 EXTRA_DIST =            example1.c example2.c example3.c \
                         user.r monty.doc readme.prof dbug_add_tags.pl \
-                        my_main.c main.c factorial.c dbug_analyze.c
+                        my_main.c main.c factorial.c dbug_analyze.c \
+						CMakeLists.txt
 NROFF_INC =             example1.r example2.r example3.r main.r \
                         factorial.r output1.r output2.r output3.r \
                         output4.r output5.r
diff --git a/extra/Makefile.am b/extra/Makefile.am
index c0ad75059df..0de513ba15a 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -43,6 +43,7 @@ $(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h
 bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \
 			resolve_stack_dump mysql_waitpid innochecksum
 noinst_PROGRAMS =	charset2html
+EXTRA_DIST =	CMakeLists.txt
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index d0415012767..12a7da1085b 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = taocrypt src testsuite
-EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
+EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp) CMakeLists.txt
diff --git a/extra/yassl/taocrypt/Makefile.am b/extra/yassl/taocrypt/Makefile.am
index ac0c1bc29dd..e232b499cc7 100644
--- a/extra/yassl/taocrypt/Makefile.am
+++ b/extra/yassl/taocrypt/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = src test benchmark
-EXTRA_DIST = taocrypt.dsw taocrypt.dsp
+EXTRA_DIST = taocrypt.dsw taocrypt.dsp CMakeLists.txt
diff --git a/heap/Makefile.am b/heap/Makefile.am
index 567c7774751..a89c8a4a878 100644
--- a/heap/Makefile.am
+++ b/heap/Makefile.am
@@ -28,6 +28,6 @@ libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
 			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
 			hp_rkey.c hp_block.c \
 			hp_hash.c _check.c _rectest.c hp_static.c
-
+EXTRA_DIST =	CMakeLists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/innobase/Makefile.am b/innobase/Makefile.am
index 8ff90d16a2c..10e793396d8 100644
--- a/innobase/Makefile.am
+++ b/innobase/Makefile.am
@@ -25,6 +25,7 @@ noinst_HEADERS = ib_config.h
 SUBDIRS =		os ut btr buf data dict dyn eval fil fsp fut \
 			ha ibuf include lock log mach mem mtr page \
 			pars que read rem row srv sync thr trx usr
+EXTRA_DIST = CMakeLists.txt
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index d089d56f38a..5e6c60a007b 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
+EXTRA_DIST = Makefile.shared libmysql.def dll.c mytest.c CMakeLists.txt
 noinst_HEADERS = client_settings.h
 
 # This is called from the toplevel makefile
diff --git a/libmysql/mytest.c b/libmysql/mytest.c
new file mode 100644
index 00000000000..2d5c576b72a
--- /dev/null
+++ b/libmysql/mytest.c
@@ -0,0 +1,175 @@
+/*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 ;
+
+}
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index e4327070997..081d7facf3a 100644
--- a/myisam/Makefile.am
+++ b/myisam/Makefile.am
@@ -14,7 +14,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-EXTRA_DIST =		mi_test_all.sh mi_test_all.res
+EXTRA_DIST =		mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt
 pkgdata_DATA =		mi_test_all mi_test_all.res
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include
diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am
index 14e3295c1ae..19543927fd2 100644
--- a/myisammrg/Makefile.am
+++ b/myisammrg/Makefile.am
@@ -23,6 +23,6 @@ libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
 			myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \
 			myrg_rprev.c myrg_queue.c myrg_write.c myrg_range.c \
 			myrg_rnext_same.c
-
+EXTRA_DIST = 	CMakeLists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index bc84f44cd29..041130fdf5c 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -58,7 +58,8 @@ libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			my_memmem.c \
 			my_windac.c my_access.c base64.c my_libwrap.c
 EXTRA_DIST =		thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \
-			thr_mutex.c thr_rwlock.c
+			thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \
+			my_wincond.c my_winsem.c my_winthread.c CMakeLists.txt
 libmysys_a_LIBADD =	@THREAD_LOBJECTS@
 # test_dir_DEPENDENCIES=	$(LIBRARIES)
 # testhash_DEPENDENCIES=	$(LIBRARIES)
diff --git a/regex/Makefile.am b/regex/Makefile.am
index 7e8478e8123..1f496fcec62 100644
--- a/regex/Makefile.am
+++ b/regex/Makefile.am
@@ -25,7 +25,7 @@ re_SOURCES =		split.c debug.c main.c
 re_LDFLAGS= @NOINST_LDFLAGS@
 EXTRA_DIST =		tests CHANGES COPYRIGHT WHATSNEW regexp.c \
 			debug.ih engine.ih main.ih regcomp.ih regerror.ih \
-			regex.3 regex.7
+			regex.3 regex.7 CMakeLists.txt
 
 test: re tests
 	./re < tests
diff --git a/server-tools/Makefile.am b/server-tools/Makefile.am
index ed316b9ac38..573bf07ccff 100644
--- a/server-tools/Makefile.am
+++ b/server-tools/Makefile.am
@@ -1 +1,2 @@
 SUBDIRS= instance-manager
+DIST_SUBDIRS= instance-manager
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 6b5d80a99af..b1d77506efa 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -18,7 +18,8 @@ INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
 	@openssl_includes@ -I$(top_builddir)/include
 
 DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
-
+EXTRA_DIST = IMService.cpp IMService.h WindowsService.cpp WindowsService.h \
+	CMakeLists.txt
 # As all autoconf variables depend from ${prefix} and being resolved only when
 # make is run, we can not put these defines to a header file (e.g. to
 # default_options.h, generated from default_options.h.in)
diff --git a/sql/Makefile.am b/sql/Makefile.am
index ceec9757889..98c8fe784eb 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -116,7 +116,8 @@ DEFS =			-DMYSQL_SERVER \
 			@DEFS@
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
-EXTRA_DIST =		$(BUILT_SOURCES)
+EXTRA_DIST =		$(BUILT_SOURCES) nt_servc.cc nt_servc.h \
+			message.mc examples/CMakeLists.txt CMakeLists.txt
 DISTCLEANFILES =        lex_hash.h sql_yacc.output
 
 AM_YFLAGS =		-d --debug --verbose
diff --git a/sql/message.mc b/sql/message.mc
new file mode 100644
index 00000000000..a1a7c8cff7e
--- /dev/null
+++ b/sql/message.mc
@@ -0,0 +1,8 @@
+MessageId    = 100
+Severity     = Error
+Facility     = Application
+SymbolicName = MSG_DEFAULT
+Language     = English
+%1For more information, see Help and Support Center at http://www.mysql.com.
+
+
diff --git a/strings/Makefile.am b/strings/Makefile.am
index 7ee115c09e5..255bc4e1518 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -53,7 +53,7 @@ EXTRA_DIST =		ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.c ctype-euc
 			bmove_upp-sparc.s strappend-sparc.s strend-sparc.s \
 			strinstr-sparc.s strmake-sparc.s strmov-sparc.s \
 			strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \
-			t_ctype.h
+			t_ctype.h CMakeLists.txt
 
 libmystrings_a_LIBADD=
 conf_to_src_SOURCES = conf_to_src.c xml.c ctype.c bcmp.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ab747d6e4ec..3eb3d39de1e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,8 @@ EXTRA_DIST =		auto_increment.res auto_increment.tst \
 			insert_and_repair.pl \
 			grant.pl grant.res test_delayed_insert.pl \
 			pmail.pl mail_to_db.pl table_types.pl \
-			udf_test udf_test.res myisam-big-rows.tst
+			udf_test udf_test.res myisam-big-rows.tst \
+			CMakeLists.txt
 
 bin_PROGRAMS =		mysql_client_test
 noinst_PROGRAMS =	insert_test select_test thread_test
diff --git a/vio/Makefile.am b/vio/Makefile.am
index e89191d57cd..cb70501046e 100644
--- a/vio/Makefile.am
+++ b/vio/Makefile.am
@@ -38,6 +38,6 @@ test_sslclient_LDADD=   @CLIENT_EXTRA_LDFLAGS@	../dbug/libdbug.a libvio.a \
 			../mysys/libmysys.a ../strings/libmystrings.a \
 			$(openssl_libs) $(yassl_libs)
 libvio_a_SOURCES=	vio.c viosocket.c viossl.c viosslfactories.c
-
+EXTRA_DIST=	CMakeLists.txt
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 71619ce40c1..0081c93a2ae 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -29,5 +29,5 @@ libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \
 		 infback.c inffast.c inflate.c inftrees.c trees.c \
 		 uncompr.c zutil.c
 
-EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 
+EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt