1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Commit Graph

1162 Commits

Author SHA1 Message Date
392d6df495 Merge branch 'mcol-159' into develop
Conflicts:
	1
	Makefile.save
	autom4te.cache/output.0
	autom4te.cache/traces.0
	autom4te.cache/traces.1
	compile
	config.guess
	config.sub
	configure.save
	dbcon/Makefile.in
	dbcon/ddlpackage/Makefile.in
	dbcon/ddlpackage/ddl-scan.cpp
	dbcon/ddlpackageproc/Makefile.in
	dbcon/dmlpackage/Makefile.in
	dbcon/dmlpackage/dml-scan.cpp
	dbcon/dmlpackageproc/Makefile.in
	dbcon/execplan/Makefile.in
	dbcon/joblist/Makefile.in
	dbcon/mysql/Makefile.in
	ddlproc/Makefile.in
	decomsvr/Makefile.in
	depcomp
	dmlproc/Makefile.in
	exemgr/Makefile.in
	install-sh
	missing
	net-snmp/Makefile.in
	net-snmp/net-snmp-5.7.3/agent/mibgroup/mib_module_includes.h
	net-snmp/net-snmp-5.7.3/configure-summary
	net-snmp/net-snmp-5.7.3/dist/generation-scripts/gen-variables
	net-snmp/net-snmp-5.7.3/include/net-snmp/agent/mib_module_config.h
	net-snmp/net-snmp-5.7.3/mk/MODULE_LIST.mk
	net-snmp/net-snmp-5.7.3/mk/mib_module_list_c.mk
	net-snmp/net-snmp-5.7.3/mk/mib_module_list_code.mk
	net-snmp/net-snmp-5.7.3/mk/mib_module_list_ft.mk
	net-snmp/net-snmp-5.7.3/mk/mib_module_list_lo.mk
	net-snmp/net-snmp-5.7.3/mk/mib_module_list_o.mk
	net-snmp/net-snmp-5.7.3/mk/mibgroup_list_ft.mk
	net-snmp/net-snmp-5.7.3/mk/mibgroup_list_lo.mk
	net-snmp/net-snmp-5.7.3/mk/mibgroup_list_o.mk
	net-snmp/net-snmp-5.7.3/mk/module_list_c.mk
	net-snmp/net-snmp-5.7.3/mk/module_list_code.mk
	net-snmp/net-snmp-5.7.3/mk/module_list_ft.mk
	net-snmp/net-snmp-5.7.3/mk/module_list_lo.mk
	net-snmp/net-snmp-5.7.3/mk/module_list_o.mk
	oam/Makefile.in
	oam/cloud/Makefile.in
	oam/etc/Makefile.in
	oam/oamcpp/Makefile.in
	oam/post/Makefile.in
	oamapps/Makefile.in
	oamapps/calpontDB/Makefile.in
	oamapps/calpontSupport/Makefile.in
	oamapps/columnstoreDB/Makefile.in
	oamapps/columnstoreSupport/Makefile.in
	oamapps/mcsadmin/Makefile.in
	oamapps/postConfigure/Makefile.in
	oamapps/sendtrap/Makefile.in
	oamapps/serverMonitor/Makefile.in
	oamapps/sessionWalker/Makefile.in
	oamapps/traphandler/Makefile.in
	primitives/Makefile.in
	primitives/blockcache/Makefile.in
	primitives/linux-port/Makefile.in
	primitives/primproc/Makefile.in
	procmgr/Makefile.in
	procmon/Makefile.in
	snmpd/Makefile.in
	snmpd/etc/Makefile.in
	snmpd/snmpmanager/Makefile.in
	tools/Makefile.in
	tools/clearShm/Makefile.in
	tools/cleartablelock/Makefile.in
	tools/configMgt/Makefile.in
	tools/cplogger/Makefile.in
	tools/dbbuilder/Makefile.in
	tools/dbloadxml/Makefile.in
	tools/ddlcleanup/Makefile.in
	tools/editem/Makefile.in
	tools/getConfig/Makefile.in
	tools/idbmeminfo/Makefile.in
	tools/setConfig/Makefile.in
	tools/viewtablelock/Makefile.in
	utils/Makefile.in
	utils/batchloader/Makefile.in
	utils/boost_idb/Makefile.in
	utils/cacheutils/Makefile.in
	utils/common/Makefile.in
	utils/compress/Makefile.in
	utils/configcpp/Makefile.in
	utils/dataconvert/Makefile.in
	utils/ddlcleanup/Makefile.in
	utils/funcexp/Makefile.in
	utils/idbdatafile/Makefile.in
	utils/idbhdfs/Makefile.in
	utils/idbhdfs/hdfs-12/Makefile.in
	utils/idbhdfs/hdfs-20/Makefile.in
	utils/jemalloc/Makefile.in
	utils/joiner/Makefile.in
	utils/loggingcpp/Makefile.in
	utils/messageqcpp/Makefile.in
	utils/mysqlcl_idb/Makefile.in
	utils/querystats/Makefile.in
	utils/querytele/Makefile.in
	utils/rowgroup/Makefile.in
	utils/rwlock/Makefile.in
	utils/startup/Makefile.in
	utils/threadpool/Makefile.in
	utils/thrift/Makefile.in
	utils/udfsdk/Makefile.in
	utils/windowfunction/Makefile.in
	utils/winport/Makefile.in
	versioning/BRM/Makefile.in
	versioning/Makefile.in
	writeengine/Makefile.in
	writeengine/bulk/Makefile.in
	writeengine/client/Makefile.in
	writeengine/dictionary/Makefile.in
	writeengine/index/Makefile.in
	writeengine/redistribute/Makefile.in
	writeengine/server/Makefile.in
	writeengine/shared/Makefile.in
	writeengine/splitter/Makefile.in
	writeengine/wrapper/Makefile.in
