diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-05 13:51:28 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-05 13:51:28 +0300 |
| commit | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (patch) | |
| tree | c0a7ad19ea9dd038a1537269780a9591674ae2fb /sql/mdl.cc | |
| parent | 58926b5e1990d3245b55081ba511fbabe2604e17 (diff) | |
| download | mariadb-git-fab9a55d077b4f2a511b273d5f51272f1e3dc1ff.tar.gz | |
- Fixed compiler warning
- Don't abort InnoDB if one can't allocate resources for AIO
(this patch was in 5.5 and 10.0-base but was missing in 10.0)
sql/mdl.cc:
Fixed compiler warning
storage/innobase/os/os0file.cc:
Don't abort InnoDB if one can't allocate resources for AIO
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 9402de02c36..03593f150bd 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -86,7 +86,7 @@ PSI_stage_info MDL_key::m_namespace_to_wait_state_name[NAMESPACE_END]= {0, "Waiting for trigger metadata lock", 0}, {0, "Waiting for event metadata lock", 0}, {0, "Waiting for commit lock", 0}, - {0, "User lock"} /* Be compatible with old status. */ + {0, "User lock", 0} /* Be compatible with old status. */ }; #ifdef HAVE_PSI_INTERFACE |