diff options
author | Michael Widenius <monty@askmonty.org> | 2011-05-19 19:23:06 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-05-19 19:23:06 +0300 |
commit | 54a3d1869c609407488782fd74c345b408dc9cdc (patch) | |
tree | 8f76031513b819d48093721a97ad359b4ce54372 /mysys | |
parent | 73f4d0c6e435c2562ea2a18ff7f947497e995c51 (diff) | |
parent | 29b751c796269b069eae02d361d0f32e146614f6 (diff) | |
download | mariadb-git-54a3d1869c609407488782fd74c345b408dc9cdc.tar.gz |
Automatic merge
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_handler_errors.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index 19de02a00a8..6213ab188cc 100644 --- a/mysys/my_handler_errors.h +++ b/mysys/my_handler_errors.h @@ -64,5 +64,6 @@ static const char *handler_error_messages[]= "Read page with wrong checksum", "Too many active concurrent transactions", "Row is not visible by the current transaction", - "Operation was interrupted by end user (probably kill command?)" + "Operation was interrupted by end user (probably kill command?)", + "Disk full" }; |