From c0d75a6d2642ceb4e81e6a1efb9d127db2a56fc4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 28 Oct 2018 11:07:18 +0100 Subject: [PATCH] spider.show_system_tables: make the result stable --- .../spider/r/show_system_tables.result | 20 +++++++++---------- .../spider/t/show_system_tables.test | 7 ++----- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/storage/spider/mysql-test/spider/r/show_system_tables.result b/storage/spider/mysql-test/spider/r/show_system_tables.result index 39c3953b73d..67411862e00 100644 --- a/storage/spider/mysql-test/spider/r/show_system_tables.result +++ b/storage/spider/mysql-test/spider/r/show_system_tables.result @@ -10,18 +10,18 @@ child3_3 Show system tables on the Spider node connection master_1; -SELECT table_name, engine FROM information_schema.tables -WHERE table_schema = 'mysql' AND table_name like '%spider_%' +SELECT table_name, engine FROM information_schema.tables +WHERE table_schema = 'mysql' AND table_name like '%spider_%'; table_name engine -spider_xa_member Aria -spider_xa_failed_log Aria -spider_xa Aria -spider_tables Aria -spider_table_sts Aria -spider_table_position_for_recovery Aria -spider_table_crd Aria -spider_link_mon_servers Aria spider_link_failed_log Aria +spider_link_mon_servers Aria +spider_table_crd Aria +spider_table_position_for_recovery Aria +spider_table_sts Aria +spider_tables Aria +spider_xa Aria +spider_xa_failed_log Aria +spider_xa_member Aria deinit for master_1 diff --git a/storage/spider/mysql-test/spider/t/show_system_tables.test b/storage/spider/mysql-test/spider/t/show_system_tables.test index fd8451a2a60..ae8259b01bc 100644 --- a/storage/spider/mysql-test/spider/t/show_system_tables.test +++ b/storage/spider/mysql-test/spider/t/show_system_tables.test @@ -9,12 +9,9 @@ --echo --echo Show system tables on the Spider node --connection master_1 ---disable_query_log -echo SELECT table_name, engine FROM information_schema.tables +--sorted_result +SELECT table_name, engine FROM information_schema.tables WHERE table_schema = 'mysql' AND table_name like '%spider_%'; -eval SELECT table_name, engine FROM information_schema.tables - WHERE table_schema = 'mysql' AND table_name like '%spider_%'; ---enable_query_log --echo --echo deinit