Skip to content

M
mariadb
Commit 5d7d579c authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

- In index.test t1 was back to T1! fixed 

modified:
  mysql-test/suite/connect/t/index.test*

- Line endings restored to LF only

modified:
  storage/connect/CMakeLists.txt
parent 1e114f73
Hide whitespace changes
Inline Side-by-side
Showing with 252 additions and 252 deletions
mysql-test/suite/connect/t/index.test 100644 → 100755
View file @ 5d7d579c
File mode changed from 100644 to 100755
storage/connect/CMakeLists.txt
View file @ 5d7d579c
# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # 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 # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. # the Free Software Foundation; version 2 of the License.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(CONNECT_PLUGIN_STATIC "connect") SET(CONNECT_PLUGIN_STATIC "connect")
SET(CONNECT_PLUGIN_DYNAMIC "connect") SET(CONNECT_PLUGIN_DYNAMIC "connect")
SET(CONNECT_SOURCES SET(CONNECT_SOURCES
ha_connect.cc connect.cc user_connect.cc mycat.cc ha_connect.cc connect.cc user_connect.cc mycat.cc
fmdlex.c osutil.c plugutil.c rcmsg.c fmdlex.c osutil.c plugutil.c rcmsg.c
csort.cpp maputil.cpp plgdbutl.cpp csort.cpp maputil.cpp plgdbutl.cpp
colblk.cpp reldef.cpp tabcol.cpp table.cpp colblk.cpp reldef.cpp tabcol.cpp table.cpp
filamap.cpp filamdbf.cpp filamfix.cpp filamtxt.cpp filamvct.cpp filamap.cpp filamdbf.cpp filamfix.cpp filamtxt.cpp filamvct.cpp
tabdos.cpp tabfix.cpp tabfmt.cpp tabmul.cpp tabsys.cpp tabvct.cpp tabdos.cpp tabfix.cpp tabfmt.cpp tabmul.cpp tabsys.cpp tabvct.cpp
valblk.cpp value.cpp xindex.cpp xobject.cpp valblk.cpp value.cpp xindex.cpp xobject.cpp
filamzip.cpp tabtbl.cpp myutil.cpp filamzip.cpp tabtbl.cpp myutil.cpp
block.h catalog.h checklvl.h colblk.h connect.h csort.h engmsg.h block.h catalog.h checklvl.h colblk.h connect.h csort.h engmsg.h
filamap.h filamdbf.h filamfix.h filamtxt.h filamvct.h filamzip.h filamap.h filamdbf.h filamfix.h filamtxt.h filamvct.h filamzip.h
global.h ha_connect.h maputil.h msgid.h mycat.h myutil.h os.h global.h ha_connect.h maputil.h msgid.h mycat.h myutil.h os.h
osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h resource.h tabcol.h osutil.h plgcnx.h plgdbsem.h preparse.h reldef.h resource.h tabcol.h
tabdos.h tabfix.h tabfmt.h tabmul.h tabsys.h tabtbl.h tabvct.h tabdos.h tabfix.h tabfmt.h tabmul.h tabsys.h tabtbl.h tabvct.h
user_connect.h valblk.h value.h xindex.h xobject.h xtable.h) user_connect.h valblk.h value.h xindex.h xobject.h xtable.h)
# #
# Definitions that are shared for all OSes # Definitions that are shared for all OSes
# #
add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS ) add_definitions( -DMARIADB -DFORCE_INIT_OF_VARS )
add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT ) add_definitions( -DHUGE_SUPPORT -DZIP_SUPPORT )
# #
# OS specific C flags, definitions and source files. # OS specific C flags, definitions and source files.
# #
IF(UNIX) IF(UNIX)
if(WITH_WARNINGS) if(WITH_WARNINGS)
add_definitions(-Wall -Wfatal-errors -Wextra -Wmissing-declarations) add_definitions(-Wall -Wfatal-errors -Wextra -Wmissing-declarations)
add_definitions(-Wno-non-virtual-dtor) add_definitions(-Wno-non-virtual-dtor)
message(STATUS "CONNECT: GCC: All warnings enabled") message(STATUS "CONNECT: GCC: All warnings enabled")
else() else()
add_definitions(-Wall -Wfatal-errors -Wmissing-declarations) add_definitions(-Wall -Wfatal-errors -Wmissing-declarations)
add_definitions(-Wno-write-strings) add_definitions(-Wno-write-strings)
add_definitions(-Wno-unused-variable) add_definitions(-Wno-unused-variable)
add_definitions(-Wno-unused-but-set-variable) add_definitions(-Wno-unused-but-set-variable)
add_definitions(-Wno-unused-value) add_definitions(-Wno-unused-value)
add_definitions(-Wno-unused-function) add_definitions(-Wno-unused-function)
add_definitions(-Wno-parentheses) add_definitions(-Wno-parentheses)
add_definitions(-Wno-missing-declarations) add_definitions(-Wno-missing-declarations)
add_definitions(-Wno-int-to-pointer-cast) add_definitions(-Wno-int-to-pointer-cast)
add_definitions(-Wno-narrowing) add_definitions(-Wno-narrowing)
add_definitions(-Wno-non-virtual-dtor) add_definitions(-Wno-non-virtual-dtor)
# This switch is for pure C only: # This switch is for pure C only:
# add_definitions(-Wno-implicit-function-declaration) # add_definitions(-Wno-implicit-function-declaration)
# These switches are for C++ only # These switches are for C++ only
# add_definitions(-Wno-reorder) # add_definitions(-Wno-reorder)
# add_definitions(-Wno-delete-non-virtual-dtor) # add_definitions(-Wno-delete-non-virtual-dtor)
message(STATUS "CONNECT: GCC: Some warnings disabled") message(STATUS "CONNECT: GCC: Some warnings disabled")
endif(WITH_WARNINGS) endif(WITH_WARNINGS)
add_definitions( -DUNIX -DLINUX -DUBUNTU ) add_definitions( -DUNIX -DLINUX -DUBUNTU )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fexceptions -fPIC ") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fexceptions -fPIC ")
get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c) SET(CONNECT_SOURCES ${CONNECT_SOURCES} inihandl.c)
SET(IPHLPAPI_LIBRARY "") SET(IPHLPAPI_LIBRARY "")
ELSE(NOT UNIX) ELSE(NOT UNIX)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} SET(CONNECT_SOURCES ${CONNECT_SOURCES}
tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h) tabwmi.cpp tabwmi.h tabmac.cpp tabmac.h macutil.cpp macutil.h)
# Add exception handling to the CONNECT project) # Add exception handling to the CONNECT project)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
SET(IPHLPAPI_LIBRARY iphlpapi.lib) SET(IPHLPAPI_LIBRARY iphlpapi.lib)
ENDIF(UNIX) ENDIF(UNIX)
# #
# XML # XML
# #
OPTION(CONNECT_WITH_LIBXML2 "Compile CONNECT storage engine with LIBXML2 support" ON) OPTION(CONNECT_WITH_LIBXML2 "Compile CONNECT storage engine with LIBXML2 support" ON)
IF(CONNECT_WITH_LIBXML2) IF(CONNECT_WITH_LIBXML2)
IF(WIN32) IF(WIN32)
# #
# NOTE: when switching to static linking of libxml2 # NOTE: when switching to static linking of libxml2
# make sure to define LIBXML_STATIC. # make sure to define LIBXML_STATIC.
# #
# Adding some typical places to search in # Adding some typical places to search in
SET(PC_LIBXML_INCLUDE_DIRS SET(PC_LIBXML_INCLUDE_DIRS
C:/libxml2/include C:/libxml2/include
C:/libxml/include C:/libxml/include
D:/libxml/include) D:/libxml/include)
SET(PC_LIBXML_LIBRARY_DIRS SET(PC_LIBXML_LIBRARY_DIRS
C:/libxml2/lib C:/libxml2/lib
C:/libxml/lib C:/libxml/lib
D:/libxml/lib) D:/libxml/lib)
ENDIF(WIN32) ENDIF(WIN32)
FIND_PACKAGE(LibXml2) FIND_PACKAGE(LibXml2)
IF (LIBXML2_FOUND) IF (LIBXML2_FOUND)
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
SET(XML_LIBRARY ${LIBXML2_LIBRARIES}) SET(XML_LIBRARY ${LIBXML2_LIBRARIES})
SET(CONNECT_SOURCES ${CONNECT_SOURCES} libdoc.cpp libdoc.h) SET(CONNECT_SOURCES ${CONNECT_SOURCES} libdoc.cpp libdoc.h)
add_definitions(-DLIBXML2_SUPPORT) add_definitions(-DLIBXML2_SUPPORT)
ENDIF(LIBXML2_FOUND) ENDIF(LIBXML2_FOUND)
ENDIF(CONNECT_WITH_LIBXML2) ENDIF(CONNECT_WITH_LIBXML2)
IF(WIN32) IF(WIN32)
OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON) OPTION(CONNECT_WITH_MSXML "Compile CONNECT storage engine with MSXML support" ON)
IF(CONNECT_WITH_MSXML) IF(CONNECT_WITH_MSXML)
find_library(MSXML_LIBRARY find_library(MSXML_LIBRARY
NAMES msxml6 msxml4 msxml3 msxml2 NAMES msxml6 msxml4 msxml3 msxml2
PATHS PATHS
"C:/Program Files/Microsoft SDKs/Windows/v7.0A/Lib" "C:/Program Files/Microsoft SDKs/Windows/v7.0A/Lib"
"C:/Program Files/Microsoft SDKs/Windows/v6.0A/Lib" "C:/Program Files/Microsoft SDKs/Windows/v6.0A/Lib"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
DOC "Specify the MSXML? library here." DOC "Specify the MSXML? library here."
) )
IF(MSXML_LIBRARY MATCHES .*msxml6[.].*) IF(MSXML_LIBRARY MATCHES .*msxml6[.].*)
add_definitions(-DMSX6 -DDOMDOC_SUPPORT) add_definitions(-DMSX6 -DDOMDOC_SUPPORT)
message(STATUS "MSXML library version: msxml6") message(STATUS "MSXML library version: msxml6")
SET(MSXML_FOUND 1) SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h) SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml4[.].*) ELSEIF(MSXML_LIBRARY MATCHES .*msxml4[.].*)
add_definitions(-DMSX4 -DDOMDOC_SUPPORT) add_definitions(-DMSX4 -DDOMDOC_SUPPORT)
message("MSXML library version: msxml4") message("MSXML library version: msxml4")
SET(MSXML_FOUND 1) SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h) SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml3[.].*) ELSEIF(MSXML_LIBRARY MATCHES .*msxml3[.].*)
message("MSXML library version: msxml3") message("MSXML library version: msxml3")
add_definitions(-DMSX3 -DDOMDOC_SUPPORT) add_definitions(-DMSX3 -DDOMDOC_SUPPORT)
SET(MSXML_FOUND 1) SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h) SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSEIF(MSXML_LIBRARY MATCHES .*msxml2[.].*) ELSEIF(MSXML_LIBRARY MATCHES .*msxml2[.].*)
message("MSXML library version: msxml2") message("MSXML library version: msxml2")
add_definitions(-DMXS2 -DDOMDOC_SUPPORT) add_definitions(-DMXS2 -DDOMDOC_SUPPORT)
SET(MSXML_FOUND 1) SET(MSXML_FOUND 1)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h) SET(CONNECT_SOURCES ${CONNECT_SOURCES} domdoc.cpp domdoc.h)
ELSE() ELSE()
message(STATUS "msxml? library not found") message(STATUS "msxml? library not found")
ENDIF() ENDIF()
ENDIF(CONNECT_WITH_MSXML) ENDIF(CONNECT_WITH_MSXML)
ENDIF(WIN32) ENDIF(WIN32)
IF(LIBXML2_FOUND OR MSXML_FOUND) IF(LIBXML2_FOUND OR MSXML_FOUND)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} SET(CONNECT_SOURCES ${CONNECT_SOURCES}
tabxml.cpp tabxml.h plgxml.cpp plgxml.h) tabxml.cpp tabxml.h plgxml.cpp plgxml.h)
ENDIF() ENDIF()
# #
# MySQL # MySQL
# #
OPTION(CONNECT_WITH_MYSQL OPTION(CONNECT_WITH_MYSQL
"Compile CONNECT storage engine with remote MySQL connection support" "Compile CONNECT storage engine with remote MySQL connection support"
ON) ON)
IF(CONNECT_WITH_MYSQL) IF(CONNECT_WITH_MYSQL)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} SET(CONNECT_SOURCES ${CONNECT_SOURCES}
myconn.cpp myconn.h tabmysql.cpp tabxml.h) myconn.cpp myconn.h tabmysql.cpp tabxml.h)
add_definitions(-DMYSQL_SUPPORT) add_definitions(-DMYSQL_SUPPORT)
IF(NOT UNIX) IF(NOT UNIX)
# #
# TODO: remove this # TODO: remove this
# change to use "#include "../../include/mysql.h" in the sources. # change to use "#include "../../include/mysql.h" in the sources.
INCLUDE_DIRECTORIES("../../include/mysql") INCLUDE_DIRECTORIES("../../include/mysql")
ENDIF(NOT UNIX) ENDIF(NOT UNIX)
ENDIF(CONNECT_WITH_MYSQL) ENDIF(CONNECT_WITH_MYSQL)
# #
# ODBC # ODBC
# #
OPTION(CONNECT_WITH_ODBC "Compile CONNECT storage engine with ODBC support" ON) OPTION(CONNECT_WITH_ODBC "Compile CONNECT storage engine with ODBC support" ON)
IF(CONNECT_WITH_ODBC) IF(CONNECT_WITH_ODBC)
if(UNIX) if(UNIX)
# Note, we currently detect unixODBC only on Linux. # Note, we currently detect unixODBC only on Linux.
# TODO: detect iODBC as well. Simply adding "iodbc" into NAMES in # TODO: detect iODBC as well. Simply adding "iodbc" into NAMES in
# find_library does not work on machines with both unixODBC and iODBC # find_library does not work on machines with both unixODBC and iODBC
# installed, because it finds headers from unixODBC while libraries # installed, because it finds headers from unixODBC while libraries
# from iODBC. We could search for 'isql.h' instead of 'sql.h' so # from iODBC. We could search for 'isql.h' instead of 'sql.h' so
# the library 'libodbc' gets compiled with 'isql.h' and # the library 'libodbc' gets compiled with 'isql.h' and
# the library 'libiodbc' gets compiled with 'sql'h. # the library 'libiodbc' gets compiled with 'sql'h.
# This will also need changes in the sources (e.g. #include <isql.h>). # This will also need changes in the sources (e.g. #include <isql.h>).
find_path(ODBC_INCLUDE_DIR sql.h find_path(ODBC_INCLUDE_DIR sql.h
/usr/include /usr/include
/usr/include/odbc /usr/include/odbc
/usr/local/include /usr/local/include
/usr/local/include/odbc /usr/local/include/odbc
/usr/local/odbc/include /usr/local/odbc/include
#"C:/Program Files/ODBC/include" #"C:/Program Files/ODBC/include"
#"C:/Program Files/Microsoft SDKs/Windows/v7.0A/include" #"C:/Program Files/Microsoft SDKs/Windows/v7.0A/include"
#"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include" #"C:/Program Files/Microsoft SDKs/Windows/v6.0a/include"
#"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/include" #"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/include"
DOC "Specify the directory containing sql.h." DOC "Specify the directory containing sql.h."
) )
find_library(ODBC_LIBRARY find_library(ODBC_LIBRARY
NAMES odbc odbcinst odbc32 NAMES odbc odbcinst odbc32
PATHS PATHS
/usr/lib /usr/lib
/usr/lib/odbc /usr/lib/odbc
/usr/local/lib /usr/local/lib
/usr/local/lib/odbc /usr/local/lib/odbc
/usr/local/odbc/lib /usr/local/odbc/lib
#"C:/Program Files/ODBC/lib" #"C:/Program Files/ODBC/lib"
#"C:/ODBC/lib/debug" #"C:/ODBC/lib/debug"
#"C:/Program Files/Microsoft SDKs/Windows/v7.0A/Lib" #"C:/Program Files/Microsoft SDKs/Windows/v7.0A/Lib"
#"C:/Program Files/Microsoft SDKs/Windows/v6.0A/Lib" #"C:/Program Files/Microsoft SDKs/Windows/v6.0A/Lib"
#"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" #"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
DOC "Specify the ODBC driver manager library here." DOC "Specify the ODBC driver manager library here."
) )
IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY) IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY)
INCLUDE_DIRECTORIES(${ODBC_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ODBC_INCLUDE_DIR})
add_definitions(-DODBC_SUPPORT) add_definitions(-DODBC_SUPPORT)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp)
ELSE() ELSE()
SET(ODBC_LIBRARY "") SET(ODBC_LIBRARY "")
ENDIF() ENDIF()
ELSE(NOT UNIX) ELSE(NOT UNIX)
add_definitions(-DODBC_SUPPORT) add_definitions(-DODBC_SUPPORT)
SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib") SET(ODBC_LIBRARY "odbc32.lib odbccp32.lib")
SET(CONNECT_SOURCES ${CONNECT_SOURCES} SET(CONNECT_SOURCES ${CONNECT_SOURCES}
tabodbc.cpp tabodbc.h odbccat.h odbconn.cpp odbconn.h) tabodbc.cpp tabodbc.h odbccat.h odbconn.cpp odbconn.h)
ENDIF(UNIX) ENDIF(UNIX)
ENDIF(CONNECT_WITH_ODBC) ENDIF(CONNECT_WITH_ODBC)
# #
# Plugin definition # Plugin definition
# #
MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES} MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES}
STORAGE_ENGINE STORAGE_ENGINE
MODULE_OUTPUT_NAME "ha_connect" MODULE_OUTPUT_NAME "ha_connect"
LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY} LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY}
${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY}) ${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7