diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-04-17 15:17:01 +0200 |
commit | 0e7410a154560486ce4e0c975f122a0b15853bb1 (patch) | |
tree | e65ba67f602f6c99a52a1953b2172043476a5930 /mysql-test/suite/funcs_1/r/is_key_column_usage.result | |
parent | f398ced7f05e64b0f2bdb8e0a70de907aff9e1eb (diff) | |
parent | 30b2c64c4e87f8924fe817f5c607ae90a990e9e5 (diff) | |
download | mariadb-git-0e7410a154560486ce4e0c975f122a0b15853bb1.tar.gz |
Merge 10.0-base -> 10.0 (GTID).
Diffstat (limited to 'mysql-test/suite/funcs_1/r/is_key_column_usage.result')
-rw-r--r-- | mysql-test/suite/funcs_1/r/is_key_column_usage.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/funcs_1/r/is_key_column_usage.result b/mysql-test/suite/funcs_1/r/is_key_column_usage.result index 1b6b6f00e26..5ed4ddf9dd1 100644 --- a/mysql-test/suite/funcs_1/r/is_key_column_usage.result +++ b/mysql-test/suite/funcs_1/r/is_key_column_usage.result @@ -125,6 +125,8 @@ def mysql PRIMARY def mysql proxies_priv Host def mysql PRIMARY def mysql proxies_priv User def mysql PRIMARY def mysql proxies_priv Proxied_host def mysql PRIMARY def mysql proxies_priv Proxied_user +def mysql PRIMARY def mysql rpl_slave_state domain_id +def mysql PRIMARY def mysql rpl_slave_state sub_id def mysql PRIMARY def mysql servers Server_name def mysql PRIMARY def mysql slave_master_info Master_id def mysql PRIMARY def mysql slave_relay_log_info Master_id |