diff --git a/dbcon/mysql/install_mcs_mysql.sh.in b/dbcon/mysql/install_mcs_mysql.sh.in
index 92492a61e..6632c7630 100755
--- a/dbcon/mysql/install_mcs_mysql.sh.in
+++ b/dbcon/mysql/install_mcs_mysql.sh.in
@@ -19,56 +19,53 @@ fi
 # DELETE libcalmysql.so entries first as they are in ha_columnstore.so in 1.4.2 onwards
 $MDB 2> ${tmpdir}/mysql_install.log <<EOD
 DELETE FROM mysql.func WHERE dl='libcalmysql.so';
-DELETE FROM mysql.func WHERE dl='ha_columnstore.so';
-DELETE FROM mysql.func WHERE dl='libregr_mysql.so';
-DELETE FROM mysql.func WHERE dl='libudf_mysql.so';
-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');
-INSERT INTO mysql.func VALUES ('regr_slope',1,'libregr_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('regr_intercept',1,'libregr_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('regr_r2',1,'libregr_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('corr',1,'libregr_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('regr_sxx',1,'libregr_mysql.so','aggregate');
-INSERT INTO mysql.func VALUES ('regr_syy',1,'libregr_mysql.so','aggregate');
-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,'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 OR REPLACE FUNCTION calgetstats RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calsettrace RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calsetparms RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calflushcache RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calgettrace RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calgetversion RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calonlinealter RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calviewtablelock RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calcleartablelock RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION callastinsertid RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calgetsqlcount RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbpm RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbdbroot RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbsegment RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbsegmentdir RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbextentrelativerid RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbblockid RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbextentid RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbextentmin RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbextentmax RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idbpartition RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION idblocalpm RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION mcssystemready RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION mcssystemreadonly RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION mcssystemprimary RETURNS INTEGER SONAME 'ha_columnstore.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_avgx RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_avgy RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_count RETURNS INTEGER SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_slope RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_intercept RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_r2 RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION corr RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_sxx RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_syy RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION regr_sxy RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION covar_pop RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION covar_samp RETURNS REAL SONAME 'libregr_mysql.so';
+CREATE OR REPLACE AGGREGATE FUNCTION distinct_count RETURNS INTEGER SONAME 'libudf_mysql.so';
+CREATE OR REPLACE FUNCTION caldisablepartitions RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calenablepartitions RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION caldroppartitions RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calshowpartitions RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION caldroppartitionsbyvalue RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION caldisablepartitionsbyvalue RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calenablepartitionsbyvalue RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE FUNCTION calshowpartitionsbyvalue RETURNS STRING SONAME 'ha_columnstore.so';
+CREATE OR REPLACE AGGREGATE FUNCTION moda RETURNS DECIMAL SONAME 'libregr_mysql.so';
 
 CREATE DATABASE IF NOT EXISTS infinidb_querystats;
 CREATE TABLE IF NOT EXISTS infinidb_querystats.querystats