diff options
| author | unknown <gluh@eagle.(none)> | 2007-08-21 19:05:33 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-08-21 19:05:33 +0500 |
| commit | 4866a29b84957e8aa77687535cb2e70a8243c7d2 (patch) | |
| tree | 4c9f46d5a33f255b7d78eb52b5db03c9d5b06743 /sql/sql_show.cc | |
| parent | fd7ff1d89f3b617950fedd535a58ada6e26c730c (diff) | |
| parent | 42aa480b4345aa920e0ff60001b09eb52c9c04c5 (diff) | |
| download | mariadb-git-4866a29b84957e8aa77687535cb2e70a8243c7d2.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index eebce82be62..bbb7e18b71a 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4391,7 +4391,9 @@ static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables, } } } +#ifndef NO_EMBEDDED_ACCESS_CHECKS ret: +#endif DBUG_RETURN(0); } |