diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-06-12 16:34:18 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-06-12 16:34:18 +0300 |
| commit | b96af9a3abe792c8711d59b693509ccd0677a150 (patch) | |
| tree | 526a4e021acc77d2379cee74873bd3cae1b53fd9 /mysys | |
| parent | 33ffe0dd29b6564e49dde8b1abda914da4b2f178 (diff) | |
| parent | 9892ace475752e0ddd333500bec91e13ca54d0f3 (diff) | |
| download | mariadb-git-b96af9a3abe792c8711d59b693509ccd0677a150.tar.gz | |
references lp:1011983
Merged latest MariaDB development in: bzr merge lp:maria/5.5
=>
Text conflict in CMakeLists.txt
Text conflict in sql/handler.h
Text conflict in support-files/CMakeLists.txt
3 conflicts
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | mysys/my_handler_errors.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt index 7397990eddb..832cd01e263 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt @@ -67,7 +67,7 @@ ENDIF() ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}) TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET}) + ${LIBNSL} ${LIBM} ${LIBRT} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) IF(HAVE_BFD_H) diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index 551077a81ee..8b3b359ea95 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 @@ -84,6 +83,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", "Row is not visible by the current transaction", "Operation was interrupted by end user (probably kill command?)", "Disk full" |