Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
aa526020
Commit
aa526020
authored
Feb 24, 2010
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Plain Diff
merge
parents
bcebd973
46b22d5e
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
598 additions
and
583 deletions
+598
-583
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/build_configurations/mysql_release.cmake
cmake/build_configurations/mysql_release.cmake
+2
-0
cmake/install_layout.cmake
cmake/install_layout.cmake
+1
-1
mysql-test/CMakeLists.txt
mysql-test/CMakeLists.txt
+1
-0
mysql-test/r/perror-win.result
mysql-test/r/perror-win.result
+1
-0
mysql-test/suite/funcs_1/r/storedproc.result
mysql-test/suite/funcs_1/r/storedproc.result
+580
-580
mysql-test/t/perror.test
mysql-test/t/perror.test
+1
-0
sql/CMakeLists.txt
sql/CMakeLists.txt
+8
-1
sql/share/CMakeLists.txt
sql/share/CMakeLists.txt
+3
-1
No files found.
CMakeLists.txt
View file @
aa526020
...
@@ -278,6 +278,7 @@ ENDIF()
...
@@ -278,6 +278,7 @@ ENDIF()
SET
(
MYSQL_DOCS_LOCATION
""
CACHE PATH
"Location from where documentation is copied"
)
SET
(
MYSQL_DOCS_LOCATION
""
CACHE PATH
"Location from where documentation is copied"
)
MARK_AS_ADVANCED
(
MYSQL_DOCS_LOCATION
)
MARK_AS_ADVANCED
(
MYSQL_DOCS_LOCATION
)
INSTALL
(
DIRECTORY Docs/ DESTINATION
${
INSTALL_DOCDIR
}
INSTALL
(
DIRECTORY Docs/ DESTINATION
${
INSTALL_DOCDIR
}
PATTERN
"INSTALL-BINARY"
EXCLUDE
PATTERN
"Makefile.*"
EXCLUDE
PATTERN
"Makefile.*"
EXCLUDE
PATTERN
"myisam.txt"
EXCLUDE
PATTERN
"myisam.txt"
EXCLUDE
PATTERN
"glibc*"
EXCLUDE
PATTERN
"glibc*"
EXCLUDE
...
...
cmake/build_configurations/mysql_release.cmake
View file @
aa526020
...
@@ -80,6 +80,8 @@ IF(FEATURE_SET)
...
@@ -80,6 +80,8 @@ IF(FEATURE_SET)
ENDFOREACH
()
ENDFOREACH
()
ENDIF
()
ENDIF
()
SET
(
WITHOUT_AUDIT_NULL ON CACHE BOOL
""
)
SET
(
WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL
""
)
OPTION
(
ENABLE_LOCAL_INFILE
""
ON
)
OPTION
(
ENABLE_LOCAL_INFILE
""
ON
)
SET
(
WITH_SSL bundled CACHE STRING
""
)
SET
(
WITH_SSL bundled CACHE STRING
""
)
...
...
cmake/install_layout.cmake
View file @
aa526020
...
@@ -80,7 +80,7 @@ ENDIF()
...
@@ -80,7 +80,7 @@ ENDIF()
SET
(
INSTALL_LIBDIR_STANDALONE
"lib"
)
SET
(
INSTALL_LIBDIR_STANDALONE
"lib"
)
SET
(
INSTALL_INCLUDEDIR_STANDALONE
"include"
)
SET
(
INSTALL_INCLUDEDIR_STANDALONE
"include"
)
SET
(
INSTALL_PLUGINDIR_STANDALONE
"lib/plugin"
)
SET
(
INSTALL_PLUGINDIR_STANDALONE
"lib/plugin"
)
SET
(
INSTALL_DOCDIR_STANDALONE
"doc"
)
SET
(
INSTALL_DOCDIR_STANDALONE
"doc
s
"
)
SET
(
INSTALL_MANDIR_STANDALONE
"man"
)
SET
(
INSTALL_MANDIR_STANDALONE
"man"
)
SET
(
INSTALL_MYSQLSHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_MYSQLSHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_SHAREDIR_STANDALONE
"share"
)
SET
(
INSTALL_SHAREDIR_STANDALONE
"share"
)
...
...
mysql-test/CMakeLists.txt
View file @
aa526020
...
@@ -23,6 +23,7 @@ INSTALL(
...
@@ -23,6 +23,7 @@ INSTALL(
PATTERN
"mtr.out*"
EXCLUDE
PATTERN
"mtr.out*"
EXCLUDE
PATTERN
".cvsignore"
EXCLUDE
PATTERN
".cvsignore"
EXCLUDE
PATTERN
"*.am"
EXCLUDE
PATTERN
"*.am"
EXCLUDE
PATTERN
"*.in"
EXCLUDE
)
)
...
...
mysql-test/r/perror-win.result
View file @
aa526020
...
@@ -2,5 +2,6 @@ MySQL error code 150: Foreign key constraint is incorrectly formed
...
@@ -2,5 +2,6 @@ MySQL error code 150: Foreign key constraint is incorrectly formed
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
Win32 error code 150: System trace information was not specified in your CONFIG.SYS file, or tracing is disallowed.
OS error code 23: Too many open files in system
OS error code 23: Too many open files in system
Win32 error code 23: Data error (cyclic redundancy check).
Win32 error code 23: Data error (cyclic redundancy check).
MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
Win32 error code 1062: The service has not been started.
Win32 error code 1062: The service has not been started.
Illegal error code: 30000
Illegal error code: 30000
mysql-test/suite/funcs_1/r/storedproc.result
View file @
aa526020
This source diff could not be displayed because it is too large. You can
view the blob
instead.
mysql-test/t/perror.test
View file @
aa526020
--
source
include
/
not_windows
.
inc
#
#
# Check if the variable MY_PERROR is set
# Check if the variable MY_PERROR is set
#
#
...
...
sql/CMakeLists.txt
View file @
aa526020
...
@@ -191,7 +191,14 @@ ADD_CUSTOM_COMMAND(
...
@@ -191,7 +191,14 @@ ADD_CUSTOM_COMMAND(
COMMAND
${
CMAKE_COMMAND
}
-E remove -f lex_hash.h.tmp
COMMAND
${
CMAKE_COMMAND
}
-E remove -f lex_hash.h.tmp
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
DEPENDS
${
CMAKE_CURRENT_SOURCE_DIR
}
/gen_lex_hash.cc
)
DEPENDS
${
CMAKE_CURRENT_SOURCE_DIR
}
/gen_lex_hash.cc
)
MYSQL_ADD_EXECUTABLE
(
mysql_tzinfo_to_sql tztime.cc
)
SET_TARGET_PROPERTIES
(
mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS
"-DTZINFO2SQL"
)
TARGET_LINK_LIBRARIES
(
mysql_tzinfo_to_sql
${
MYSQLD_STATIC_PLUGIN_LIBS
}
mysys dbug strings vio regex
${
LIBWRAP
}
${
LIBCRYPT
}
${
LIBDL
}
${
SSL_LIBRARIES
}
)
ADD_CUSTOM_TARGET
(
ADD_CUSTOM_TARGET
(
GenServerSource
GenServerSource
DEPENDS
${
GEN_SOURCES
}
DEPENDS
${
GEN_SOURCES
}
...
...
sql/share/CMakeLists.txt
View file @
aa526020
...
@@ -47,6 +47,8 @@ FOREACH (dir ${dirs})
...
@@ -47,6 +47,8 @@ FOREACH (dir ${dirs})
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
dir
}
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
dir
}
DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
)
DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
)
ENDFOREACH
()
ENDFOREACH
()
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/charsets DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
)
INSTALL
(
DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
/charsets DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
PATTERN
"languages.html"
EXCLUDE
)
INSTALL
(
FILES
${
files
}
DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
)
INSTALL
(
FILES
${
files
}
DESTINATION
${
INSTALL_MYSQLSHAREDIR
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment