mirror of
https://github.com/MariaDB/server.git
synced 2025-01-15 19:42:28 +01:00
a1f630ccfe
- Revert wrongly record embedded result files. These were either recorded with normal server (not embedded) or an embedded server with not default compile option. This can be seen that the committed result file had replication variables which should never happen. - Reverted back change of include/is_embedded.inc. One cannot check for $MYSQL_EMBEDDED as this only tells if there exists an embedded server, not if the current server we are testing is the embedded server. This could easily be verified by doing 'mtr sys_vars.sysvars_server_embedded'. This would fail with a wrong result instead of being marked as skipped as --embedded was not used.
16 lines
492 B
PHP
16 lines
492 B
PHP
#
|
|
# Test that we do not have an embedded server compiled with privileges.
|
|
# This is not a regular setup, but we are running this in buildbot for
|
|
# testing of embedded + privileges.
|
|
# Some funcs_1 test cannot handle this combination, which is why we have this
|
|
# file to disable them
|
|
#
|
|
|
|
--source include/is_embedded.inc
|
|
|
|
let priv=`SELECT privileges FROM information_schema.columns limit 1`;
|
|
|
|
if (`SELECT "$priv" <> ""`)
|
|
{
|
|
--skip Embedded server is compiled with privileges; Test disabled.
|
|
}
|