database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

merge with 5.5

Browse Source
This commit is contained in:
Sergei Golubchik
2012-11-03 12:28:51 +01:00
parent 247e654fa7 4ffc9c3b01
commit 40e94a3734
210 changed files with 5894 additions and 1460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/sys_vars/t/ignore_db_dirs_basic-master.opt Normal file
View File

@@ -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

38
mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test Normal file
View File

@@ -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';

0
mysql-test/suite/sys_vars/t/innodb_changed_pages_limit_basic.test Normal file
View File

26
mysql-test/suite/sys_vars/t/innodb_persistent_stats_root_page_basic.test Normal file
View File

@@ -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);

21
mysql-test/suite/sys_vars/t/innodb_track_changed_pages_basic.test Normal file
View File

@@ -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;