diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-19 15:58:35 +0200 |
| commit | 745cc74c3301f193c7b82c31d11c3bf0c842be9e (patch) | |
| tree | 4aa6101c051c91607d2623eed26fb41527fd0bd3 /sql/sql_class.h | |
| parent | f0c6576b85a57ec82fd911f73cce7c99683b378c (diff) | |
| parent | cc6d22f5356e0969d8d5d1046edc69cb17ea19fb (diff) | |
| download | mariadb-git-745cc74c3301f193c7b82c31d11c3bf0c842be9e.tar.gz | |
5.1.51 merge
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 5317b5af9ac..56b6a246423 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2642,7 +2642,9 @@ public: class select_insert :public select_result_interceptor { - public: +protected: + virtual int write_to_binlog(bool is_trans, int errcode); +public: TABLE_LIST *table_list; TABLE *table; List<Item> *fields; @@ -2678,6 +2680,8 @@ class select_create: public select_insert { MYSQL_LOCK *m_lock; /* m_lock or thd->extra_lock */ MYSQL_LOCK **m_plock; + + virtual int write_to_binlog(bool is_trans, int errcode); public: select_create (TABLE_LIST *table_arg, HA_CREATE_INFO *create_info_par, @@ -2693,7 +2697,7 @@ public: {} int prepare(List<Item> &list, SELECT_LEX_UNIT *u); - int binlog_show_create_table(TABLE **tables, uint count); + int binlog_show_create_table(TABLE **tables, uint count, int errcode); void store_values(List<Item> &values); void send_error(uint errcode,const char *err); bool send_eof(); |