diff options
| author | unknown <monty@mysql.com> | 2006-04-19 10:39:57 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-04-19 10:39:57 +0300 |
| commit | ce088e8c903a879bc34528e02281c581e6e4c89e (patch) | |
| tree | 6e7aa17c00ad66c8e61bb6acc3ee1bfed1688a95 /libmysqld | |
| parent | 7c3d1e096b6a9f51958ee7dce6cd54b8fe1e2cd0 (diff) | |
| download | mariadb-git-ce088e8c903a879bc34528e02281c581e6e4c89e.tar.gz | |
Fix compilation failure when compiling with BUILD/compile-pentium-debug-max
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc
libmysqld/Makefile.am:
Fix compiler failure (libmysqld.a was empty)
Reason was that 'cd' did an echo that confused 'ar'
mysql-test/mysql-test-run.pl:
Make the port number in a nice range
mysql-test/mysql-test-run.sh:
Remove deprication message until speed of mysql-test-run.pl is comparable to mysql-test-run.sh
Fix code that jimw broke in his last change
storage/example/ha_example.cc:
Removed memory leak
(example_done_func was not called)
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index df4d7bb3618..a869a3ccfe9 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -136,14 +136,17 @@ else then \ $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ else \ + current_dir=`pwd`; \ rm -rf tmp; mkdir tmp; \ (for arc in ./libmysqld_int.a $(INC_LIB); do \ arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \ artmp=`echo $$arc|sed 's|^.*/|tmp/lib-|'`; \ for F in `$(AR) t $$arc`; do \ if test -e "$$arpath/$$F" ; then echo "$$arpath/$$F"; else \ - mkdir $$artmp; cd $$artmp; $(AR) x ../../$$arc; \ - cd ../..; ls $$artmp/*; \ + mkdir $$artmp; cd $$artmp > /dev/null; \ + $(AR) x ../../$$arc; \ + cd $$current_dir > /dev/null; \ + ls $$artmp/*; \ continue 2; fi; done; \ done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \ $(RANLIB) libmysqld.a ; \ |