diff options
author | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
commit | 9e6d10146cd9aef0132aa1ee27cb11dd4de5d094 (patch) | |
tree | 9677f13f29c93b0c65083bc23680739efeb821b9 /sql/mysql_priv.h | |
parent | bff40d61ae67455dd7ae70bd75923dac63fbae51 (diff) | |
parent | a418a35ceba85354328b5f75bb4e908f88b6759f (diff) | |
download | mariadb-git-9e6d10146cd9aef0132aa1ee27cb11dd4de5d094.tar.gz |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
innobase/btr/btr0btr.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0row.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 28aec2f9448..e5aa638ca35 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -636,6 +636,7 @@ int mysqld_show_keys(THD *thd, TABLE_LIST *table); int mysqld_show_logs(THD *thd); void append_identifier(THD *thd, String *packet, const char *name, uint length); +int get_quote_char_for_identifier(THD *thd, const char *name, uint length); void mysqld_list_fields(THD *thd,TABLE_LIST *table, const char *wild); int mysqld_dump_create_info(THD *thd, TABLE *table, int fd = -1); int mysqld_show_create(THD *thd, TABLE_LIST *table_list); |