2016-08-10 16:24:51 -05:00
7766a04de2 Fixes and switch to external boost library 2016-08-10 16:19:27 -05:00
fc67e42728 remove generated files 2016-08-05 14:08:25 -05:00
af051987a6 change the syslogSetup test id number 2016-08-02 08:56:19 -05:00
5053716521 MCOL-66 change error text for ERR_TABLE_LOCKED to accept operation name. 2016-07-28 09:25:49 -05:00
4709c2bece Add dependencies on netsnmp build 2016-07-27 16:00:28 -05:00
479f3cdd50 Revert back to boost_idb built internal, cleanup cmakelists and add a few more system checks 2016-07-27 10:20:57 -05:00
3abaf780d5 Use the internal built boost library for now 2016-07-26 10:11:56 -05:00
e1520a2e4b CMakeLists config changes 2016-07-25 16:14:48 -05:00
5f16248796 removed utils/Makefile.save 2016-07-21 14:10:34 -05:00
edb55cf23a mcol-5 save files 2016-07-19 10:46:58 -05:00
f7fc893f03 Broken file after merge 2016-07-15 11:35:27 -05:00
b7124b91b3 Merge branch
Conflicts:
	dbcon/dmlpackageproc/CMakeLists.txt
	oamapps/CMakeLists.txt
	utils/cacheutils/CMakeLists.txt
	utils/common/CMakeLists.txt
	utils/compress/CMakeLists.txt
	utils/dataconvert/CMakeLists.txt
	utils/idbdatafile/CMakeLists.txt
	utils/mysqlcl_idb/CMakeLists.txt
