Automatic merge

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';" `
 

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

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}

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)
 

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

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)
 

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