From 9f89ab0559100703178ec41180f6782d93156fdc Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 25 Nov 2019 11:22:46 +0000
Subject: [PATCH] MCOL-3627 Fix library name

The ColumnStore library is now called ha_columnstore.so to be inline
with other storage engines.
---
 dbcon/mysql/CMakeLists.txt          |  28 ++------
 dbcon/mysql/columnstore.cnf         |   2 +-
 dbcon/mysql/install_mcs_mysql.sh.in |  66 +++++++++---------
 dbcon/mysql/libcalmysql.rc          | 102 ----------------------------
 dbcon/mysql/resource.h              |  14 ----
 5 files changed, 39 insertions(+), 173 deletions(-)
 delete mode 100644 dbcon/mysql/libcalmysql.rc
 delete mode 100644 dbcon/mysql/resource.h

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index d99c75d9f..6183fdf68 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -29,11 +29,12 @@ add_definitions(-DMYSQL_DYNAMIC_PLUGIN)
 
 set_source_files_properties(ha_mcs.cpp PROPERTIES COMPILE_FLAGS "-fno-implicit-templates")
 
-add_library(calmysql SHARED ${libcalmysql_SRCS})
+add_library(ha_columnstore SHARED ${libcalmysql_SRCS})
+SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "")
 
-target_link_libraries(calmysql ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
+target_link_libraries(ha_columnstore ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)
 
-set_target_properties(calmysql PROPERTIES VERSION 1.0.0 SOVERSION 1)
+set_target_properties(ha_columnstore PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
 SET ( is_columnstore_tables_SRCS
     is_columnstore_tables.cpp
@@ -84,7 +85,7 @@ set_target_properties(is_columnstore_files PROPERTIES PREFIX "")
 set_target_properties(is_columnstore_files PROPERTIES VERSION 1.0.0 SOVERSION 1)
 
 
-install(TARGETS calmysql is_columnstore_tables is_columnstore_columns is_columnstore_extents is_columnstore_files DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine)
+install(TARGETS ha_columnstore is_columnstore_tables is_columnstore_columns is_columnstore_extents is_columnstore_files DESTINATION ${MARIADB_PLUGINDIR} COMPONENT storage-engine)
 install(FILES syscatalog_mysql.sql 
               dumpcat_mysql.sql 
               calsetuserpriority.sql 
@@ -97,22 +98,3 @@ install(PROGRAMS install_mcs_mysql.sh mysql-Columnstore
 
 install(FILES columnstore.cnf
     DESTINATION ${MARIADB_MYCNFDIR} COMPONENT storage-engine)
-
-
-#AM_CPPFLAGS = $(idb_common_includes) $(idb_cppflags)
-#AM_CFLAGS = $(idb_cflags)
-#AM_CXXFLAGS = $(idb_cxxflags)
-#AM_LDFLAGS = $(idb_ldflags)
-#lib_LTLIBRARIES = libcalmysql.la
-#libcalmysql_la_SOURCES = ha_mcs.cpp ha_mcs_impl.cpp ha_mcs_dml.cpp ha_mcs_ddl.cpp ha_mcs_execplan.cpp ha_scalar_sub.cpp ha_in_sub.cpp ha_exists_sub.cpp ha_from_sub.cpp ha_select_sub.cpp ha_view.cpp sm.cpp ha_window_function.cpp ha_mcs_partition.cpp ha_pseudocolumn.cpp
-#libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_libs) $(idb_write_libs) $(AM_LDFLAGS)
-#libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS)
-#include_HEADERS = idb_mysql.h
-#
-#dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
-#dist_mysql_SCRIPTS = install_mcs_mysql.sh mysql-Columnstore dumpcat.pl
-#
-#libcalmysql_la-ha_mcs.lo: ha_mcs.cpp
-#    if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libcalmysql_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -fno-rtti -fno-implicit-templates -MT libcalmysql_la-ha_mcs.lo -MD -MP -MF "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" -c -o libcalmysql_la-ha_mcs.lo `test -f 'ha_mcs.cpp' || echo '$(srcdir)/'`ha_mcs.cpp; \
-#    then mv -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo" "$(DEPDIR)/libcalmysql_la-ha_mcs.Plo"; else rm -f "$(DEPDIR)/libcalmysql_la-ha_mcs.Tpo"; exit 1; fi
-
diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 7c551d355..174f6b7ed 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -39,7 +39,7 @@ server-id = 1
 
 lower_case_table_names=1
 
-plugin-load-add=libcalmysql.so
+plugin-load-add=ha_columnstore.so
 plugin-load-add=is_columnstore_tables.so
 plugin-load-add=is_columnstore_columns.so
 plugin-load-add=is_columnstore_extents.so
diff --git a/dbcon/mysql/install_mcs_mysql.sh.in b/dbcon/mysql/install_mcs_mysql.sh.in
index f677b92ae..6449279e1 100755
--- a/dbcon/mysql/install_mcs_mysql.sh.in
+++ b/dbcon/mysql/install_mcs_mysql.sh.in
@@ -17,31 +17,31 @@ for arg in "$@"; do
 done
 
 mysql --force --user=root mysql 2> ${tmpdir}/mysql_install.log <<EOD
-INSERT INTO mysql.func VALUES ('calgetstats',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calsettrace',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calsetparms',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calflushcache',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calgettrace',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calgetversion',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calonlinealter',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calviewtablelock',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calcleartablelock',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('callastinsertid',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calgetsqlcount',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbpm',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbdbroot',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbsegment',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbsegmentdir',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbextentrelativerid',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbblockid',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbextentid',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbextentmin',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbextentmax',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idbpartition',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('idblocalpm',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('mcssystemready',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('mcssystemreadonly',2,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('mcssystemprimary',2,'libcalmysql.so','function');
+INSERT INTO mysql.func VALUES ('calgetstats',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calsettrace',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calsetparms',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calflushcache',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calgettrace',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calgetversion',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calonlinealter',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calviewtablelock',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calcleartablelock',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('callastinsertid',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calgetsqlcount',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbpm',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbdbroot',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbsegment',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbsegmentdir',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbextentrelativerid',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbblockid',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbextentid',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbextentmin',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbextentmax',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idbpartition',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('idblocalpm',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('mcssystemready',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('mcssystemreadonly',2,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('mcssystemprimary',2,'ha_columnstore.so','function');
 INSERT INTO mysql.func VALUES ('regr_avgx',1,'libregr_mysql.so','aggregate');
 INSERT INTO mysql.func VALUES ('regr_avgy',1,'libregr_mysql.so','aggregate');
 INSERT INTO mysql.func VALUES ('regr_count',2,'libregr_mysql.so','aggregate');
@@ -55,14 +55,14 @@ INSERT INTO mysql.func VALUES ('regr_sxy',1,'libregr_mysql.so','aggregate');
 INSERT INTO mysql.func VALUES ('covar_pop',1,'libregr_mysql.so','aggregate');
 INSERT INTO mysql.func VALUES ('covar_samp',1,'libregr_mysql.so','aggregate');
 INSERT INTO mysql.func VALUES ('distinct_count',2,'libudf_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('caldisablepartitions',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calenablepartitions',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('caldroppartitions',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calshowpartitions',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('caldroppartitionsbyvalue',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('caldisablepartitionsbyvalue',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calenablepartitionsbyvalue',0,'libcalmysql.so','function');
-INSERT INTO mysql.func VALUES ('calshowpartitionsbyvalue',0,'libcalmysql.so','function');
+INSERT INTO mysql.func VALUES ('caldisablepartitions',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calenablepartitions',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('caldroppartitions',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calshowpartitions',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('caldroppartitionsbyvalue',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('caldisablepartitionsbyvalue',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calenablepartitionsbyvalue',0,'ha_columnstore.so','function');
+INSERT INTO mysql.func VALUES ('calshowpartitionsbyvalue',0,'ha_columnstore.so','function');
 INSERT INTO mysql.func VALUES ('moda',4,'libregr_mysql.so','aggregate');
 
 CREATE DATABASE IF NOT EXISTS infinidb_querystats;
diff --git a/dbcon/mysql/libcalmysql.rc b/dbcon/mysql/libcalmysql.rc
deleted file mode 100644
index 46f9a0701..000000000
--- a/dbcon/mysql/libcalmysql.rc
+++ /dev/null
@@ -1,102 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,6,0,0
- PRODUCTVERSION 4,6,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "InfiniDB, Inc."
-            VALUE "FileDescription", "InfiniDB MySQL Connector API"
-            VALUE "FileVersion", "4.6.0-0"
-            VALUE "InternalName", "libcalmysql"
-            VALUE "LegalCopyright", "Copyright (C) 2014"
-            VALUE "OriginalFilename", "libcalmysql.dll"
-            VALUE "ProductName", "InfiniDB"
-            VALUE "ProductVersion", "4.6.0.0 Beta"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/dbcon/mysql/resource.h b/dbcon/mysql/resource.h
deleted file mode 100644
index c692fe412..000000000
--- a/dbcon/mysql/resource.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by libcalmysql.rc
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        101
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif