diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-04-24 13:34:57 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-04-24 13:34:57 +0300 |
| commit | a5001a2ad7fa664d17829cec2aa38867613df4d5 (patch) | |
| tree | bb5f8efe44734fffc9833e960e15d3146f253a8c /sql/handler.cc | |
| parent | 804a7e60d746adf95001d58ee25062c8f4157928 (diff) | |
| parent | 51c415d97d60cad732d05c9d5516f7fa3fde1df9 (diff) | |
| download | mariadb-git-a5001a2ad7fa664d17829cec2aa38867613df4d5.tar.gz | |
Merge tag 'mariadb-5.5.60' into 5.5-galera
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 5cff15821c7..7da373e6802 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3841,7 +3841,8 @@ int handler::ha_create_handler_files(const char *name, const char *old_name, int action_flag, HA_CREATE_INFO *info) { - mark_trx_read_write(); + if (!opt_readonly || !info || !(info->options & HA_LEX_CREATE_TMP_TABLE)) + mark_trx_read_write(); return create_handler_files(name, old_name, action_flag, info); } |