merge

libmysqld/CMakeLists.txt

@@ -79,7 +79,8 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc
            ../sql/partition_info.cc ../sql/sql_connect.cc 
            ../sql/scheduler.cc ../sql/event_parse_data.cc
-           ../sql/sql_signal.cc ../sql/rpl_handler.cc
+           ../sql/sql_signal.cc ../sql/rpl_handler.cc ../sql/keycaches.cc 
+           ../sql/sys_vars.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}

mysql-test/suite/sys_vars/t/delayed_insert_limit_func.test

@@ -109,7 +109,8 @@ delimiter ;|
 --echo ** Connection con0 **
 connection con0;
 let $wait_condition=
-   SELECT variable_value > 0 FROM information_schema.global_status
+   SELECT variable_value > @@global.delayed_insert_limit
+   FROM information_schema.global_status
    WHERE variable_name like 'Not_flushed_delayed_rows';
 --source include/wait_condition.inc
 let $my_select= SELECT COUNT(*) FROM t1;