Merge mariadb-5.5 -> 10.0-base.

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

@@ -5,6 +5,7 @@
 #
 
 --source include/load_sysvars.inc
+--source include/not_embedded.inc
 
 #############################################################
 #                 Save initial value                        #

mysql-test/suite/sys_vars/t/ignore_db_dirs_basic-master.opt

@@ -0,0 +1,11 @@
+--ignore-db-dir=a
+--ignore-db-dir=b
+--ignore-db-dir=c
+--ignore-db-dir=
+--ignore-db-dir=d
+--ignore-db-dir x
+--ignore-db-dir=
+--ignore-db-dir=e
+--ignore-db-dir=lost+found
+--ignore-db-dir=.mysqlgui
+--ignore-db-dir=ignored_db

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

@@ -0,0 +1,38 @@
+select @@ignore_db_dirs;
+let $MYSQLD_DATADIR= `select @@datadir`;
+
+mkdir $MYSQLD_DATADIR/.mysqlgui;
+mkdir $MYSQLD_DATADIR/.otherdir;
+mkdir $MYSQLD_DATADIR/lost+found;
+mkdir $MYSQLD_DATADIR/ignored_db;
+--echo # Check that SHOW DATABASES ignores all directories from
+--echo # @@ignore_db_dirs and all directories with names starting
+--echo # with '.'
+SHOW DATABASES;
+--error ER_WRONG_DB_NAME
+USE ignored_db;
+--error ER_WRONG_DB_NAME
+SELECT * FROM ignored_db.t1;
+--error ER_WRONG_DB_NAME
+CALL ignored_db.p1();
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME='ignored_db';
+--error ER_WRONG_DB_NAME
+CREATE DATABASE ignored_db;
+CREATE DATABASE `lost+found`;
+USE `lost+found`;
+CREATE TABLE t1(id INT);
+INSERT INTO t1 VALUES (1), (2);
+SELECT * FROM `lost+found`.t1;
+SHOW DATABASES;
+DROP DATABASE `lost+found`;
+rmdir $MYSQLD_DATADIR/.mysqlgui;
+rmdir $MYSQLD_DATADIR/.otherdir;
+rmdir $MYSQLD_DATADIR/lost+found;
+rmdir $MYSQLD_DATADIR/ignored_db;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@global.ignore_db_dirs = 'aha';
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@local.ignore_db_dirs = 'aha';
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@ignore_db_dirs = 'aha';

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

@@ -0,0 +1 @@
+--echo XtraDB extension

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

@@ -0,0 +1,26 @@
+--source include/have_debug.inc
+--source include/have_xtradb.inc
+
+SELECT @@global.innodb_persistent_stats_root_page;
+SELECT COUNT(@@global.innodb_persistent_stats_root_page);
+
+# Read-only variable
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@global.innodb_persistent_stats_root_page=100;
+
+# Check if INFORMATION_SCHEMA agrees with the var
+SELECT @@global.innodb_persistent_stats_root_page = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_persistent_stats_root_page';
+
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_persistent_stats_root_page';
+
+# Check if accessing the var without GLOBAL points to the same
+SELECT @@innodb_persistent_stats_root_page = @@global.innodb_persistent_stats_root_page;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@local.innodb_persistent_stats_root_page);
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@session.innodb_persistent_stats_root_page);

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

@@ -0,0 +1,21 @@
+# Tests for innodb_track_changed_pages variable
+
+--source include/have_xtradb.inc
+
+SELECT COUNT(@@GLOBAL.innodb_track_changed_pages);
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SET @@GLOBAL.innodb_track_changed_pages=1;
+
+SELECT @@GLOBAL.innodb_track_changed_pages = VARIABLE_VALUE
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
+WHERE VARIABLE_NAME='innodb_track_changed_pages';
+
+SELECT @@innodb_track_changed_pages = @@GLOBAL.innodb_track_changed_pages;
+
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@SESSION.innodb_track_changed_pages);
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+SELECT COUNT(@@LOCAL.innodb_track_changed_pages);
+--error ER_BAD_FIELD_ERROR
+SELECT innodb_track_changed_pages = @@SESSION.innodb_track_changed_pages;

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

@@ -24,7 +24,7 @@
 ###############################################################################
 
 --source include/load_sysvars.inc
-
+--source include/not_embedded.inc
 
 ###################################################################
 #              START OF max_relay_log_size TESTS                  #