summaryrefslogtreecommitdiff
path: root/mysys/my_handler_errors.h
diff options
context:
space:
mode:
authorSatya B <satya.bn@sun.com>2009-07-24 12:15:06 +0530
committerSatya B <satya.bn@sun.com>2009-07-24 12:15:06 +0530
commit30441aeadf28f053a75b58ec4c46d25dadc2ba97 (patch)
treee850059710c4ddef34b737bba2433da01983614e /mysys/my_handler_errors.h
parent9c708fdf1e0fac8debbfe561a3fd50c9c653a613 (diff)
parent559e2f1c1e151baec1ec37796640f53af0bd1b30 (diff)
downloadmariadb-git-30441aeadf28f053a75b58ec4c46d25dadc2ba97.tar.gz
merge 5.0-bugteam to 5.1-bugteam
Diffstat (limited to 'mysys/my_handler_errors.h')
-rw-r--r--mysys/my_handler_errors.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
index e360af8c57e..c239cabb168 100644
--- a/mysys/my_handler_errors.h
+++ b/mysys/my_handler_errors.h
@@ -62,6 +62,7 @@ static const char *handler_error_messages[]=
"The event could not be processed no other hanlder error happened",
"Got a fatal error during initialzaction of handler",
"File to short; Expected more data in file",
- "Read page with wrong checksum"
+ "Read page with wrong checksum",
+ "Too many active concurrent transactions"
};