diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 57e1f2e4ef6d1716388d98617bf2ca3d9dd35c0c..f5b369f246ae4f9bdcce83cd99e0b91b26570848 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -177,3 +177,4 @@ ERROR at line 1: DELIMITER cannot contain a backslash character 1 1 End of 5.0 tests +WARNING: --server-arg option not supported in this configuration. diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index e7131efa0f336ff7102fb2377520750f29d968f9..16f5fecf0516abb4f7e743d8cd07b45d6b2531e0 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -275,3 +275,10 @@ EOF --exec $MYSQL --character-sets-dir="540bytelengthstringxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -e "select 1" 2>&1 --echo End of 5.0 tests + +# +# Bug #29903: The CMake build method does not produce the embedded library. +# +--disable_query_log +--exec $MYSQL --server-arg=no-defaults test -e "quit" +--enable_query_log