Skip to content

Fixed an error message typo. #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fixed an error message typo. #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77306a4
Bug#30031130: MYSQL SERVER SEGFAULTS AT
lkshminarayanan Jul 10, 2019
e25725a
Fixed an error message typo.
realnickel Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmake/os/SunOS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2.0,
Expand Down Expand Up @@ -28,6 +28,8 @@ INCLUDE(CheckCXXSourceCompiles)
SET(SOLARIS 1)
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
SET(SOLARIS_SPARC 1)
ELSE()
SET(SOLARIS_INTEL 1)
ENDIF()

IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
Expand Down
2 changes: 1 addition & 1 deletion mysys/my_handler_errors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static const char *handler_error_messages[] = {
"The event was corrupt, leading to illegal data being read",
"The table is of a new format not supported by this version",
"The event could not be processed no other hanlder error happened",
"Got a fatal error during initialzaction of handler",
"Got a fatal error during initialization of handler",
"File too short; Expected more data in file",
"Read page with wrong checksum",
"Too many active concurrent transactions",
Expand Down
9 changes: 9 additions & 0 deletions storage/ndb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@ SET(NDBCLUSTER_SOURCES
# Include directories used when building ha_ndbcluster
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include)

IF(SOLARIS_INTEL)
# Sun Studio 12.6 on x86 machines creates a bogus code
# when -xO2 is used and crashes the executable whenever
# it calls std::condition_variable::wait_for()
STRING_APPEND(CMAKE_CXX_FLAGS_RELWITHDEBINFO " -xO1")
STRING_APPEND(CMAKE_CXX_FLAGS_RELEASE " -xO1")
STRING_APPEND(CMAKE_CXX_FLAGS_MINSIZEREL " -xO1")
ENDIF()

IF(NOT WITHOUT_SERVER)
MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
DEFAULT STATIC_ONLY
Expand Down