diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-05-28 15:39:56 +0200 |
commit | a0fd7382bc1e4a8ba0affd27d3034f445a4bb453 (patch) | |
tree | c8b4b1dabddbc47829a890d74025f7889e692425 /mysql-test/suite/funcs_1/r/is_key_column_usage.result | |
parent | 08ce9bfe057b6cd31e7fbca4e4e9e48edde242fb (diff) | |
parent | ee2b7db3f88f6882022a8aa71b30043ed8b40792 (diff) | |
download | mariadb-git-a0fd7382bc1e4a8ba0affd27d3034f445a4bb453.tar.gz |
Merge 10.0-base -> 10.0
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 | 4 |
1 files changed, 2 insertions, 2 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 5ed4ddf9dd1..66967267202 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 @@ -89,6 +89,8 @@ def mysql PRIMARY def mysql db User def mysql PRIMARY def mysql event db def mysql PRIMARY def mysql event name def mysql PRIMARY def mysql func name +def mysql PRIMARY def mysql gtid_slave_pos domain_id +def mysql PRIMARY def mysql gtid_slave_pos sub_id def mysql PRIMARY def mysql help_category help_category_id def mysql name def mysql help_category name def mysql PRIMARY def mysql help_keyword help_keyword_id @@ -125,8 +127,6 @@ 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 |