diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | client/Makefile.am | 1 | ||||
| -rw-r--r-- | cmakelists.txt | 5 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | extra/Makefile.am | 1 | ||||
| -rw-r--r-- | extra/yassl/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysql/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysql/cmakelists.txt | 3 | ||||
| -rw-r--r-- | libmysql/mytest.c | 175 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 1 | ||||
| -rw-r--r-- | mysys/Makefile.am | 4 | ||||
| -rw-r--r-- | regex/Makefile.am | 2 | ||||
| -rw-r--r-- | server-tools/instance-manager/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/Makefile.am | 3 | ||||
| -rw-r--r-- | sql/cmakelists.txt | 10 | ||||
| -rw-r--r-- | sql/message.mc | 8 | ||||
| -rw-r--r-- | storage/archive/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/bdb/Makefile.in | 4 | ||||
| -rw-r--r-- | storage/example/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/heap/Makefile.am | 1 | ||||
| -rw-r--r-- | storage/innobase/Makefile.am | 3 | ||||
| -rw-r--r-- | storage/innobase/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/myisam/Makefile.am | 2 | ||||
| -rw-r--r-- | storage/myisammrg/Makefile.am | 1 | ||||
| -rw-r--r-- | strings/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | vio/Makefile.am | 1 | ||||
| -rw-r--r-- | win/Makefile.am | 21 | ||||
| -rw-r--r-- | zlib/Makefile.am | 3 |
29 files changed, 248 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am index f2450dffb45..3d49ce03c12 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 \ @@ -29,7 +29,7 @@ SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @mysql_se_plugins@ \ netware @libmysqld_dirs@ \ @bench_dirs@ support-files @tools_dirs@ \ - plugin + plugin win DIST_SUBDIRS = . include @docs_dirs@ zlib \ @readline_topdir@ sql-common \ @@ -39,7 +39,7 @@ DIST_SUBDIRS = . include @docs_dirs@ zlib \ @man_dirs@ tests SSL\ BUILD netware os2 @libmysqld_dirs@\ @bench_dirs@ support-files server-tools tools \ - plugin + plugin 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/client/Makefile.am b/client/Makefile.am index af7c3d2a549..970ca744146 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -77,6 +77,7 @@ strings_src=decimal.c # Fix for mit-threads DEFS = -DUNDEF_THREADS_HACK +EXTRA_DIST = get_password.c cmakelists.txt link_sources: for f in $(sql_src) ; do \ diff --git a/cmakelists.txt b/cmakelists.txt index dd6d514529f..5b17ef817cb 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -42,6 +42,5 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visu ADD_DEFINITIONS("-D_WINDOWS -D__WIN__") SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra - zlib storage/heap storage/myisam storage/myisammrg client sql - server-tools/instance-manager libmysql tests - ${se_subdirs}) + zlib storage/heap storage/myisam storage/myisammrg client + ${se_subdirs} sql server-tools/instance-manager libmysql tests) diff --git a/configure.in b/configure.in index 21bf9559245..e266c8878bf 100644 --- a/configure.in +++ b/configure.in @@ -2602,7 +2602,8 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl zlib/Makefile dnl cmd-line-utils/readline/Makefile dnl plugin/Makefile dnl - plugin/fulltext/Makefile) + plugin/fulltext/Makefile dnl + win/Makefile) AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h) AC_OUTPUT diff --git a/extra/Makefile.am b/extra/Makefile.am index 4fe1039d306..0aaa8c4d127 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 perror.o: perror.c $(COMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am index 7ec49ec8c33..3ce5e2632cc 100644 --- a/extra/yassl/Makefile.am +++ b/extra/yassl/Makefile.am @@ -1,2 +1,3 @@ SUBDIRS = taocrypt src -EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) +EXTRA_DIST = yassl.dsp yassl.dsw yassl.vcproj $(wildcard mySTL/*.hpp) \ + cmakelists.txt diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index a3e16b521a9..8cc29ec690a 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_libs_with_path) 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/cmakelists.txt b/libmysql/cmakelists.txt index 983799a8aca..35795102082 100644 --- a/libmysql/cmakelists.txt +++ b/libmysql/cmakelists.txt @@ -50,6 +50,5 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib yassl taocrypt) TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32) -# ToDo: We should move the mytest.c program out in libmysql/ -ADD_EXECUTABLE(myTest ../VC++Files/libmysqltest/mytest.c) +ADD_EXECUTABLE(myTest mytest.c) TARGET_LINK_LIBRARIES(myTest libmysql) diff --git a/libmysql/mytest.c b/libmysql/mytest.c new file mode 100644 index 00000000000..a1dc13db39f --- /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/libmysqld/Makefile.am b/libmysqld/Makefile.am index be9947ca2dd..b5d437918ae 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -22,6 +22,7 @@ MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) MYSQLLIBdir= $(libdir) +EXTRA_DIST = libmysqld.def DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 121342bec87..51ea249bbf6 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -58,7 +58,9 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ my_handler.c my_netware.c my_largepage.c \ my_windac.c my_access.c base64.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 \ + cmakelists.txt mf_soundex.c \ + my_conio.c my_wincond.c my_winsem.c my_winthread.c libmysys_a_LIBADD = @THREAD_LOBJECTS@ # test_dir_DEPENDENCIES= $(LIBRARIES) # testhash_DEPENDENCIES= $(LIBRARIES) diff --git a/regex/Makefile.am b/regex/Makefile.am index 7e8478e8123..6fd5b1b57a2 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/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index ab08df99fd9..462d7984aa4 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/server-tools/instance-manager/Makefile.am @@ -87,6 +87,8 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAGS@ \ $(top_builddir)/dbug/libdbug.a \ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ +EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ + IMService.h cmakelists.txt tags: ctags -R *.h *.cc diff --git a/sql/Makefile.am b/sql/Makefile.am index b0824110792..52a553c719c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -124,7 +124,8 @@ DEFS = -DMYSQL_SERVER \ @DEFS@ BUILT_SOURCES = sql_yacc.cc sql_yacc.h lex_hash.h -EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES) +EXTRA_DIST = udf_example.cc handlerton-win.cc $(BUILT_SOURCES) \ + nt_servc.cc nt_servc.h message.mc cmakelists.txt CLEANFILES = lex_hash.h sql_yacc.cc sql_yacc.h AM_YFLAGS = -d diff --git a/sql/cmakelists.txt b/sql/cmakelists.txt index d3c6c38472a..b3509904a77 100644 --- a/sql/cmakelists.txt +++ b/sql/cmakelists.txt @@ -67,10 +67,10 @@ ADD_CUSTOM_COMMAND( # Windows message file ADD_CUSTOM_COMMAND( - SOURCE ../VC++Files/sql/message.mc + SOURCE message.mc OUTPUT message.rc message.h - COMMAND mc ARGS ../VC++Files/sql/message.mc - DEPENDS ../VC++Files/sql/message.mc) + COMMAND mc ARGS message.mc + DEPENDS message.mc) # MySql_version.h. #ADD_CUSTOM_COMMAND( @@ -84,7 +84,9 @@ ADD_CUSTOM_COMMAND( SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data - DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in) + DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in + ${PROJECT_SOURCE_DIR}/win/configure.data + ${PROJECT_SOURCE_DIR}/win/config-handlerton.js) # Error file #GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION) 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/storage/archive/Makefile.am b/storage/archive/Makefile.am index c2ae9d6b728..415e0dc8f8f 100644 --- a/storage/archive/Makefile.am +++ b/storage/archive/Makefile.am @@ -27,6 +27,7 @@ noinst_PROGRAMS = archive_test archive_test_LDFLAGS = @NOINST_LDFLAGS@ noinst_HEADERS = azlib.h libarchive_a_SOURCES = azio.c +EXTRA_DIST = cmakelists.txt # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/bdb/Makefile.in b/storage/bdb/Makefile.in index c6d445f2ed5..4e2439025f3 100644 --- a/storage/bdb/Makefile.in +++ b/storage/bdb/Makefile.in @@ -23,13 +23,13 @@ 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_win32 clib common cxx db dbinc \ dbinc_auto db185 db_archive db_checkpoint db_deadlock db_dump \ db_dump185 db_hotbackup db_load db_printlog db_recover db_stat db_upgrade \ db_verify dbm dbreg dist env fileops hash \ hsearch hmac include lock log mp mutex os \ - os_win32 qam rep txn xa sequence + os_win32 qam rep txn xa sequence crypto @SET_MAKE@ diff --git a/storage/example/Makefile.am b/storage/example/Makefile.am index efc0ede91e9..68db89ee220 100644 --- a/storage/example/Makefile.am +++ b/storage/example/Makefile.am @@ -31,7 +31,7 @@ pkglib_LTLIBRARIES = ha_example.la ha_example_la_LDFLAGS = -module noinst_HEADERS = ha_example.h ha_example_la_SOURCES = ha_example.cc - +EXTRA_DIST = cmakelists.txt LDADD = DEFS = -DMYSQL_SERVER @DEFS@ diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am index 79e0379f9a4..fceaeec664a 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -30,6 +30,7 @@ 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/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index 9de4bcdc995..22796b45882 100644 --- a/storage/innobase/Makefile.am +++ b/storage/innobase/Makefile.am @@ -76,7 +76,8 @@ EXTRA_DIST = include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr include/univ.i include/usr0sess.h include/usr0sess.ic include/usr0types.h \ include/ut0byte.h include/ut0byte.ic include/ut0dbg.h include/ut0lst.h \ include/ut0mem.h include/ut0mem.ic include/ut0rnd.h include/ut0rnd.ic \ - include/ut0sort.h include/ut0ut.h include/ut0ut.ic + include/ut0sort.h include/ut0ut.h include/ut0ut.ic \ + cmakelists.txt # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 7b021087163..de57f6f07b8 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -40,7 +40,9 @@ if we are compiling on Windows. */ #undef VERSION /* Include the header file generated by GNU autoconf */ +#ifndef __WIN__ #include "../ib_config.h" +#endif #ifdef HAVE_SCHED_H #include <sched.h> diff --git a/storage/myisam/Makefile.am b/storage/myisam/Makefile.am index e4327070997..3c6a5c22234 100644 --- a/storage/myisam/Makefile.am +++ b/storage/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/storage/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am index 14e3295c1ae..0719780b366 100644 --- a/storage/myisammrg/Makefile.am +++ b/storage/myisammrg/Makefile.am @@ -23,6 +23,7 @@ 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/strings/Makefile.am b/strings/Makefile.am index fcb97a071f1..1183fcae01a 100644 --- a/strings/Makefile.am +++ b/strings/Makefile.am @@ -54,7 +54,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 my_strchr.c + t_ctype.h my_strchr.c 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 131f8b1b625..ba0a7ad73d0 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 544639139de..b7e002a3033 100644 --- a/vio/Makefile.am +++ b/vio/Makefile.am @@ -38,6 +38,7 @@ 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/win/Makefile.am b/win/Makefile.am new file mode 100644 index 00000000000..8442214bb97 --- /dev/null +++ b/win/Makefile.am @@ -0,0 +1,21 @@ +# Copyright (C) 2006 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 + +## Process this file with automake to create Makefile.in +EXTRA_DIST = build-vs71.bat build-vs8.bat config-handlerton.js configure.js config-version.js README + +# Don't update the files from bitkeeper +%::SCCS/s.% diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 71619ce40c1..cc3777b1e88 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -29,5 +29,4 @@ 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 |