mirror of
https://github.com/MariaDB/server.git
synced 2025-08-26 01:44:06 +03:00
314ac2a0ab
Some result updates necessary due to extra tables and columns added in information_schema in MariaDB (XtraDB, PBXT, microsec_process). Also fix bad merge of two result files; apparently the test case was merged, but the result file was not. mysql-test/suite/funcs_1/datadict/processlist_priv.inc: Handle the new TIME_MS column in information_schema.processlist. mysql-test/suite/funcs_1/datadict/processlist_val.inc: Handle the new TIME_MS column in information_schema.processlist. mysql-test/suite/funcs_1/r/is_columns_is.result: Handle new tables in information_schema. mysql-test/suite/funcs_1/r/is_tables_is.result: Handle new tables in information_schema. mysql-test/suite/funcs_1/r/is_tables_myisam.result: Fix previous bad merge; apparently this file was not merged along with test changes. mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result: Handle the new TIME_MS column in information_schema.processlist. mysql-test/suite/funcs_1/r/processlist_val_no_prot.result: Fix previous bad merge; apparently this file was not merged along with test changes. Also handle the new TIME_MS column in INFORMATION_SCHEMA.PROCESSLIST. mysql-test/suite/funcs_1/t/is_columns_is.test: Since result file includes PBXT information_schema tables, we need PBXT to run this test.
25 lines
924 B
Plaintext
25 lines
924 B
Plaintext
# suite/funcs_1/t/is_columns_is.test
|
|
#
|
|
# Check the content of information_schema.columns about tables within
|
|
# the database information_schema.
|
|
# Variant for the non embedded server
|
|
# The expected results must equal is_columns_is_embedded except that
|
|
# columns.privileges are not empty.
|
|
#
|
|
# Note: The INFORMATION_SCHEMA table PROFILING is optional (exists in MySQL
|
|
# Community version only) and therefore we exclude it from retrieval.
|
|
#
|
|
# Author:
|
|
# 2008-01-23 mleich WL#4203 Reorganize and fix the data dictionary tests of
|
|
# testsuite funcs_1
|
|
# Create this script based on older scripts and new code.
|
|
#
|
|
|
|
--source include/not_embedded.inc
|
|
# This test depends on having the PBXT information_schema stuff.
|
|
--source include/have_pbxt.inc
|
|
|
|
let $my_where = WHERE table_schema = 'information_schema'
|
|
AND table_name <> 'profiling';
|
|
--source suite/funcs_1/datadict/columns.inc
|