diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-05-31 11:46:30 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-05-31 11:46:30 +0300 |
| commit | 59b4ee145452f57be86f1a983186d18e712138ef (patch) | |
| tree | 82790038a2aedf70d89730e89780df6705d7a586 /mysys | |
| parent | aa81e025a88d13c5040bb3fe808d70fd6d1e560c (diff) | |
| parent | afedd72e225654225b20a91b072b012e4c57a9d4 (diff) | |
| download | mariadb-git-59b4ee145452f57be86f1a983186d18e712138ef.tar.gz | |
Merge with 5.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_handler_errors.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index 8e6c17cde92..f2c51773e83 100644 --- a/mysys/my_handler_errors.h +++ b/mysys/my_handler_errors.h @@ -1,8 +1,7 @@ #ifndef MYSYS_MY_HANDLER_ERRORS_INCLUDED #define MYSYS_MY_HANDLER_ERRORS_INCLUDED -/* Copyright (c) 2008 MySQL AB - Use is subject to license terms. +/* Copyright (c) 2008, 2012, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -14,8 +13,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */ /* Errors a handler can give you @@ -85,6 +84,7 @@ static const char *handler_error_messages[]= "Index column length exceeds limit", "Index corrupted", "Undo record too big", + "Table is being used in foreign key check", "Invalid InnoDB FTS Doc ID", "Row is not visible by the current transaction", "Operation was interrupted by end user (probably kill command?)", |