diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
| commit | 95369d62bc8859a9ba5c35887460678e2a160f6e (patch) | |
| tree | 587654c186615669df8d81b851db711bb8ac2f62 /sql/sql_class.h | |
| parent | d2e8c9185732ab7e8e8c2ba27634aaa5785f43ce (diff) | |
| parent | 638033b9d549e81e2874682c59a720aa859ad5b8 (diff) | |
| download | mariadb-git-95369d62bc8859a9ba5c35887460678e2a160f6e.tar.gz | |
merge with 5.1
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 85bb2dd4024..4682938fd6d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2695,7 +2695,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; @@ -2731,6 +2733,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, @@ -2746,7 +2750,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(); |