diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-21 16:39:19 +0200 |
| commit | b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb (patch) | |
| tree | 7c302c2025184dbd053aa6135f0ff28c8ce6f359 /sql/rpl_mi.h | |
| parent | 5f6380adde2dac3f32b40339b9b702c0135eb7d6 (diff) | |
| parent | c1d6a2d7e194225ccc19a68ea5d0f368632620d0 (diff) | |
| download | mariadb-git-b7b5f6f1ab49948b0e15b762266d4640b3d6b7fb.tar.gz | |
10.0-monty merge
includes:
* remove some remnants of "Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING"
* introduce LOCK_share, now LOCK_ha_data is strictly for engines
* rea_create_table() always creates .par file (even in "frm-only" mode)
* fix a 5.6 bug, temp file leak on dummy ALTER TABLE
Diffstat (limited to 'sql/rpl_mi.h')
| -rw-r--r-- | sql/rpl_mi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index ad6c57e21c4..991f6673c3a 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -208,7 +208,7 @@ public: bool add_master_info(Master_info *mi, bool write_to_file); bool remove_master_info(LEX_STRING *connection_name); Master_info *get_master_info(LEX_STRING *connection_name, - MYSQL_ERROR::enum_warning_level warning); + Sql_condition::enum_warning_level warning); bool give_error_if_slave_running(); bool start_all_slaves(THD *thd); bool stop_all_slaves(THD *thd); |