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
Ben Thompson
4709c2bece
Add dependencies on netsnmp build
2016-07-27 16:00:28 -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
david hill
edb55cf23a
mcol-5 save files
2016-07-19 10:46:58 -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
justin
22b7b3d1ef
[MCOL-69] - autotools bootstrap only needed on new release version
2016-06-15 04:46:10 -04:00
Sergei Golubchik
b1b60065d9
build fails with boost linking errors
2016-06-03 13:55:09 +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 7000f6e4f2eadf5bafccf7b459b3a3eff229d426.
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
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
david hill
a02049ba6a
name changes
2016-05-11 16:24:17 -05:00
david hill
e36d78cfc0
add back in windows project files
2016-01-13 15:52:33 -06:00
david hill
f6afc42dd0
the begginning
2016-01-06 14:08:59 -06:00