diff options
| -rw-r--r-- | debian/dist/Debian/mariadb-server-5.5.postinst | 2 | ||||
| -rw-r--r-- | debian/mariadb-server-5.5.mysql.init | 4 | ||||
| -rw-r--r-- | libmysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | storage/maria/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | storage/maria/ma_test_all.sh | 13 | ||||
| -rw-r--r-- | storage/myisam/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | storage/myisam/mi_test_all.sh | 2 |
7 files changed, 17 insertions, 9 deletions
diff --git a/debian/dist/Debian/mariadb-server-5.5.postinst b/debian/dist/Debian/mariadb-server-5.5.postinst index 2e15b121db9..4da8979fd03 100644 --- a/debian/dist/Debian/mariadb-server-5.5.postinst +++ b/debian/dist/Debian/mariadb-server-5.5.postinst @@ -212,7 +212,7 @@ EOF # admin might already have chosen to remove one or more plugins. Newlines are necessary. install_plugins=`/bin/echo -e \ "USE mysql;\n" \ - "CREATE TABLE plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ + "CREATE TABLE IF NOT EXISTS plugin (name char(64) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " dl char(128) COLLATE utf8_bin NOT NULL DEFAULT '', " \ " PRIMARY KEY (name)) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';" ` diff --git a/debian/mariadb-server-5.5.mysql.init b/debian/mariadb-server-5.5.mysql.init index b83316aedea..01e1288525e 100644 --- a/debian/mariadb-server-5.5.mysql.init +++ b/debian/mariadb-server-5.5.mysql.init @@ -109,7 +109,7 @@ case "${1:-''}" in /usr/bin/mysqld_safe > /dev/null 2>&1 & # 6s was reported in #352070 to be too few when using ndbcluster - for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-14}"); do + for i in $(seq 1 "${MYSQLD_STARTUP_TIMEOUT:-30}"); do sleep 1 if mysqld_status check_alive nowarn ; then break; fi log_progress_msg "." @@ -142,7 +142,7 @@ case "${1:-''}" in log_daemon_msg "Killing MariaDB database server by signal" "mysqld" killall -15 mysqld server_down= - for i in 1 2 3 4 5 6 7 8 9 10; do + for i in 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10 1 2 3 4 5 6 7 8 9 10; do sleep 1 if mysqld_status check_dead nowarn; then server_down=1; break; fi done diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 182c8748934..f67b3962c1a 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -17,7 +17,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libmysql ${CMAKE_SOURCE_DIR}/regex - ${CMAKE_SOURCE_DIR}/sql ${CMAKE_SOURCE_DIR}/strings ${SSL_INCLUDE_DIRS} ${SSL_INTERNAL_INCLUDE_DIRS} diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 2817e11681c..9ca198873d1 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(aria_dump_log PROPERTIES COMPILE_FLAGS "-DMARIA_DUMP_LOG") MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c COMPONENT Server) TARGET_LINK_LIBRARIES(aria_pack aria) -IF(WITH_UNIT_TESTS AND FALSE) +IF(WITH_UNIT_TESTS) ADD_EXECUTABLE(ma_test1 ma_test1.c) TARGET_LINK_LIBRARIES(ma_test1 aria) diff --git a/storage/maria/ma_test_all.sh b/storage/maria/ma_test_all.sh index 041fbf3abe6..4e9be4a5beb 100755 --- a/storage/maria/ma_test_all.sh +++ b/storage/maria/ma_test_all.sh @@ -7,13 +7,22 @@ # # +PRG='unittest/ma_test_all-t' +UTST='../../unittest/unit.pl' + +if [ ! -x $PRG ] ; then + DIR=`dirname $0` + PRG="$DIR/unittest/ma_test_all-t" + UTST="$DIR/../../unittest/unit.pl" +fi + if test -n "$1"; then # unit.pl can't pass options to ma_test_all-t, so if anything # was passed as an argument, assume the purpose was to pass # them to ma_test_all-t and call it directly - unittest/ma_test_all-t $@ + $PRG $@ else - perl ../../unittest/unit.pl run unittest/ma_test_all-t + perl $UTST run $PRG fi diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt index 97c1bc78d95..f58c942b4d7 100644 --- a/storage/myisam/CMakeLists.txt +++ b/storage/myisam/CMakeLists.txt @@ -46,7 +46,7 @@ TARGET_LINK_LIBRARIES(myisamlog myisam) MYSQL_ADD_EXECUTABLE(myisampack myisampack.c COMPONENT Server) TARGET_LINK_LIBRARIES(myisampack myisam) -IF(WITH_UNIT_TESTS AND FALSE) +IF(WITH_UNIT_TESTS) ADD_EXECUTABLE(mi_test1 mi_test1.c) TARGET_LINK_LIBRARIES(mi_test1 myisam) diff --git a/storage/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh index 641f1cc0a35..c9c89a9ecac 100755 --- a/storage/myisam/mi_test_all.sh +++ b/storage/myisam/mi_test_all.sh @@ -99,7 +99,7 @@ if test -f mi_test1$MACH ; then suffix=$MACH ; else suffix=""; fi # check of myisampack / myisamchk ./myisampack$suffix --force -s test1 # Ignore error for index file -./myisamchk$suffix -es test1 2>&1 >& /dev/null +./myisamchk$suffix -es test1 2>&1 > /dev/null ./myisamchk$suffix -rqs test1 ./myisamchk$suffix -es test1 ./myisamchk$suffix -rs test1 |