| List: | Commits | « Previous MessageNext Message » | |
| From: | Daniel Fischer | Date: | January 8 2007 2:09pm |
| Subject: | bk commit into 5.1 tree (df:1.2384) BUG#14420 | ||
| View as plain text | |||
Below is the list of changes that have just been committed into a local 5.1 repository of df. When df does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-01-08 14:09:48+01:00, df@stripped +22 -0 BUG#14420 merge to 5.1 MERGE: 1.1810.2362.43 configure.in@stripped, 2007-01-08 14:09:46+01:00, df@stripped +9 -9 BUG#14420 don't depend on dbug if debugging is configured out MERGE: 1.245.1.172 extra/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.30.1.8 libmysql/Makefile.shared@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.68.1.2 libmysqld/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.55.1.18 mysys/Makefile.am@stripped, 2007-01-08 14:09:46+01:00, df@stripped +1 -2 BUG#14420 don't depend on dbug if debugging is configured out MERGE: 1.62.1.13 netware/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.15.1.6 server-tools/instance-manager/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.29.1.6 sql/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.103.1.28 storage/heap/Makefile.am@stripped, 2007-01-08 14:09:46+01:00, df@stripped +2 -3 BUG#14420 don't depend on dbug if debugging is configured out MERGE: 1.9.5.2 storage/heap/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: heap/Makefile.am -> storage/heap/Makefile.am storage/heap/hp_test2.c@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.21.5.2 storage/heap/hp_test2.c@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: heap/hp_test2.c -> storage/heap/hp_test2.c storage/myisam/Makefile.am@stripped, 2007-01-08 14:09:46+01:00, df@stripped +9 -11 BUG#14420 don't depend on dbug if debugging is configured out MERGE: 1.29.6.2 storage/myisam/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: myisam/Makefile.am -> storage/myisam/Makefile.am storage/myisam/mi_test2.c@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.27.6.2 storage/myisam/mi_test2.c@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: myisam/mi_test2.c -> storage/myisam/mi_test2.c storage/ndb/config/type_ndbapitest.mk.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Auto merged MERGE: 1.10.4.2 storage/ndb/config/type_ndbapitest.mk.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/config/type_ndbapitest.mk.am -> storage/ndb/config/type_ndbapitest.mk.am storage/ndb/config/type_ndbapitools.mk.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.8.5.2 storage/ndb/config/type_ndbapitools.mk.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/config/type_ndbapitools.mk.am -> storage/ndb/config/type_ndbapitools.mk.am storage/ndb/src/common/util/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.10.3.2 storage/ndb/src/common/util/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/common/util/Makefile.am -> storage/ndb/src/common/util/Makefile.am storage/ndb/src/cw/cpcd/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.12.3.2 storage/ndb/src/cw/cpcd/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/cw/cpcd/Makefile.am -> storage/ndb/src/cw/cpcd/Makefile.am storage/ndb/src/kernel/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.10.7.2 storage/ndb/src/kernel/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/kernel/Makefile.am -> storage/ndb/src/kernel/Makefile.am storage/ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.3.4.2 storage/ndb/src/kernel/blocks/dbdict/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/kernel/blocks/dbdict/Makefile.am -> storage/ndb/src/kernel/blocks/dbdict/Makefile.am storage/ndb/src/mgmclient/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.17.3.2 storage/ndb/src/mgmclient/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/mgmclient/Makefile.am -> storage/ndb/src/mgmclient/Makefile.am storage/ndb/src/mgmsrv/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.22.3.2 storage/ndb/src/mgmsrv/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/src/mgmsrv/Makefile.am -> storage/ndb/src/mgmsrv/Makefile.am storage/ndb/test/run-test/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.19.5.2 storage/ndb/test/run-test/Makefile.am@stripped, 2007-01-08 14:00:45+01:00, df@stripped +0 -0 Merge rename: ndb/test/run-test/Makefile.am -> storage/ndb/test/run-test/Makefile.am vio/Makefile.am@stripped, 2007-01-08 14:00:46+01:00, df@stripped +0 -0 Auto merged MERGE: 1.17.1.6 # This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: df # Host: kahlann.erinye.com # Root: /home/df/mysql/build/mysql-5.1-build-work-14420/RESYNC --- 1.411/configure.in 2007-01-01 09:55:32 +01:00 +++ 1.412/configure.in 2007-01-08 14:09:46 +01:00 @@ -1553,19 +1553,28 @@ then AC_DEFINE([DBUG_ON], [1], [Use libdbug]) CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS" + dbug_lib="\$(top_builddir)/dbug/libdbug.a" + sql_server_dirs_dbug=dbug elif test "$with_debug" = "full" then # Full debug. Very slow in some cases AC_DEFINE([DBUG_ON], [1], [Use libdbug]) CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS" CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS" + dbug_lib="\$(top_builddir)/dbug/libdbug.a" + sql_server_dirs_dbug=dbug else # Optimized version. No debug AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug]) CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS" CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS" + dbug_lib= + sql_server_dirs_dbug= fi +AC_SUBST(dbug_lib) +AM_CONDITIONAL(DBUG, test "$with_debug" = "yes" -o "$with_debug" = "full") + # If we should allow error injection tests AC_ARG_WITH(error-inject, AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]), @@ -1579,7 +1588,6 @@ then AC_DEFINE([ERROR_INJECT_SUPPORT], [1], [Enable error injection in MySQL Server]) fi -fi AC_ARG_WITH([fast-mutexes], AC_HELP_STRING([--with-fast-mutexes], @@ -2465,7 +2473,7 @@ fi if test "$with_server" != "no" then server_scripts="mysqld_safe mysql_install_db" - sql_server_dirs="strings mysys dbug extra regex" + sql_server_dirs="strings mysys $sql_server_dirs_dbug extra regex" sql_server="$sql_server vio sql" fi --- 1.44/extra/Makefile.am 2006-12-31 01:06:32 +01:00 +++ 1.45/extra/Makefile.am 2007-01-08 14:00:45 +01:00 @@ -16,7 +16,7 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ - ../dbug/libdbug.a ../strings/libmystrings.a + $(dbug_lib) ../strings/libmystrings.a BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ $(top_builddir)/include/sql_state.h \ $(top_builddir)/include/mysqld_ername.h --- 1.9.5.1/heap/Makefile.am 2007-01-08 12:55:57 +01:00 +++ 1.22/storage/heap/Makefile.am 2007-01-08 14:09:46 +01:00 @@ -13,20 +13,43 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADD = libheap.a ../mysys/libmysys.a $(dbug_lib) \ - ../strings/libmystrings.a +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/sql \ + -I$(srcdir) +WRAPLIBS= + +LDADD = + +DEFS = @DEFS@ pkglib_LIBRARIES = libheap.a noinst_PROGRAMS = hp_test1 hp_test2 +noinst_LIBRARIES = libheap.a hp_test1_LDFLAGS = @NOINST_LDFLAGS@ +hp_test1_LDADD = libheap.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a hp_test2_LDFLAGS = @NOINST_LDFLAGS@ -noinst_HEADERS = heapdef.h +hp_test2_LDADD = libheap.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a +noinst_HEADERS = heapdef.h ha_heap.h libheap_a_SOURCES = hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \ hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \ hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \ hp_rkey.c hp_block.c \ + ha_heap.cc \ hp_hash.c _check.c _rectest.c hp_static.c -EXTRA_DIST = CMakeLists.txt + + +EXTRA_DIST = CMakeLists.txt plug.in + # Don't update the files from bitkeeper %::SCCS/s.% --- 1.21.5.1/heap/hp_test2.c 2007-01-08 12:55:57 +01:00 +++ 1.30/storage/heap/hp_test2.c 2007-01-08 14:00:45 +01:00 @@ -466,7 +466,7 @@ int main(int argc, char *argv[]) #endif printf("- Read through all records with scan\n"); - if (heap_extra(file,HA_EXTRA_RESET) || heap_extra(file,HA_EXTRA_CACHE)) + if (heap_reset(file) || heap_extra(file,HA_EXTRA_CACHE)) { puts("got error from heap_extra"); goto end; @@ -599,7 +599,7 @@ end: if (heap_close(file) || (file2 && heap_close(file2))) goto err; heap_delete_table(filename2); - heap_panic(HA_PANIC_CLOSE); + hp_panic(HA_PANIC_CLOSE); my_end(MY_GIVE_INFO); return(0); err: @@ -614,7 +614,6 @@ err: static int get_options(int argc,char *argv[]) { char *pos,*progname; - DEBUGGER_OFF; progname= argv[0]; @@ -643,7 +642,6 @@ static int get_options(int argc,char *ar printf("Usage: %s [-?ABIKLsWv] [-m#] [-t#]\n",progname); exit(0); case '#': - DEBUGGER_ON; DBUG_PUSH (++pos); break; } @@ -667,7 +665,7 @@ static sig_handler endprog(int sig_numbe else #endif { - heap_panic(HA_PANIC_CLOSE); + hp_panic(HA_PANIC_CLOSE); my_end(1); exit(1); } --- 1.29.6.1/myisam/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.41/storage/myisam/Makefile.am 2007-01-08 14:09:46 +01:00 @@ -13,29 +13,75 @@ # 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 ft_stem.c CMakeLists.txt -pkgdata_DATA = mi_test_all mi_test_all.res +MYSQLDATAdir = $(localstatedir) +MYSQLSHAREdir = $(pkgdatadir) +MYSQLBASEdir= $(prefix) +MYSQLLIBdir= $(pkglibdir) +INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \ + -I$(top_srcdir)/regex \ + -I$(top_srcdir)/sql \ + -I$(srcdir) +WRAPLIBS= -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ - $(top_builddir)/mysys/libmysys.a \ - $(dbug_lib) \ - $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ +LDADD = + +DEFS = @DEFS@ + +EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in +pkgdata_DATA = mi_test_all mi_test_all.res pkglib_LIBRARIES = libmyisam.a bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump myisamchk_DEPENDENCIES= $(LIBRARIES) +myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ myisamlog_DEPENDENCIES= $(LIBRARIES) +myisamlog_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ myisampack_DEPENDENCIES=$(LIBRARIES) +myisampack_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ noinst_PROGRAMS = mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test1 ft_eval -noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h fulltext.h ftdefs.h ft_test1.h ft_eval.h +noinst_HEADERS = myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h \ + fulltext.h ftdefs.h ft_test1.h ft_eval.h \ + ha_myisam.h mi_test1_DEPENDENCIES= $(LIBRARIES) +mi_test1_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ mi_test2_DEPENDENCIES= $(LIBRARIES) +mi_test2_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ mi_test3_DEPENDENCIES= $(LIBRARIES) +mi_test3_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ #ft_test1_DEPENDENCIES= $(LIBRARIES) #ft_eval_DEPENDENCIES= $(LIBRARIES) myisam_ftdump_DEPENDENCIES= $(LIBRARIES) +myisam_ftdump_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ rt_test_DEPENDENCIES= $(LIBRARIES) +rt_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ sp_test_DEPENDENCIES= $(LIBRARIES) +sp_test_LDADD = @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ + $(top_builddir)/mysys/libmysys.a \ + $(dbug_lib) \ + $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ libmyisam_a_SOURCES = mi_open.c mi_extra.c mi_info.c mi_rkey.c \ mi_rnext.c mi_rnext_same.c \ mi_search.c mi_page.c mi_key.c mi_locking.c \ @@ -51,9 +97,9 @@ libmyisam_a_SOURCES = mi_open.c mi_extra mi_keycache.c mi_preload.c \ ft_parser.c ft_stopwords.c ft_static.c \ ft_update.c ft_boolean_search.c ft_nlq_search.c sort.c \ + ha_myisam.cc \ rt_index.c rt_key.c rt_mbr.c rt_split.c sp_key.c CLEANFILES = test?.MY? FT?.MY? isam.log mi_test_all rt_test.MY? sp_test.MY? -DEFS = -DMAP_TO_USE_RAID # Move to automake rules ? prolint:; plparse -b -u -hF1 "-width(0,0)" "-format=%f:%l:\s%t:%n\s%m" \ --- 1.27.6.1/myisam/mi_test2.c 2007-01-08 12:55:58 +01:00 +++ 1.36/storage/myisam/mi_test2.c 2007-01-08 14:00:45 +01:00 @@ -91,6 +91,7 @@ int main(int argc, char *argv[]) keyinfo[0].key_alg=HA_KEY_ALG_BTREE; keyinfo[0].keysegs=1; keyinfo[0].flag = pack_type; + keyinfo[0].block_length= 0; /* Default block length */ keyinfo[1].seg= &glob_keyseg[1][0]; keyinfo[1].seg[0].start=7; keyinfo[1].seg[0].length=6; @@ -107,6 +108,7 @@ int main(int argc, char *argv[]) keyinfo[1].key_alg=HA_KEY_ALG_BTREE; keyinfo[1].keysegs=2; keyinfo[1].flag =0; + keyinfo[1].block_length= MI_MIN_KEY_BLOCK_LENGTH; /* Diff blocklength */ keyinfo[2].seg= &glob_keyseg[2][0]; keyinfo[2].seg[0].start=12; keyinfo[2].seg[0].length=8; @@ -117,6 +119,7 @@ int main(int argc, char *argv[]) keyinfo[2].key_alg=HA_KEY_ALG_BTREE; keyinfo[2].keysegs=1; keyinfo[2].flag =HA_NOSAME; + keyinfo[2].block_length= 0; /* Default block length */ keyinfo[3].seg= &glob_keyseg[3][0]; keyinfo[3].seg[0].start=0; keyinfo[3].seg[0].length=reclength-(use_blob ? 8 : 0); @@ -128,6 +131,7 @@ int main(int argc, char *argv[]) keyinfo[3].key_alg=HA_KEY_ALG_BTREE; keyinfo[3].keysegs=1; keyinfo[3].flag = pack_type; + keyinfo[3].block_length= 0; /* Default block length */ keyinfo[4].seg= &glob_keyseg[4][0]; keyinfo[4].seg[0].start=0; keyinfo[4].seg[0].length=5; @@ -139,6 +143,7 @@ int main(int argc, char *argv[]) keyinfo[4].key_alg=HA_KEY_ALG_BTREE; keyinfo[4].keysegs=1; keyinfo[4].flag = pack_type; + keyinfo[4].block_length= 0; /* Default block length */ keyinfo[5].seg= &glob_keyseg[5][0]; keyinfo[5].seg[0].start=0; keyinfo[5].seg[0].length=4; @@ -150,6 +155,7 @@ int main(int argc, char *argv[]) keyinfo[5].key_alg=HA_KEY_ALG_BTREE; keyinfo[5].keysegs=1; keyinfo[5].flag = pack_type; + keyinfo[5].block_length= 0; /* Default block length */ recinfo[0].type=pack_fields ? FIELD_SKIP_PRESPACE : 0; recinfo[0].length=7; @@ -698,7 +704,7 @@ int main(int argc, char *argv[]) if (!silent) printf("- mi_extra(CACHE) + mi_rrnd.... + mi_extra(NO_CACHE)\n"); - if (mi_extra(file,HA_EXTRA_RESET,0) || mi_extra(file,HA_EXTRA_CACHE,0)) + if (mi_reset(file) || mi_extra(file,HA_EXTRA_CACHE,0)) { if (locking || (!use_blob && !pack_fields)) { @@ -741,7 +747,7 @@ int main(int argc, char *argv[]) DBUG_PRINT("progpos",("Removing keys")); lastpos = HA_OFFSET_ERROR; /* DBUG_POP(); */ - mi_extra(file,HA_EXTRA_RESET,0); + mi_reset(file); found_parts=0; while ((error=mi_rrnd(file,read_record,HA_OFFSET_ERROR)) != HA_ERR_END_OF_FILE) @@ -860,7 +866,6 @@ err: static void get_options(int argc, char **argv) { char *pos,*progname; - DEBUGGER_OFF; progname= argv[0]; @@ -911,13 +916,13 @@ static void get_options(int argc, char * } break; case 'e': /* myisam_block_length */ - if ((myisam_block_size=atoi(++pos)) < MI_MIN_KEY_BLOCK_LENGTH || + if ((myisam_block_size= atoi(++pos)) < MI_MIN_KEY_BLOCK_LENGTH || myisam_block_size > MI_MAX_KEY_BLOCK_LENGTH) { fprintf(stderr,"Wrong myisam_block_length\n"); exit(1); } - myisam_block_size=1 << my_bit_log2(myisam_block_size); + myisam_block_size= my_round_up_to_next_power(myisam_block_size); break; case 'E': /* myisam_block_length */ if ((key_cache_block_size=atoi(++pos)) < MI_MIN_KEY_BLOCK_LENGTH || @@ -926,7 +931,7 @@ static void get_options(int argc, char * fprintf(stderr,"Wrong key_cache_block_size\n"); exit(1); } - key_cache_block_size=1 << my_bit_log2(key_cache_block_size); + key_cache_block_size= my_round_up_to_next_power(key_cache_block_size); break; case 'f': if ((first_key=atoi(++pos)) < 0 || first_key >= MYISAM_KEYS) @@ -973,7 +978,6 @@ static void get_options(int argc, char * progname); exit(0); case '#': - DEBUGGER_ON; DBUG_PUSH (++pos); break; default: --- 1.88/mysys/Makefile.am 2006-12-31 01:06:32 +01:00 +++ 1.89/mysys/Makefile.am 2007-01-08 14:09:46 +01:00 @@ -19,7 +19,7 @@ MYSQLBASEdir= $(prefix) INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ -I$(top_srcdir)/include -I$(srcdir) pkglib_LIBRARIES = libmysys.a -LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a +LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(dbug_lib) noinst_HEADERS = mysys_priv.h my_static.h libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ mf_path.c mf_loadpath.c my_file.c \ --- 1.170/sql/Makefile.am 2006-12-31 01:06:33 +01:00 +++ 1.171/sql/Makefile.am 2007-01-08 14:00:45 +01:00 @@ -31,7 +31,7 @@ bin_PROGRAMS = mysql_tzinfo_to_sql gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@ SUPPORTING_LIBS = $(top_builddir)/vio/libvio.a \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/dbug/libdbug.a \ + $(dbug_lib) \ $(top_builddir)/regex/libregex.a \ $(top_builddir)/strings/libmystrings.a mysqld_DEPENDENCIES= @mysql_plugin_libs@ $(SUPPORTING_LIBS) --- 1.46/server-tools/instance-manager/Makefile.am 2007-01-02 19:24:25 +01:00 +++ 1.47/server-tools/instance-manager/Makefile.am 2007-01-08 14:00:45 +01:00 @@ -88,7 +88,7 @@ mysqlmanager_LDADD= @CLIENT_EXTRA_LDFLAG $(top_builddir)/vio/libvio.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ - $(top_builddir)/dbug/libdbug.a \ + $(dbug_lib) \ @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ EXTRA_DIST = WindowsService.cpp WindowsService.h IMService.cpp \ --- 1.23/netware/Makefile.am 2006-12-02 06:09:30 +01:00 +++ 1.24/netware/Makefile.am 2007-01-08 14:00:45 +01:00 @@ -17,7 +17,8 @@ if HAVE_NETWARE INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ - ../dbug/libdbug.a ../strings/libmystrings.a + $(dbug_lib) ../strings/libmystrings.a + bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql mysqld_safe_SOURCES= mysqld_safe.c my_manage.c mysql_install_db_SOURCES= mysql_install_db.c my_manage.c --- 1.106/libmysqld/Makefile.am 2006-12-31 01:06:32 +01:00 +++ 1.107/libmysqld/Makefile.am 2007-01-08 14:00:45 +01:00 @@ -89,7 +89,7 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sq INC_LIB= $(top_builddir)/regex/libregex.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ - $(top_builddir)/dbug/libdbug.a \ + $(dbug_lib) \ $(top_builddir)/vio/libvio.a \ @mysql_plugin_libs@ \ $(yassl_inc_libs) --- 1.70/libmysql/Makefile.shared 2006-11-27 22:58:10 +01:00 +++ 1.71/libmysql/Makefile.shared 2007-01-08 14:00:45 +01:00 @@ -49,7 +49,6 @@ mystringsobjects = strmov.lo strxmov.lo ctype-uca.lo xml.lo my_strtoll10.lo str_alloc.lo mystringsextra= strto.c -dbugobjects = dbug.lo # IT IS IN SAFEMALLOC.C sanity.lo mysysheaders = mysys_priv.h my_static.h vioheaders = vio_priv.h mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \ @@ -87,6 +86,12 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYS -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) + +if DBUG +dbugobjects = dbug.lo +else +dbugobjects = +endif if HAVE_YASSL yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \ --- 1.10.4.1/ndb/config/type_ndbapitest.mk.am 2007-01-08 12:55:58 +01:00 +++ 1.16/storage/ndb/config/type_ndbapitest.mk.am 2007-01-08 14:00:45 +01:00 @@ -13,19 +13,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \ - $(top_builddir)/ndb/src/libndbclient.la \ +LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ INCLUDES += -I$(top_srcdir) \ -I$(top_builddir)/include \ - -I$(top_builddir)/ndb/include \ + -I$(top_builddir)/storage/ndb/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/ndb/include \ - -I$(top_srcdir)/ndb/include/ndbapi \ - -I$(top_srcdir)/ndb/include/util \ - -I$(top_srcdir)/ndb/include/portlib \ - -I$(top_srcdir)/ndb/test/include \ - -I$(top_srcdir)/ndb/include/mgmapi + -I$(top_srcdir)/storage/ndb/include \ + -I$(top_srcdir)/storage/ndb/include/ndbapi \ + -I$(top_srcdir)/storage/ndb/include/util \ + -I$(top_srcdir)/storage/ndb/include/portlib \ + -I$(top_srcdir)/storage/ndb/test/include \ + -I$(top_srcdir)/storage/ndb/include/mgmapi --- 1.10.3.1/ndb/src/common/util/Makefile.am 2007-01-08 13:59:37 +01:00 +++ 1.15/storage/ndb/src/common/util/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -29,7 +29,7 @@ libgeneral_la_SOURCES = \ EXTRA_PROGRAMS = testBitmask testBitmask_SOURCES = testBitmask.cpp testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @@ -42,8 +42,8 @@ testBitmask.o: $(testBitmask_SOURCES) $(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $< -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am # Don't update the files from bitkeeper %::SCCS/s.% @@ -51,13 +51,13 @@ include $(top_srcdir)/ndb/config/type_ut windoze-dsp: libgeneral.dsp libgeneral.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-lib.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-lib.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(libgeneral_la_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD) + $(top_srcdir)/storage/ndb/config/win-lib.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgeneral_la_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD) --- 1.12.3.1/ndb/src/cw/cpcd/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.16/storage/ndb/src/cw/cpcd/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -18,13 +18,13 @@ ndbbin_PROGRAMS = ndb_cpcd ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp LDADD_LOC = \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@ --- 1.10.7.1/ndb/src/kernel/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.19/storage/ndb/src/kernel/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -13,15 +13,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SUBDIRS = error blocks vm +SUBDIRS = vm error blocks -include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am ndbbin_PROGRAMS = ndbd ndbd_SOURCES = main.cpp SimBlockList.cpp -include $(top_srcdir)/ndb/config/type_kernel.mk.am +include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am INCLUDES += \ -I$(srcdir)/blocks/cmvmi \ @@ -38,51 +38,38 @@ INCLUDES += \ -I$(srcdir)/blocks/backup \ -I$(srcdir)/blocks/dbutil \ -I$(srcdir)/blocks/suma \ - -I$(srcdir)/blocks/dbtux + -I$(srcdir)/blocks/dbtux \ + -I$(srcdir)/blocks LDADD += \ - blocks/cmvmi/libcmvmi.a \ - blocks/dbacc/libdbacc.a \ - blocks/dbdict/libdbdict.a \ - blocks/dbdih/libdbdih.a \ - blocks/dblqh/libdblqh.a \ - blocks/dbtc/libdbtc.a \ - blocks/dbtup/libdbtup.a \ - blocks/ndbfs/libndbfs.a \ - blocks/ndbcntr/libndbcntr.a \ - blocks/qmgr/libqmgr.a \ - blocks/trix/libtrix.a \ - blocks/backup/libbackup.a \ - blocks/dbutil/libdbutil.a \ - blocks/suma/libsuma.a \ - blocks/dbtux/libdbtux.a \ + blocks/libblocks.a \ vm/libkernel.a \ error/liberror.a \ - $(top_builddir)/ndb/src/common/transporter/libtransporter.la \ - $(top_builddir)/ndb/src/common/debugger/libtrace.la \ - $(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ - $(top_builddir)/ndb/src/common/logger/liblogger.la \ - $(top_builddir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ - $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \ - $(top_builddir)/ndb/src/common/portlib/libportlib.la \ - $(top_builddir)/ndb/src/common/util/libgeneral.la \ + $(top_builddir)/storage/ndb/src/common/transporter/libtransporter.la \ + $(top_builddir)/storage/ndb/src/common/debugger/libtrace.la \ + $(top_builddir)/storage/ndb/src/common/debugger/signaldata/libsignaldataprint.la \ + $(top_builddir)/storage/ndb/src/common/logger/liblogger.la \ + $(top_builddir)/storage/ndb/src/common/mgmcommon/libmgmsrvcommon.la \ + $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \ + $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ + $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ -# Don't update the files from bitkeeper -%::SCCS/s.% - windoze-dsp: ndbd.dsp -ndbd.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(ndbd_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) +storage/ndbd.dsp: Makefile \ + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) + +# Don't update the files from bitkeeper +%::SCCS/s.% --- 1.3.4.1/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.10/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -13,36 +13,23 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -noinst_LIBRARIES = libdbdict.a -EXTRA_PROGRAMS = printSchemaFile - -libdbdict_a_SOURCES = Dbdict.cpp - -printSchemaFile_SOURCES = printSchemaFile.cpp - -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am LDADD += \ - $(top_builddir)/ndb/src/common/util/libgeneral.la \ - $(top_builddir)/ndb/src/common/portlib/libportlib.la \ + $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \ + $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \ + $(top_builddir)/dbug/libdbug.a \ + $(top_builddir)/mysys/libmysys.a \ + $(top_builddir)/strings/libmystrings.a + +ndbtools_PROGRAMS = ndb_print_schema_file +ndb_print_schema_file_SOURCES = printSchemaFile.cpp +ndb_print_schema_file_LDFLAGS = @ndb_bin_am_ldflags@ \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a # Don't update the files from bitkeeper %::SCCS/s.% - -windoze-dsp: libdbdict.dsp - -libdbdict.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-lib.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-lib.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD) --- 1.17.3.1/ndb/src/mgmclient/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.21/storage/ndb/src/mgmclient/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -26,11 +26,11 @@ libndbmgmclient_la_LIBADD = ../mgmapi/li ndb_mgm_SOURCES = main.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am -INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \ - -I$(top_srcdir)/ndb/src/common/mgmcommon +INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \ + -I$(top_srcdir)/storage/ndb/src/common/mgmcommon LDADD_LOC = $(noinst_LTLIBRARIES) \ ../common/portlib/libportlib.la \ @@ -48,25 +48,25 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp ndb_mgm.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) libndbmgmclient.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-lib.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-lib.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LIB + $(top_srcdir)/storage/ndb/config/win-lib.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB --- 1.22.3.1/ndb/src/mgmsrv/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.27/storage/ndb/src/mgmsrv/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -33,13 +33,13 @@ ndb_mgmd_SOURCES = \ InitConfigFileParser.cpp \ Config.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \ - -I$(top_srcdir)/ndb/src/mgmapi \ - -I$(top_srcdir)/ndb/src/common/mgmcommon \ - -I$(top_srcdir)/ndb/src/mgmclient +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \ + -I$(top_srcdir)/storage/ndb/src/mgmapi \ + -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \ + -I$(top_srcdir)/storage/ndb/src/mgmclient -LDADD_LOC = $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.o \ - $(top_builddir)/ndb/src/libndbclient.la \ +LDADD_LOC = $(top_builddir)/storage/ndb/src/mgmclient/CommandInterpreter.o \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a \ @@ -52,8 +52,8 @@ DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MY -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\"" -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@ @@ -63,13 +63,13 @@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@ windoze-dsp: ndb_mgmd.dsp ndb_mgmd.dsp: Makefile \ - $(top_srcdir)/ndb/config/win-prg.am \ - $(top_srcdir)/ndb/config/win-name \ - $(top_srcdir)/ndb/config/win-includes \ - $(top_srcdir)/ndb/config/win-sources \ - $(top_srcdir)/ndb/config/win-libraries - cat $(top_srcdir)/ndb/config/win-prg.am > $@ - @$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS) - @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES) - @$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES) - @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD) + $(top_srcdir)/storage/ndb/config/win-prg.am \ + $(top_srcdir)/storage/ndb/config/win-name \ + $(top_srcdir)/storage/ndb/config/win-includes \ + $(top_srcdir)/storage/ndb/config/win-sources \ + $(top_srcdir)/storage/ndb/config/win-libraries + cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@ + @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS) + @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES) + @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES) + @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD) --- 1.19.5.1/ndb/test/run-test/Makefile.am 2007-01-08 12:55:58 +01:00 +++ 1.28/storage/ndb/test/run-test/Makefile.am 2007-01-08 14:00:46 +01:00 @@ -15,12 +15,15 @@ testdir=$(prefix)/mysql-test/ndb -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am -include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am +include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am test_PROGRAMS = atrt test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \ + conf-daily-basic-ndb08.txt \ + conf-daily-devel-ndb08.txt \ + conf-daily-sql-ndb08.txt \ conf-ndbmaster.txt \ conf-shark.txt \ conf-dl145a.txt @@ -29,9 +32,9 @@ test_SCRIPTS=atrt-analyze-result.sh atrt atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh atrt_SOURCES = main.cpp run-test.hpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include -LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \ - $(top_builddir)/ndb/src/libndbclient.la \ +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include +LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ --- 1.8.5.1/ndb/config/type_ndbapitools.mk.am 2007-01-08 12:55:58 +01:00 +++ 1.16/storage/ndb/config/type_ndbapitools.mk.am 2007-01-08 14:00:46 +01:00 @@ -14,19 +14,19 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA LDADD += \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(dbug_lib) \ $(top_builddir)/mysys/libmysys.a \ - $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ + $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ @ZLIB_LIBS@ INCLUDES += -I$(srcdir) \ -I$(top_builddir)/include \ - -I$(top_builddir)/ndb/include \ + -I$(top_builddir)/storage/ndb/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/ndb/include \ - -I$(top_srcdir)/ndb/include/ndbapi \ - -I$(top_srcdir)/ndb/include/util \ - -I$(top_srcdir)/ndb/include/portlib \ - -I$(top_srcdir)/ndb/test/include \ - -I$(top_srcdir)/ndb/include/mgmapi \ - -I$(top_srcdir)/ndb/include/kernel + -I$(top_srcdir)/storage/ndb/include \ + -I$(top_srcdir)/storage/ndb/include/ndbapi \ + -I$(top_srcdir)/storage/ndb/include/util \ + -I$(top_srcdir)/storage/ndb/include/portlib \ + -I$(top_srcdir)/storage/ndb/test/include \ + -I$(top_srcdir)/storage/ndb/include/mgmapi \ + -I$(top_srcdir)/storage/ndb/include/kernel
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (df:1.2384) BUG#14420 | Daniel Fischer | 8 Jan |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.833 sec. using MySQL 5.1.14-beta-log