1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge branch '10.1' into pull-request-97

Merge downstream Debian packaging (MDEV-6284)
This commit is contained in:
Sergei Golubchik
2015-09-25 10:24:14 +02:00
306 changed files with 8618 additions and 2027 deletions

View File

@@ -3,6 +3,7 @@ if (!$HA_EXAMPLE_SO) { skip requires ha_examples.so; }
if (!$LIBDAEMON_EXAMPLE_SO) { skip requires libdaemon_examples.so; }
if (!$UDF_EXAMPLE_SO) { skip requires udf_example.so; }
if (!$EXAMPLE_KEY_MANAGEMENT_SO) { skip requires example_key_management.so; }
if (`SELECT VERSION() LIKE '%embedded%'`) { skip Disabled for embedded until MDEV-8664 is resolved; }
flush status;
show status like '%libraries%';