2016-07-15 11:31:46 -05:00
96a0526ac5 add commented out lines from cmakelists files 2016-07-15 11:23:26 -05:00
8b1bb12610 libjoiner install line uncommented out 2016-07-15 10:49:58 -05:00
3933982f3c make installed scripts executable 2016-07-15 10:49:58 -05:00
c863caf932 remove jemalloc from utils cmakelists 2016-07-15 10:49:58 -05:00
2504b2466a remove jemalloc cmakelists file 2016-07-15 10:49:58 -05:00
934920d73e Changes to how source generating scripts are called from cmakelists 2016-07-15 10:49:57 -05:00
424628349b Add CMake build tree files 2016-07-15 10:49:57 -05:00
d90af9496e Remove Makefile.in and update gitignore 2016-07-15 10:49:57 -05:00
6bbb56b009 libjoiner install line uncommented out 2016-07-15 10:48:08 -05:00
c4b2acebb4 make installed scripts executable 2016-07-15 10:43:56 -05:00
c8ff118462 remove jemalloc from utils cmakelists 2016-07-14 13:49:23 -05:00
77fc5ecfb2 remove jemalloc cmakelists file 2016-07-14 13:20:36 -05:00
13ba43c16b Changes to how source generating scripts are called from cmakelists 2016-07-14 13:12:52 -05:00
6a6d24b91b Add CMake build tree files 2016-07-13 18:12:37 -05:00
3e512830fe Remove Makefile.in and update gitignore 2016-07-12 17:45:33 -05:00
55858d9eb0 MCOL-5 - chnage for ubunut build 2016-07-11 17:15:16 -05:00
31b6660cd4 MCOL-80 EXTRACT() function returned assertion error. Added code similar to mariadb code for all the INTERVAL_XXX_MICROSECOND intervals.
There is still an issue with a wrong answer for INTERVAL_MINUTE_MICROSECOND.
2016-06-28 17:15:11 -05:00
7e43892584 MCOL-59 - change Calpont to Columnstore 2016-06-24 08:57:02 -05:00
7d8de28b43 MCOL-59, change calpont.xml 2016-06-22 16:00:00 -05:00
22b7b3d1ef [MCOL-69] - autotools bootstrap only needed on new release version 2016-06-15 04:46:10 -04:00
2a60153958 [MCOL-69] autotools - finish integrating newer net-snmp 2016-06-14 14:15:05 -04:00
54c361cff7 [MCOL-69] autotools 2016-06-13 20:02:25 -04:00
b1b60065d9 build fails with boost linking errors 2016-06-03 13:55:09 +03:00
16b1264557 Merge pull request #3 from mariadb-corporation/master
merge upstream
2016-06-01 23:13:42 -04:00
e9d96ddc85 copyright additions 2016-06-01 20:03:20 -05:00
5827cd5c47 merge upstream 2016-06-01 19:59:03 -04:00
3a6d4c3fd2 Revert "copyright name change"
This reverts commit 7000f6e4f2.
2016-06-01 17:54:28 -05:00
be45f0a40f merge 2016-06-01 17:30:57 -04:00
f46acea23e removed files for cleanup 2016-06-01 15:00:27 -05:00
7000f6e4f2 copyright name change 2016-06-01 14:54:11 -05:00
eff8f39801 MCOL-3 directory name changes 2016-05-31 16:40:30 -05:00
185d1a780c [MCOL-69] Remove Makefile.in files (should be generated with autoreconf) 2016-05-30 07:48:12 -04:00
25093d4dd0 [MCOL-69] Fix autotools build process
Remove generated Makefiles
Update Makefile.am to specify RPATH as a subdirectory of --prefix
Remove configure artifacts such as config.log, config.h, etc
Remove unneeded backup files (files ending in tilde ~)
2016-05-30 07:41:56 -04:00
c1c82a606b MCOL-2 Change error and message text to Columnstore 2016-05-27 14:40:19 -05:00
8ad31a0ef2 MCOL-79 NULLIF() function returns incorrect values 2016-05-24 14:43:15 -05:00
e39acb55dc change github repo name 2016-05-24 10:39:28 -05:00
57f4e95e60 change name 2016-05-20 14:38:56 -05:00