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

1102 Commits

Author SHA1 Message Date
Ben Thompson
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
David Hall
8bc7e46905 MCOL-5 Don't send empty strings in cpimport command line. It confuses cpimport. 2016-08-09 11:35:45 -05:00
David Hall
8de8666046 MCOL-5 fill the vector before taking the addresses of the strings. 2016-08-08 16:36:01 -05:00
David Hall
7598e8bc75 MCOL-5 Building the cpimport command line for LDI relied on the addresses of the contents of a std:vector being static during re-allocation. This is an erroneous assumption. Recoded to build the vector completely, then use it. 2016-08-05 14:09:19 -05:00
Ben Thompson
4709c2bece Add dependencies on netsnmp build 2016-07-27 16:00:28 -05:00
david hill
539e524ad4 name change from InfiniDB in comments 2016-07-26 09:24:46 -05:00
david hill
6527f191e1 merged mcol-5 2016-07-21 09:00:25 -05:00
David Hall
6d11ce030d MCOL-66 - Make the DDL and DML parsers re-entrant.
Serialize all DDL because the VVS can't handle modifying the same block simultaneously
Fix the CTRL+C logic in DML that caused COMMIT issues.
2016-07-20 11:47:51 -05:00
Ben Thompson
fe1a4c659e Fix libcalmysql 2016-07-19 12:40:51 -05:00
david hill
edb55cf23a mcol-5 save files 2016-07-19 10:46:58 -05:00
Ben Thompson
72ac8c5e90 CMake fixes for executable install and libclamysql 2016-07-15 16:23:26 -05:00
Ben Thompson
ba2a66f589 More cmakefile fixes 2016-07-15 15:07:35 -05:00
Ben Thompson
424628349b Add CMake build tree files 2016-07-15 10:49:57 -05:00
Ben Thompson
d90af9496e Remove Makefile.in and update gitignore 2016-07-15 10:49:57 -05:00
David Hall
d8c4f4f1cf Set up so that configure --with-debug works 2016-06-28 16:27:46 -05:00
david hill
0171724905 mcol-146 2016-06-27 13:27:20 -05:00
david hill
6bfb18c71a merge mcol59 to develop 2016-06-24 15:49:49 -05:00
david hill
752f87cc92 mcol-145, change sbin to bin 2016-06-22 20:47:18 -05:00
david hill
5c7ac83667 MCOL-145, still cleaning up directories 2016-06-22 18:41:16 -05:00
david hill
7d8de28b43 MCOL-59, change calpont.xml 2016-06-22 16:00:00 -05:00
david hill
bbcb38e6e2 mcol-64 2016-06-17 15:18:23 +00:00
david hill
df3d259f38 MCOL64 more directory name changes 2016-06-16 21:51:42 +00:00
david hill
ef2697d370 move files 2016-06-16 20:50:54 +00:00
david hill
a1cab7f7ee change makfile for mysql-Columnstore 2016-06-16 19:59:50 +00:00
justin
b76a909715 [mcol-69] fix regression in dbcon/oamapps make process.. 2016-06-16 08:59:31 -04:00
david hill
24189682ff mcol-64 2016-06-15 20:25:35 +00:00
justin
709a1d0d41 merge [mcol-69] 2016-06-15 12:25:41 -04:00
justin
22b7b3d1ef [MCOL-69] - autotools bootstrap only needed on new release version 2016-06-15 04:46:10 -04:00
david hill
d409422287 MCOL-58 - change to handle non-root install dir 2016-06-05 14:00:03 -05:00
Sergei Golubchik
23f8cb50b9 Builds! 2016-06-03 19:54:24 +03:00
Sergei Golubchik
91a0629d15 fails on #include sql_table.h and sql_select.h 2016-06-03 16:50:17 +03:00
Justin Swanhart
16b1264557 Merge pull request #3 from mariadb-corporation/master
merge upstream
2016-06-01 23:13:42 -04:00
david hill
e9d96ddc85 copyright additions 2016-06-01 20:03:20 -05:00
Justin Swanhart
5827cd5c47 merge upstream 2016-06-01 19:59:03 -04:00
david hill
3a6d4c3fd2 Revert "copyright name change"
This reverts commit 7000f6e4f2.
2016-06-01 17:54:28 -05:00
Justin Swanhart
be45f0a40f merge 2016-06-01 17:30:57 -04:00
david hill
7000f6e4f2 copyright name change 2016-06-01 14:54:11 -05:00
david hill
eff8f39801 MCOL-3 directory name changes 2016-05-31 16:40:30 -05:00
Justin Swanhart
e9b6d3a5a6 [MCOL-69] generated file cleanup, add artifacts to ignore list 2016-05-30 07:52:26 -04:00
Justin Swanhart
185d1a780c [MCOL-69] Remove Makefile.in files (should be generated with autoreconf) 2016-05-30 07:48:12 -04:00
Justin Swanhart
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
Justin Swanhart
6fcdbaa67b Merge pull request #1 from mariadb-corporation/master
merge upstream
2016-05-29 13:49:46 -04:00
David Hall
6df96183a6 Merge branch 'master' of https://github.com/mariadb-corporation/mariadb-columnstore-engine 2016-05-27 14:40:44 -05:00
David Hall
c1c82a606b MCOL-2 Change error and message text to Columnstore 2016-05-27 14:40:19 -05:00
Justin Swanhart
a812a76e8d [MCOL-69] - improve build process
Add .gitignore file to omit autoconf artificats
Modify bootstrap to:
  No longer copy binaries into export
  Create export/mysql directory properly
  Check for errors when generating version header
  Run configure
  Check for errors when running configure
Modify genVersion.h to:
  Place versionnumber.h into dbcon/mysql, the only place it appears to be used
  It was being generated in the install prefix, thus when using a non-user
    path like /usr/local/PREFIX it would fail to generate the version number
    header, because the user compiling the software does not have write
    permission.  This necessitated building as root, this will resolve that.
Remove config.log, an autotools artifact
Add autoconf templates for mcsadmin
2016-05-27 09:47:39 -04:00
david hill
5440f1fa02 Merge branch 'master' of https://github.com/mariadb-corporation/mariadb-columnstore-engine 2016-05-25 13:03:25 -05:00
david hill
23dad9de02 fix engine create issue 2016-05-25 13:03:11 -05:00
David Hall
2fa2a214c6 MCOL-81 - optimizer override bug 2016-05-24 17:42:17 -05:00
david hill
e39acb55dc change github repo name 2016-05-24 10:39:28 -05:00
David Hall
9adb467296 Merge branch 'master' of https://github.com/davidhilldallas/InfiniDB_MariaDB 2016-05-24 01:07:14 -05:00