diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-30 21:47:11 +0300 |
| commit | 5aa4c33e3233e2c1cac9f3bb0b17379a56503666 (patch) | |
| tree | 5bb7d787b7b4c25140afb74590153f8109510d61 /sql/sql_class.h | |
| parent | b436e0ae20da93f6ebf3231ac28f397966187175 (diff) | |
| parent | dad4291b781495cfdc8abac9dc2902621bfb3b56 (diff) | |
| download | mariadb-git-5aa4c33e3233e2c1cac9f3bb0b17379a56503666.tar.gz | |
Manual merge from mysql-5.1-bugteam.
Conflicts:
- sql/mysql_priv.h
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 0f1269b525d..ab86ac6df12 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2623,7 +2623,7 @@ public: {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); - void binlog_show_create_table(TABLE **tables, uint count); + int binlog_show_create_table(TABLE **tables, uint count); void store_values(List<Item> &values); void send_error(uint errcode,const char *err); bool send_eof(); |