diff options
| author | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:05:17 +0200 |
|---|---|---|
| committer | unknown <ingo/mydev@chilla.local> | 2006-07-24 10:05:17 +0200 |
| commit | 93528f288795c6d8efafeeeaf550b3f799b9cc38 (patch) | |
| tree | 638d4dfead823eae779c92bde50e3b1db2d58c2b /support-files | |
| parent | 7b2cabd902d3b6c669bd8a0302aaf8b7568cad06 (diff) | |
| parent | 034522f47dd56dffb4b590ab02d3ab3cdb65b6c8 (diff) | |
| download | mariadb-git-93528f288795c6d8efafeeeaf550b3f799b9cc38.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into chilla.local:/home/mydev/mysql-5.1-amerge
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/sql_table.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
configure.in:
Manual merge
mysql-test/extra/binlog_tests/blackhole.test:
Manual merge
mysql-test/r/binlog_stm_blackhole.result:
Manual merge
sql/ha_myisammrg.cc:
Manual merge
sql/handler.h:
Manual merge
storage/blackhole/ha_blackhole.cc:
Manual merge
support-files/mysql.spec.sh:
Manual merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index a961fc145a9..5d7c0ed154f 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -332,7 +332,6 @@ fi (cd mysql-debug-%{mysql_version} ; \ ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force ; \ true) - ############################################################################## # # Build the max binary @@ -344,7 +343,6 @@ CFLAGS="${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS} -g" \ CXXFLAGS="${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti} -g" \ BuildMySQL "--enable-shared \ --with-berkeley-db \ - --with-innodb \ --with-ndbcluster \ --with-archive-storage-engine \ --with-csv-storage-engine \ @@ -384,7 +382,6 @@ BuildMySQL "--enable-shared \ --with-embedded-server \ --with-big-tables \ --with-comment=\"MySQL Community Server (GPL)\"") - # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" then @@ -708,6 +705,15 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com> + +- Fix a typing error in the "make" target for the Perl script to run the tests. + +* Tue Jul 04 2006 Joerg Bruehe <joerg@mysql.com> + +- Use the Perl script to run the tests, because it will automatically check + whether the server is configured with SSL. + * Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com> - move "mysqldumpslow" from the client RPM to the server RPM (bug#20216) |