diff options
| author | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-07 15:26:58 +0300 |
| commit | 02576c95d14d84f2a991bc0443d159afb11e24b7 (patch) | |
| tree | 087c30fed4aea55f1567d7a6f6e3c1d5b35ca8b0 /sql/table.h | |
| parent | 6a9a35c0d451429a71ddbfd3c4b1db1700be9ad3 (diff) | |
| parent | ef0cd2f58a785113cda84bb774f39428b99de0ef (diff) | |
| download | mariadb-git-02576c95d14d84f2a991bc0443d159afb11e24b7.tar.gz | |
Merge mysql.com:/home/kostja/mysql/tmp_merge
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/r/information_schema_db.result:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/information_schema.result:
SCCS merged
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.h b/sql/table.h index a799d4389fb..3a017983ff9 100644 --- a/sql/table.h +++ b/sql/table.h @@ -354,9 +354,9 @@ enum enum_schema_tables SCH_TABLE_NAMES, SCH_TABLE_PRIVILEGES, SCH_TRIGGERS, + SCH_USER_PRIVILEGES, SCH_VARIABLES, - SCH_VIEWS, - SCH_USER_PRIVILEGES + SCH_VIEWS }; |