diff --git a/INSTALL b/INSTALL index 8c755d8e0..bac97edb4 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installation Instructions Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. -Copyright (C) 2016 MariaDB, Corporation +Copyright (C) 2014 InfiniDB, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. diff --git a/copyright.txt2 b/copyright.txt2 deleted file mode 100644 index a0678d32a..000000000 --- a/copyright.txt2 +++ /dev/null @@ -1,179 +0,0 @@ -build/columnstore.community.spec.in -build/columnstore.spec.in -build/columnstore.spec.in~ -build/infinidb.spec.in -ChangeLog -ChangeLog~ -config.log -config.log~ -configure -dbcon/ddlpackage/ddl-gram.cpp -dbcon/ddlpackage/ddl-gram.h -dbcon/ddlpackageproc/createtableprocessor.cpp -dbcon/dmlpackage/dml-gram.cpp -dbcon/dmlpackage/dml-gram.h -dbcon/execplan/calpontsystemcatalog.cpp -dbcon/execplan/calpontsystemcatalog.h -dbcon/execplan/tdriver.cpp -dbcon/execplan/tdriver-sm.cpp -dbcon/joblist/jlf_common.cpp -dbcon/joblist/joblist.cpp -dbcon/joblist/joblistfactory.cpp -dbcon/joblist/joblist.h -dbcon/joblist/largehashjoin.cpp -dbcon/joblist/Makefile -dbcon/joblist/tdriver-agg.cpp -dbcon/mysql/ha_calpont.cpp -dbcon/mysql/ha_calpont_ddl.cpp -dbcon/mysql/ha_calpont_dml.cpp -dbcon/mysql/ha_calpont_execplan.cpp -dbcon/mysql/ha_calpont.h -dbcon/mysql/ha_calpont_impl.cpp -dbcon/mysql/ha_calpont_impl.h -dbcon/mysql/ha_calpont_impl_if.h -dbcon/mysql/ha_calpont_partition.cpp -dbcon/mysql/ha_calpont_udf.cpp -dbcon/mysql/ha_exists_sub.cpp -dbcon/mysql/ha_from_sub.cpp -dbcon/mysql/ha_in_sub.cpp -dbcon/mysql/ha_scalar_sub.cpp -dbcon/mysql/ha_select_sub.cpp -dbcon/mysql/ha_subquery.h -dbcon/mysql/ha_view.cpp -dbcon/mysql/ha_window_function.cpp -dbcon/mysql/Makefile -dbcon/mysql/Makefile.am -dbcon/mysql/Makefile.in -dbcon/mysql/mysql-Calpont -dbcon/mysql/mysql-Columnstore -ddlproc/Makefile -decomsvr/Makefile -dmlproc/Makefile -exemgr/main.cpp -exemgr/Makefile -INSTALL -INSTALL~ -libtool -libtool~ -Makefile.tar -oamapps/calpontConsole/calpontConsole.cpp -oamapps/calpontConsole/calpontConsole.h -oamapps/calpontConsole/Makefile -oamapps/calpontDB/calpontDB.cpp -oamapps/calpontDB/Makefile -oamapps/calpontSupport/calpontSupport.cpp -oamapps/calpontSupport/Makefile -oamapps/columnstoreDB/columnstoreDB.cpp -oamapps/columnstoreDB/Makefile -oamapps/columnstoreSupport/calpontSupport.cpp -oamapps/columnstoreSupport/columnstoreSupport.cpp -oamapps/columnstoreSupport/Makefile -oamapps/columnstoreSupport/Makefile.am -oamapps/columnstoreSupport/Makefile.in -oamapps/hardwareMonitor/Makefile -oamapps/Makefile -oamapps/Makefile.am -oamapps/Makefile.in -oamapps/mcsadmin/1 -oamapps/mcsadmin/Makefile -oamapps/mcsadmin/mcsadmin.cpp -oamapps/mcsadmin/mcsadmin.h -oamapps/postConfigure/amazonInstaller.cpp -oamapps/postConfigure/helpers.cpp -oamapps/postConfigure/helpers.h -oamapps/postConfigure/installer.cpp -oamapps/postConfigure/Makefile -oamapps/postConfigure/mycnfUpgrade.cpp -oamapps/postConfigure/patchInstaller.cpp -oamapps/postConfigure/postConfigure.cpp -oamapps/replayTransactionLog/Makefile -oamapps/resourceMonitor/Makefile -oamapps/resourceMonitor/resourceMonitor.cpp -oamapps/sendtrap/Makefile -oamapps/serverMonitor/cpuMonitor.cpp -oamapps/serverMonitor/dbhealthMonitor.cpp -oamapps/serverMonitor/diskMonitor.cpp -oamapps/serverMonitor/Makefile -oamapps/serverMonitor/memoryMonitor.cpp -oamapps/serverMonitor/msgProcessor.cpp -oamapps/sessionWalker/Makefile -oamapps/traphandler/Makefile -oam/install_scripts/Makefile -oam/oamcpp/liboamcpp.cpp -oam/oamcpp/liboamcpp.h -oam/oamcpp/Makefile -oam/oamcpp/oamcache.cpp -oam/oamcpp/oamcache.h -oam/replaytxnlog/Makefile -oam/replaytxnlog/replaytxnlog.cpp -primitives/blockcache/blockrequestprocessor.cpp -primitives/blockcache/filebuffermgr.cpp -primitives/blockcache/iomanager.cpp -primitives/blockcache/stats.cpp -primitives/primproc/batchprimitiveprocessor.cpp -primitives/primproc/bppseeder.cpp -primitives/primproc/Makefile -primitives/primproc/primitiveserver.cpp -primitives/primproc/primitiveserver.h -primitives/primproc/primproc.cpp -procmgr/main.cpp -procmgr/Makefile -procmgr/processmanager.cpp -procmgr/processmanager.h -procmon/main.cpp -procmon/Makefile -procmon/processmonitor.cpp -snmpd/snmpmanager/snmpglobal.h -tools/bincvt/Makefile -tools/clearShm/Makefile -tools/cleartablelock/Makefile -tools/configMgt/autoConfigure.cpp -tools/configMgt/autoInstaller.cpp -tools/configMgt/configure.cpp -tools/configMgt/Makefile -tools/configMgt/stackReleaseChecker.cpp -tools/cplogger/Makefile -tools/dbbuilder/Makefile -tools/dbloadxml/Makefile -tools/ddlcleanup/Makefile -tools/ddldriver/Makefile -tools/dmldriver/Makefile -tools/editem/Makefile -tools/getConfig/Makefile -tools/hdfsCheck/Makefile -tools/idbmeminfo/Makefile -tools/notificationTester/Makefile -tools/qfe/Makefile -tools/setConfig/Makefile -tools/viewtablelock/Makefile -utils/autoconf/INSTALL -utils/autoconf/INSTALL~ -utils/dataconvert/Makefile -utils/funcexp/func_from_unixtime.cpp -utils/funcexp/func_nullif.cpp -utils/funcexp/Makefile -utils/idbdatafile/Makefile -utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java -utils/infinidb_hadoop/src/infinidb/hadoop/example/InfiniDBOutputDriver.java~ -utils/loggingcpp/errorids.h -utils/loggingcpp/messagelog.cpp -utils/loggingcpp/tdriver.cpp -utils/mysqlcl_idb/Makefile -utils/net-snmp/net-snmp-config.h -utils/querystats/Makefile -utils/startup/installdir.cpp -utils/testbc/stats.cpp -utils/udfsdk/Makefile -utils/udfsdk/udfinfinidb.cpp -utils/udfsdk/udfsdk.h -versioning/BRM/Makefile -versioning/BRM/slavecomm.cpp -versioning/BRM/tracer.cpp -versioning/BRM/tracer.h -writeengine/bulk/Makefile -writeengine/redistribute/we_redistributecontrol.cpp -writeengine/redistribute/we_redistributecontrolthread.cpp -writeengine/server/Makefile -writeengine/splitter/Makefile -writeengine/splitter/we_cmdargs.cpp -writeengine/wrapper/tdriver.cpp diff --git a/dbcon/ddlpackageproc/createtableprocessor.cpp b/dbcon/ddlpackageproc/createtableprocessor.cpp index eb33de84a..e0ebdb6f3 100644 --- a/dbcon/ddlpackageproc/createtableprocessor.cpp +++ b/dbcon/ddlpackageproc/createtableprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/calpontsystemcatalog.cpp b/dbcon/execplan/calpontsystemcatalog.cpp index ff200db4b..d94598eb7 100644 --- a/dbcon/execplan/calpontsystemcatalog.cpp +++ b/dbcon/execplan/calpontsystemcatalog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/calpontsystemcatalog.h b/dbcon/execplan/calpontsystemcatalog.h index d00e55ef5..3ef4a53b2 100644 --- a/dbcon/execplan/calpontsystemcatalog.h +++ b/dbcon/execplan/calpontsystemcatalog.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/tdriver-sm.cpp b/dbcon/execplan/tdriver-sm.cpp index 8053a6a17..14307f3ee 100644 --- a/dbcon/execplan/tdriver-sm.cpp +++ b/dbcon/execplan/tdriver-sm.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/execplan/tdriver.cpp b/dbcon/execplan/tdriver.cpp index 6fa54fd20..a0d4481d4 100644 --- a/dbcon/execplan/tdriver.cpp +++ b/dbcon/execplan/tdriver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/jlf_common.cpp b/dbcon/joblist/jlf_common.cpp index ff32ced8f..c7c5470b7 100644 --- a/dbcon/joblist/jlf_common.cpp +++ b/dbcon/joblist/jlf_common.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblist.cpp b/dbcon/joblist/joblist.cpp index c21a7dea0..1aab1bdfb 100644 --- a/dbcon/joblist/joblist.cpp +++ b/dbcon/joblist/joblist.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h index fb7df6553..c64f62833 100644 --- a/dbcon/joblist/joblist.h +++ b/dbcon/joblist/joblist.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp index 284884e91..10f8fbd0a 100644 --- a/dbcon/joblist/joblistfactory.cpp +++ b/dbcon/joblist/joblistfactory.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/largehashjoin.cpp b/dbcon/joblist/largehashjoin.cpp index 37b6e4cb1..0129d6600 100644 --- a/dbcon/joblist/largehashjoin.cpp +++ b/dbcon/joblist/largehashjoin.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/joblist/tdriver-agg.cpp b/dbcon/joblist/tdriver-agg.cpp index 48b3bf803..59f8890c1 100644 --- a/dbcon/joblist/tdriver-agg.cpp +++ b/dbcon/joblist/tdriver-agg.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/Makefile.am b/dbcon/mysql/Makefile.am index 4de8af195..c305cda80 100644 --- a/dbcon/mysql/Makefile.am +++ b/dbcon/mysql/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2016 MariaDB, Corporation +# Copyright (C) 2014 InfiniDB, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont.cpp b/dbcon/mysql/ha_calpont.cpp index 396011a2b..2103cb103 100755 --- a/dbcon/mysql/ha_calpont.cpp +++ b/dbcon/mysql/ha_calpont.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont.h b/dbcon/mysql/ha_calpont.h index 6e1eccc5d..5db3e07cb 100755 --- a/dbcon/mysql/ha_calpont.h +++ b/dbcon/mysql/ha_calpont.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_ddl.cpp b/dbcon/mysql/ha_calpont_ddl.cpp index 82cc2a5e7..acad2100b 100755 --- a/dbcon/mysql/ha_calpont_ddl.cpp +++ b/dbcon/mysql/ha_calpont_ddl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_dml.cpp b/dbcon/mysql/ha_calpont_dml.cpp index c4e94e29c..017b1f4b0 100755 --- a/dbcon/mysql/ha_calpont_dml.cpp +++ b/dbcon/mysql/ha_calpont_dml.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index be8eea8dc..026af72f7 100755 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp index d52317514..91b382413 100755 --- a/dbcon/mysql/ha_calpont_impl.cpp +++ b/dbcon/mysql/ha_calpont_impl.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl.h b/dbcon/mysql/ha_calpont_impl.h index 905249d88..8e03f7806 100644 --- a/dbcon/mysql/ha_calpont_impl.h +++ b/dbcon/mysql/ha_calpont_impl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_impl_if.h b/dbcon/mysql/ha_calpont_impl_if.h index 8b7a145ed..657f1a763 100644 --- a/dbcon/mysql/ha_calpont_impl_if.h +++ b/dbcon/mysql/ha_calpont_impl_if.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_partition.cpp b/dbcon/mysql/ha_calpont_partition.cpp index 91c6cc66e..39713f3cc 100755 --- a/dbcon/mysql/ha_calpont_partition.cpp +++ b/dbcon/mysql/ha_calpont_partition.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_calpont_udf.cpp b/dbcon/mysql/ha_calpont_udf.cpp index 94dda4a2b..3f088b13f 100755 --- a/dbcon/mysql/ha_calpont_udf.cpp +++ b/dbcon/mysql/ha_calpont_udf.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_exists_sub.cpp b/dbcon/mysql/ha_exists_sub.cpp index 2c9382e4a..9659b0a96 100755 --- a/dbcon/mysql/ha_exists_sub.cpp +++ b/dbcon/mysql/ha_exists_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_from_sub.cpp b/dbcon/mysql/ha_from_sub.cpp index 29712ea67..a5c1cef42 100755 --- a/dbcon/mysql/ha_from_sub.cpp +++ b/dbcon/mysql/ha_from_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_in_sub.cpp b/dbcon/mysql/ha_in_sub.cpp index 69e2d5f7b..cb406ba66 100755 --- a/dbcon/mysql/ha_in_sub.cpp +++ b/dbcon/mysql/ha_in_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_scalar_sub.cpp b/dbcon/mysql/ha_scalar_sub.cpp index 2c6fd79c2..7e7a3459e 100755 --- a/dbcon/mysql/ha_scalar_sub.cpp +++ b/dbcon/mysql/ha_scalar_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_select_sub.cpp b/dbcon/mysql/ha_select_sub.cpp index 8e21a01da..a0e4ec37f 100755 --- a/dbcon/mysql/ha_select_sub.cpp +++ b/dbcon/mysql/ha_select_sub.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_subquery.h b/dbcon/mysql/ha_subquery.h index 373112b8f..4a34d3f88 100755 --- a/dbcon/mysql/ha_subquery.h +++ b/dbcon/mysql/ha_subquery.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_view.cpp b/dbcon/mysql/ha_view.cpp index e22e888c8..a99573fa0 100755 --- a/dbcon/mysql/ha_view.cpp +++ b/dbcon/mysql/ha_view.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/dbcon/mysql/ha_window_function.cpp b/dbcon/mysql/ha_window_function.cpp index 7b3ee738b..2d17965c4 100755 --- a/dbcon/mysql/ha_window_function.cpp +++ b/dbcon/mysql/ha_window_function.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/exemgr/main.cpp b/exemgr/main.cpp index 543f7f4b3..e3fcaea3b 100644 --- a/exemgr/main.cpp +++ b/exemgr/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/install_scripts/columnstoreSyslog b/oam/install_scripts/columnstoreSyslog index e9adb7706..37dc0335a 100644 --- a/oam/install_scripts/columnstoreSyslog +++ b/oam/install_scripts/columnstoreSyslog @@ -4,4 +4,3 @@ local1.=err -/var/log/mariadb/columnstore/err.log local1.=warning -/var/log/mariadb/columnstore/warning.log local1.=info -/var/log/mariadb/columnstore/info.log local1.=debug -/var/log/mariadb/columnstore/debug.log -local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/columnstoreSyslog-ng b/oam/install_scripts/columnstoreSyslog-ng index b4b80e1c5..c7ae76744 100755 --- a/oam/install_scripts/columnstoreSyslog-ng +++ b/oam/install_scripts/columnstoreSyslog-ng @@ -40,9 +40,6 @@ destination d_debug{ file("/var/log/mariadb/columnstore/debug.log"); }; -destination d_data_mods{ - file("/var/log/mariadb/columnstore/data/data_mods.log"); -}; log{ source(s_columnstore); @@ -70,9 +67,4 @@ log{ filter(f_local1debug); destination(d_debug); }; -log{ - source(s_columnstore); - filter(f_local2crit); - destination(d_data_mods); -}; diff --git a/oam/install_scripts/columnstoreSyslog7 b/oam/install_scripts/columnstoreSyslog7 index 05551200e..87bababaa 100644 --- a/oam/install_scripts/columnstoreSyslog7 +++ b/oam/install_scripts/columnstoreSyslog7 @@ -4,5 +4,4 @@ local1.err -/var/log/mariadb/columnstore/err.log local1.warning -/var/log/mariadb/columnstore/warning.log local1.info -/var/log/mariadb/columnstore/info.log local1.debug -/var/log/mariadb/columnstore/debug.log -local2.crit -/var/log/mariadb/columnstore/data/data_mods.log diff --git a/oam/install_scripts/post-install b/oam/install_scripts/post-install index c7dbd537d..b382cd333 100755 --- a/oam/install_scripts/post-install +++ b/oam/install_scripts/post-install @@ -106,7 +106,6 @@ test -d /var/log/mariadb/columnstore/archive || mkdir /var/log/mariadb/columnsto test -d /var/log/mariadb/columnstore/corefiles || mkdir /var/log/mariadb/columnstore/corefiles >/dev/null 2>&1 test -d /var/log/mariadb/columnstore/trace || mkdir /var/log/mariadb/columnstore/trace >/dev/null 2>&1 test -h /var/log/mariadb/columnstore/data && rm -f /var/log/mariadb/columnstore/data -test -d /var/log/mariadb/columnstore/data || mkdir /var/log/mariadb/columnstore/data >/dev/null 2>&1 # make sure trace dir is world-writable and sticky chmod 1755 /var/log/mariadb/columnstore/trace >/dev/null 2>&1 test -d $installdir/data || mkdir $installdir/data diff --git a/oam/oamcpp/liboamcpp.cpp b/oam/oamcpp/liboamcpp.cpp index 1caa77e49..72456844b 100644 --- a/oam/oamcpp/liboamcpp.cpp +++ b/oam/oamcpp/liboamcpp.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/oamcpp/liboamcpp.h b/oam/oamcpp/liboamcpp.h index b2be8c81a..b17ce752f 100644 --- a/oam/oamcpp/liboamcpp.h +++ b/oam/oamcpp/liboamcpp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -363,7 +363,6 @@ namespace oam "local1.=warning -/var/log/mariadb/columnstore/warning.log", "local1.=info -/var/log/mariadb/columnstore/info.log", "local1.=debug -/var/log/mariadb/columnstore/debug.log", - "local2.=crit -/var/log/mariadb/columnstore/data/data_mods.log", "" }; @@ -387,7 +386,6 @@ namespace oam LEVEL_WARNING = 0x4, LEVEL_INFO = 0x8, LEVEL_DEBUG = 0x10, - LEVEL_DATA = 0x20 }; /** @brief Alarm IDs diff --git a/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp index 362543595..c4f57cf19 100644 --- a/oam/oamcpp/oamcache.cpp +++ b/oam/oamcpp/oamcache.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/oamcpp/oamcache.h b/oam/oamcpp/oamcache.h index 7d981f652..44561aa0a 100644 --- a/oam/oamcpp/oamcache.h +++ b/oam/oamcpp/oamcache.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oam/replaytxnlog/replaytxnlog.cpp b/oam/replaytxnlog/replaytxnlog.cpp index f84ba7c1b..032f2eda0 100644 --- a/oam/replaytxnlog/replaytxnlog.cpp +++ b/oam/replaytxnlog/replaytxnlog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/Makefile.am b/oamapps/Makefile.am index 6d023dd2e..95ef5f9d0 100644 --- a/oamapps/Makefile.am +++ b/oamapps/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2016 MariaDB, Corporation +# Copyright (C) 2014 InfiniDB, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/oamapps/calpontConsole/calpontConsole.cpp b/oamapps/calpontConsole/calpontConsole.cpp index 8dfd35779..467420c7f 100644 --- a/oamapps/calpontConsole/calpontConsole.cpp +++ b/oamapps/calpontConsole/calpontConsole.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/calpontConsole/calpontConsole.h b/oamapps/calpontConsole/calpontConsole.h index 13cf91fb3..8ea337156 100644 --- a/oamapps/calpontConsole/calpontConsole.h +++ b/oamapps/calpontConsole/calpontConsole.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/calpontDB/calpontDB.cpp b/oamapps/calpontDB/calpontDB.cpp index 043656d61..82a866d6d 100644 --- a/oamapps/calpontDB/calpontDB.cpp +++ b/oamapps/calpontDB/calpontDB.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/mcsadmin/1 b/oamapps/mcsadmin/1 index 0582db633..c7802aa3c 100644 --- a/oamapps/mcsadmin/1 +++ b/oamapps/mcsadmin/1 @@ -1,7 +1,7 @@ :****************************************************************************************** # $Id: Makefile 2339 2012-05-02 18:20:56Z pleblanc $ # -# Copyright (C) 2016 MariaDB, Corporation +# Copyright (C) 2009-2012 Calpont Corporation # All rights reserved #*****************************************************************************************/ include ../../rules.mak diff --git a/oamapps/mcsadmin/mcsadmin.cpp b/oamapps/mcsadmin/mcsadmin.cpp index 4511c876a..8b7018eea 100644 --- a/oamapps/mcsadmin/mcsadmin.cpp +++ b/oamapps/mcsadmin/mcsadmin.cpp @@ -3357,8 +3357,6 @@ int processCommand(string* arguments) cout << "Info "; if ( ((data & LEVEL_DEBUG) ? 1 : 0) == 1 ) cout << "Debug "; - if ( ((data & LEVEL_DATA) ? 1 : 0) == 1 ) - cout << "Data"; cout << endl; } } diff --git a/oamapps/mcsadmin/mcsadmin.h b/oamapps/mcsadmin/mcsadmin.h index 02fe01a5e..b5801d7f3 100644 --- a/oamapps/mcsadmin/mcsadmin.h +++ b/oamapps/mcsadmin/mcsadmin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/amazonInstaller.cpp b/oamapps/postConfigure/amazonInstaller.cpp index 14260ac3a..ad13cfda9 100644 --- a/oamapps/postConfigure/amazonInstaller.cpp +++ b/oamapps/postConfigure/amazonInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/helpers.h b/oamapps/postConfigure/helpers.h index 1f7730f83..c7df2e83e 100644 --- a/oamapps/postConfigure/helpers.h +++ b/oamapps/postConfigure/helpers.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/installer.cpp b/oamapps/postConfigure/installer.cpp index 1987a8523..56600cd59 100644 --- a/oamapps/postConfigure/installer.cpp +++ b/oamapps/postConfigure/installer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/mycnfUpgrade.cpp b/oamapps/postConfigure/mycnfUpgrade.cpp index e99f53f34..ec0701773 100644 --- a/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/oamapps/postConfigure/mycnfUpgrade.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/postConfigure/patchInstaller.cpp b/oamapps/postConfigure/patchInstaller.cpp index c886d06a2..e4302b37a 100644 --- a/oamapps/postConfigure/patchInstaller.cpp +++ b/oamapps/postConfigure/patchInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/resourceMonitor/resourceMonitor.cpp b/oamapps/resourceMonitor/resourceMonitor.cpp index a69ac4221..dbeed7c99 100644 --- a/oamapps/resourceMonitor/resourceMonitor.cpp +++ b/oamapps/resourceMonitor/resourceMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/cpuMonitor.cpp b/oamapps/serverMonitor/cpuMonitor.cpp index 101e172e4..627111cb9 100644 --- a/oamapps/serverMonitor/cpuMonitor.cpp +++ b/oamapps/serverMonitor/cpuMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/dbhealthMonitor.cpp b/oamapps/serverMonitor/dbhealthMonitor.cpp index 24c729f11..0bbc2d81c 100644 --- a/oamapps/serverMonitor/dbhealthMonitor.cpp +++ b/oamapps/serverMonitor/dbhealthMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/diskMonitor.cpp b/oamapps/serverMonitor/diskMonitor.cpp index b6208e668..c51d79236 100644 --- a/oamapps/serverMonitor/diskMonitor.cpp +++ b/oamapps/serverMonitor/diskMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/memoryMonitor.cpp b/oamapps/serverMonitor/memoryMonitor.cpp index 694b42ca4..5b5d8d31f 100644 --- a/oamapps/serverMonitor/memoryMonitor.cpp +++ b/oamapps/serverMonitor/memoryMonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/oamapps/serverMonitor/msgProcessor.cpp b/oamapps/serverMonitor/msgProcessor.cpp index 432cf9766..b5267628a 100644 --- a/oamapps/serverMonitor/msgProcessor.cpp +++ b/oamapps/serverMonitor/msgProcessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/blockcache/blockrequestprocessor.cpp b/primitives/blockcache/blockrequestprocessor.cpp index 4dc596c27..e4abffca0 100644 --- a/primitives/blockcache/blockrequestprocessor.cpp +++ b/primitives/blockcache/blockrequestprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/blockcache/filebuffermgr.cpp b/primitives/blockcache/filebuffermgr.cpp index ea4afaef9..15d3fa185 100644 --- a/primitives/blockcache/filebuffermgr.cpp +++ b/primitives/blockcache/filebuffermgr.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/blockcache/iomanager.cpp b/primitives/blockcache/iomanager.cpp index 389714a5a..dc0a9a267 100644 --- a/primitives/blockcache/iomanager.cpp +++ b/primitives/blockcache/iomanager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/blockcache/stats.cpp b/primitives/blockcache/stats.cpp index adf9f3370..e2a291345 100644 --- a/primitives/blockcache/stats.cpp +++ b/primitives/blockcache/stats.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/batchprimitiveprocessor.cpp b/primitives/primproc/batchprimitiveprocessor.cpp index 437bba3e8..9ab8a6ea0 100644 --- a/primitives/primproc/batchprimitiveprocessor.cpp +++ b/primitives/primproc/batchprimitiveprocessor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/bppseeder.cpp b/primitives/primproc/bppseeder.cpp index f3646b288..64ed9b136 100644 --- a/primitives/primproc/bppseeder.cpp +++ b/primitives/primproc/bppseeder.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primitiveserver.cpp b/primitives/primproc/primitiveserver.cpp index c70bc1c23..0e2973eec 100644 --- a/primitives/primproc/primitiveserver.cpp +++ b/primitives/primproc/primitiveserver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primitiveserver.h b/primitives/primproc/primitiveserver.h index a7b4706c9..2c0e839ff 100644 --- a/primitives/primproc/primitiveserver.h +++ b/primitives/primproc/primitiveserver.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/primitives/primproc/primproc.cpp b/primitives/primproc/primproc.cpp index 3b57170e2..cd7c7d3b3 100644 --- a/primitives/primproc/primproc.cpp +++ b/primitives/primproc/primproc.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmgr/main.cpp b/procmgr/main.cpp index 5593c7621..c07576dae 100644 --- a/procmgr/main.cpp +++ b/procmgr/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp index 2c4306c19..96d5584cd 100644 --- a/procmgr/processmanager.cpp +++ b/procmgr/processmanager.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmgr/processmanager.h b/procmgr/processmanager.h index 858b4f2ea..a25873253 100644 --- a/procmgr/processmanager.h +++ b/procmgr/processmanager.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmon/main.cpp b/procmon/main.cpp index af6e35752..3bc449e95 100644 --- a/procmon/main.cpp +++ b/procmon/main.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/procmon/processmonitor.cpp b/procmon/processmonitor.cpp index 658228cb5..f94ea9820 100644 --- a/procmon/processmonitor.cpp +++ b/procmon/processmonitor.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -3273,9 +3273,6 @@ int ProcessMonitor::getConfigLog() case 5: configData = configData | LEVEL_DEBUG; break; - case 6: - configData = configData | LEVEL_DATA; - break; default: break; } //end of switch diff --git a/snmpd/snmpmanager/snmpglobal.h b/snmpd/snmpmanager/snmpglobal.h index 88f5ad609..6d1c8d441 100644 --- a/snmpd/snmpmanager/snmpglobal.h +++ b/snmpd/snmpmanager/snmpglobal.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/tools/configMgt/autoConfigure.cpp b/tools/configMgt/autoConfigure.cpp index 1b1dac819..f1920d282 100644 --- a/tools/configMgt/autoConfigure.cpp +++ b/tools/configMgt/autoConfigure.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/tools/configMgt/autoInstaller.cpp b/tools/configMgt/autoInstaller.cpp index 0badcee9a..5a94f218f 100644 --- a/tools/configMgt/autoInstaller.cpp +++ b/tools/configMgt/autoInstaller.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/tools/configMgt/configure.cpp b/tools/configMgt/configure.cpp index 7ca68b916..3da3c403f 100644 --- a/tools/configMgt/configure.cpp +++ b/tools/configMgt/configure.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/tools/configMgt/stackReleaseChecker.cpp b/tools/configMgt/stackReleaseChecker.cpp index 08ed32416..0f1bb5a6c 100644 --- a/tools/configMgt/stackReleaseChecker.cpp +++ b/tools/configMgt/stackReleaseChecker.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/autoconf/INSTALL b/utils/autoconf/INSTALL index 8c755d8e0..bac97edb4 100644 --- a/utils/autoconf/INSTALL +++ b/utils/autoconf/INSTALL @@ -4,7 +4,7 @@ Installation Instructions Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc. -Copyright (C) 2016 MariaDB, Corporation +Copyright (C) 2014 InfiniDB, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. diff --git a/utils/autoconf/INSTALL~ b/utils/autoconf/INSTALL~ new file mode 100644 index 000000000..0f12f143b --- /dev/null +++ b/utils/autoconf/INSTALL~ @@ -0,0 +1,306 @@ +Installation Instructions +************************* + +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +Copyright (C) 2014 InfiniDB, Inc. + +This file is free documentation; the Free Software Foundation gives +unlimited permission to copy, distribute and modify it. + +InfiniDB, Inc. also gives unlimited permission to copy, distribute and +modify it. + +Basic Installation from source +============================== + +**** InfiniDB source build instructions **** + +Consult the generic installation instructions +that follow for detailed information. The short version is: + +cd $HOME +git clone http://github.com/infinidb/mysql +git clone http://github.com/infinidb/infinidb +-- or -- +tar -zxf +cd mysql +./configure --prefix=$HOME +make +make install +cd ../infinidb +./configure --prefix=$HOME +make +make install + +This will create a directory called Calpont in $HOME which conatins +all the software you need. + +Install the InfiniDB software into /usr/local (for example) by copying +the entire Calpont directory tree there. + +After untaring the sofware or installing the RPM's, setup the software +to run (this script needs to run with root privileges). Check the Installation +Guide for addition details on using postConfigure: +/usr/local/Calpont/bin/postConfigure + +Setup some aliases: +. /usr/local/Calpont/bin/calpontAlias + +Connect to MySQL: +idbmysql + +A suggested test scenario: +create database calpont; +use calpont; +create table caltest (col1 int, col2 int) engine=infinidb; +show create table caltest; +set autocommit=0; +insert into caltest values (1, 2); +insert into caltest values (3, 4); +commit; +select * from caltest; + +To use bulk load: +1. A delimited import file should be created to match the table that + you want to import data to similar to the following. In this + example, the file will be saved as idbtest.tbl: + 100|1001| + 200|2002| +2. Save/place this file in a directory. +3. From that same directory, import the rows: + /usr/local/Calpont/bin/cpimport calpont caltest caltest.tbl + +And check the import: +calpontmysql calpont +select * from caltest; + + +That's it. Enjoy. + + +These are generic installation instructions. + + The `configure' shell script attempts to guess correct values for +various system-dependent variables used during compilation. It uses +those values to create a `Makefile' in each directory of the package. +It may also create one or more `.h' files containing system-dependent +definitions. Finally, it creates a shell script `config.status' that +you can run in the future to recreate the current configuration, and a +file `config.log' containing compiler output (useful mainly for +debugging `configure'). + + It can also use an optional file (typically called `config.cache' +and enabled with `--cache-file=config.cache' or simply `-C') that saves +the results of its tests to speed up reconfiguring. (Caching is +disabled by default to prevent problems with accidental use of stale +cache files.) + + If you need to do unusual things to compile the package, please try +to figure out how `configure' could check whether to do them, and mail +diffs or instructions to the address given in the `README' so they can +be considered for the next release. If you are using the cache, and at +some point `config.cache' contains results you don't want to keep, you +may remove or edit it. + + The file `configure.ac' (or `configure.in') is used to create +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. + +The simplest way to compile this package is: + + 1. `cd' to the directory containing the package's source code and type + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. + + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. + + 2. Type `make' to compile the package. + + 3. Optionally, type `make check' to run any self-tests that come with + the package. + + 4. Type `make install' to install the programs and any data files and + documentation. + + 5. You can remove the program binaries and object files from the + source code directory by typing `make clean'. To also remove the + files that `configure' created (so you can compile the package for + a different kind of computer), type `make distclean'. There is + also a `make maintainer-clean' target, but that is intended mainly + for the package's developers. If you use it, you may have to get + all sorts of other programs in order to regenerate files that came + with the distribution. + +Compilers and Options +===================== + +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. + + You can give `configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here +is an example: + + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + + *Note Defining Variables::, for more details. + +Compiling For Multiple Architectures +==================================== + +You can compile the package for more than one kind of computer at the +same time, by placing the object files for each architecture in their +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the +directory where you want the object files and executables to go and run +the `configure' script. `configure' automatically checks for the +source code in the directory that `configure' is in and in `..'. + + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. + +Installation Names +================== + +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. + + You can specify separate installation prefixes for +architecture-specific files and architecture-independent files. If you +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. + + In addition, if you use an unusual directory layout you can give +options like `--bindir=DIR' to specify different values for particular +kinds of files. Run `configure --help' for a list of the directories +you can set and what kinds of files go in them. + + If the package supports it, you can cause programs to be installed +with an extra prefix or suffix on their names by giving `configure' the +option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + +Optional Features +================= + +Some packages pay attention to `--enable-FEATURE' options to +`configure', where FEATURE indicates an optional part of the package. +They may also pay attention to `--with-PACKAGE' options, where PACKAGE +is something like `gnu-as' or `x' (for the X Window System). The +`README' should mention any `--enable-' and `--with-' options that the +package recognizes. + + For packages that use the X Window System, `configure' can usually +find the X include and library files automatically, but if it doesn't, +you can use the `configure' options `--x-includes=DIR' and +`--x-libraries=DIR' to specify their locations. + +Specifying the System Type +========================== + +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the +`--build=TYPE' option. TYPE can either be a short name for the system +type, such as `sun4', or a canonical name which has the form: + + CPU-COMPANY-SYSTEM + +where SYSTEM can have one of these forms: + + OS KERNEL-OS + + See the file `config.sub' for the possible values of each field. If +`config.sub' isn't included in this package, then this package doesn't +need to know the machine type. + + If you are _building_ compiler tools for cross-compiling, you should +use the option `--target=TYPE' to select the type of system they will +produce code for. + + If you want to _use_ a cross compiler, that generates code for a +platform different from the build platform, you should specify the +"host" platform (i.e., that on which the generated programs will +eventually be run) with `--host=TYPE'. + +Sharing Defaults +================ + +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. +`configure' looks for `PREFIX/share/config.site' if it exists, then +`PREFIX/etc/config.site' if it exists. Or, you can set the +`CONFIG_SITE' environment variable to the location of the site script. +A warning: not all `configure' scripts look for a site script. + +Defining Variables +================== + +Variables not defined in a site shell script can be set in the +environment passed to `configure'. However, some packages may run +configure again during the build, and the customized values of these +variables may be lost. In order to avoid this problem, you should set +them in the `configure' command line, using `VAR=value'. For example: + + ./configure CC=/usr/local2/bin/gcc + +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + +`configure' Invocation +====================== + +`configure' recognizes the following options to control how it operates. + +`--help' +`-h' + Print a summary of the options to `configure', and exit. + +`--version' +`-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + +`--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + +`--config-cache' +`-C' + Alias for `--cache-file=config.cache'. + +`--quiet' +`--silent' +`-q' + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). + +`--srcdir=DIR' + Look for the package's source code in directory DIR. Usually + `configure' can determine that directory automatically. + +`configure' also accepts some other, not widely useful, options. Run +`configure --help' for more details. + diff --git a/utils/funcexp/func_from_unixtime.cpp b/utils/funcexp/func_from_unixtime.cpp index a7f7b2c88..85aef442b 100644 --- a/utils/funcexp/func_from_unixtime.cpp +++ b/utils/funcexp/func_from_unixtime.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/funcexp/func_nullif.cpp b/utils/funcexp/func_nullif.cpp index 865d9d396..4123faee7 100644 --- a/utils/funcexp/func_nullif.cpp +++ b/utils/funcexp/func_nullif.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/loggingcpp/errorids.h b/utils/loggingcpp/errorids.h index f4c418c37..0182e319c 100644 --- a/utils/loggingcpp/errorids.h +++ b/utils/loggingcpp/errorids.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/loggingcpp/messagelog.cpp b/utils/loggingcpp/messagelog.cpp index d65380ab7..07bb182c6 100644 --- a/utils/loggingcpp/messagelog.cpp +++ b/utils/loggingcpp/messagelog.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/loggingcpp/tdriver.cpp b/utils/loggingcpp/tdriver.cpp index 9d8396e12..1f78d2a9e 100644 --- a/utils/loggingcpp/tdriver.cpp +++ b/utils/loggingcpp/tdriver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/startup/installdir.cpp b/utils/startup/installdir.cpp index f75fb11cb..cb1150aa5 100644 --- a/utils/startup/installdir.cpp +++ b/utils/startup/installdir.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/testbc/stats.cpp b/utils/testbc/stats.cpp index 03d6d6347..c797fd6b4 100644 --- a/utils/testbc/stats.cpp +++ b/utils/testbc/stats.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/udfsdk/udfinfinidb.cpp b/utils/udfsdk/udfinfinidb.cpp index 1fe85afd6..037ea50e1 100644 --- a/utils/udfsdk/udfinfinidb.cpp +++ b/utils/udfsdk/udfinfinidb.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/utils/udfsdk/udfsdk.h b/utils/udfsdk/udfsdk.h index 19243d0e2..10a300e8d 100644 --- a/utils/udfsdk/udfsdk.h +++ b/utils/udfsdk/udfsdk.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/versioning/BRM/slavecomm.cpp b/versioning/BRM/slavecomm.cpp index 1f27fbcc6..19bc12325 100644 --- a/versioning/BRM/slavecomm.cpp +++ b/versioning/BRM/slavecomm.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/versioning/BRM/tracer.cpp b/versioning/BRM/tracer.cpp index 1aa016f4b..8895c3791 100644 --- a/versioning/BRM/tracer.cpp +++ b/versioning/BRM/tracer.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/versioning/BRM/tracer.h b/versioning/BRM/tracer.h index ffcaec746..1b756f155 100644 --- a/versioning/BRM/tracer.h +++ b/versioning/BRM/tracer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/writeengine/redistribute/we_redistributecontrol.cpp b/writeengine/redistribute/we_redistributecontrol.cpp index 00288f33f..c4b709849 100644 --- a/writeengine/redistribute/we_redistributecontrol.cpp +++ b/writeengine/redistribute/we_redistributecontrol.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/writeengine/redistribute/we_redistributecontrolthread.cpp b/writeengine/redistribute/we_redistributecontrolthread.cpp index 0a08d249a..d83638522 100644 --- a/writeengine/redistribute/we_redistributecontrolthread.cpp +++ b/writeengine/redistribute/we_redistributecontrolthread.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/writeengine/splitter/we_cmdargs.cpp b/writeengine/splitter/we_cmdargs.cpp index fab22a90a..160a295bf 100644 --- a/writeengine/splitter/we_cmdargs.cpp +++ b/writeengine/splitter/we_cmdargs.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/writeengine/wrapper/tdriver.cpp b/writeengine/wrapper/tdriver.cpp index 07dfd0bc4..df32c2734 100644 --- a/writeengine/wrapper/tdriver.cpp +++ b/writeengine/wrapper/tdriver.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2016 MariaDB, Corporation +/* Copyright (C) 2014 InfiniDB, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License