database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

more changes for names

Browse Source
This commit is contained in:
david hill
2016-05-12 14:14:24 -05:00
parent b78043dc8a
commit 0dbd823c00
185 changed files with 15440 additions and 16894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/Makefile.am
View File

@ -25,7 +25,7 @@ libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../.
include_HEADERS = idb_mysql.h
dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
dist_mysql_SCRIPTS = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
mysql-Columnstore = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
test:

12
dbcon/mysql/Makefile.in
View File

@ -40,7 +40,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = dbcon/mysql
DIST_COMMON = $(dist_mysql_DATA) $(dist_mysql_SCRIPTS) \
DIST_COMMON = $(dist_mysql_DATA) $(mysql-Columnstore) \
$(include_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compilerflags.m4 \
@ -75,7 +75,7 @@ am_libcalmysql_la_OBJECTS = libcalmysql_la-ha_calpont.lo \
libcalmysql_la-ha_pseudocolumn.lo
libcalmysql_la_OBJECTS = $(am_libcalmysql_la_OBJECTS)
dist_mysqlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(dist_mysql_SCRIPTS)
SCRIPTS = $(mysql-Columnstore)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -255,7 +255,7 @@ libcalmysql_la_LDFLAGS = -version-info 1:0:0 $(idb_common_ldflags) $(idb_common_
libcalmysql_la_CPPFLAGS = -I/usr/include/libxml2 -I../../../mysql/include -I../../../mysql/sql -I../../../mysql/regex -DMYSQL_DYNAMIC_PLUGIN $(AM_CPPFLAGS)
include_HEADERS = idb_mysql.h
dist_mysql_DATA = syscatalog_mysql.sql dumpcat_mysql.sql calsetuserpriority.sql calremoveuserpriority.sql calshowprocesslist.sql my.cnf
dist_mysql_SCRIPTS = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
mysql-Columnstore = install_calpont_mysql.sh mysql-Calpont dumpcat.pl
all: all-am
.SUFFIXES:
@ -318,10 +318,10 @@ clean-libLTLIBRARIES:
done
libcalmysql.la: $(libcalmysql_la_OBJECTS) $(libcalmysql_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libcalmysql_la_LDFLAGS) $(libcalmysql_la_OBJECTS) $(libcalmysql_la_LIBADD) $(LIBS)
install-dist_mysqlSCRIPTS: $(dist_mysql_SCRIPTS)
install-dist_mysqlSCRIPTS: $(mysql-Columnstore)
@$(NORMAL_INSTALL)
test -z "$(mysqldir)" || $(mkdir_p) "$(DESTDIR)$(mysqldir)"
@list='$(dist_mysql_SCRIPTS)'; for p in $$list; do \
@list='$(mysql-Columnstore)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
@ -332,7 +332,7 @@ install-dist_mysqlSCRIPTS: $(dist_mysql_SCRIPTS)
uninstall-dist_mysqlSCRIPTS:
@$(NORMAL_UNINSTALL)
@list='$(dist_mysql_SCRIPTS)'; for p in $$list; do \
@list='$(mysql-Columnstore)'; for p in $$list; do \
f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
echo " rm -f '$(DESTDIR)$(mysqldir)/$$f'"; \
rm -f "$(DESTDIR)$(mysqldir)/$$f"; \

2
dbcon/mysql/dumpcat.pl
View File

@ -5,7 +5,7 @@
use DBI;
use DBD::mysql;
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/Calpont/mysql/my.cnf';
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/MariaDB/Columnstore/mysql/my.cnf';
$username = 'root';
$auth = '';
%attr = ();

2
dbcon/mysql/files.lst
View File

@ -1,3 +1,3 @@
./my.cnf
./mysql-Calpont
./mysql-Columnstore
./install_calpont_mysql.sh

28
dbcon/mysql/my.cnf
View File

@ -20,15 +20,15 @@
[client]
#password = your_password
port = 3306
socket = /usr/local/Calpont/mysql/lib/mysql/mysql.sock
socket = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
# Here follows entries for some specific programs
# The MySQL server
[mysqld]
port = 3306
socket = /usr/local/Calpont/mysql/lib/mysql/mysql.sock
datadir = /usr/local/Calpont/mysql/db
socket = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
datadir = /usr/local/MariaDB/Columnstore/mysql/db
skip-external-locking
key_buffer_size = 512M
max_allowed_packet = 1M
@ -62,10 +62,10 @@ infinidb_um_mem_limit=0
infinidb_use_import_for_batchinsert=1
infinidb_import_for_batchinsert_delimiter=7
basedir = /usr/local/Calpont/mysql/
character-sets-dir = /usr/local/Calpont/mysql/share/mysql/charsets/
language = /usr/local/Calpont/mysql/share/mysql/english/
plugin_dir = /usr/local/Calpont/mysql/lib64/mysql/plugin
basedir = /usr/local/MariaDB/Columnstore/mysql/
character-sets-dir = /usr/local/MariaDB/Columnstore/mysql/share/mysql/charsets/
language = /usr/local/MariaDB/Columnstore/mysql/share/mysql/english/
plugin_dir = /usr/local/MariaDB/Columnstore/mysql/lib64/mysql/plugin
# Don't listen on a TCP/IP port at all. This can be a security enhancement,
# if all processes that need to connect to mysqld run on the same host.
@ -134,20 +134,20 @@ slave-skip-errors=all
#master-port = <port>
#
# binary logging - not required for slaves, but recommended
log-bin=/usr/local/Calpont/mysql/db/mysql-bin
relay-log=/usr/local/Calpont/mysql/db/relay-bin
relay-log-index = /usr/local/Calpont/mysql/db/relay-bin.index
relay-log-info-file = /usr/local/Calpont/mysql/db/relay-bin.info
log-bin=/usr/local/MariaDB/Columnstore/mysql/db/mysql-bin
relay-log=/usr/local/MariaDB/Columnstore/mysql/db/relay-bin
relay-log-index = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.index
relay-log-info-file = /usr/local/MariaDB/Columnstore/mysql/db/relay-bin.info
# Point the following paths to different dedicated disks
#tmpdir = /tmp/
#log-update = /path-to-dedicated-directory/hostname
# Uncomment the following if you are using InnoDB tables
#innodb_data_home_dir = /usr/local/Calpont/mysql/lib/mysql/
#innodb_data_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
#innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
#innodb_log_group_home_dir = /usr/local/Calpont/mysql/lib/mysql/
#innodb_log_arch_dir = /usr/local/Calpont/mysql/lib/mysql/
#innodb_log_group_home_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
#innodb_log_arch_dir = /usr/local/MariaDB/Columnstore/mysql/lib/mysql/
# You can set .._buffer_pool_size up to 50 - 80 %
# of RAM but beware of setting memory usage too high
#innodb_buffer_pool_size = 384M

2
dbcon/mysql/mysql-Calpont
View File

@ -55,7 +55,7 @@ service_startup_timeout=30
# Lock directory for RedHat / SuSE.
lockdir='/var/lock/subsys'
lock_file_path="$lockdir/mysql-Calpont"
lock_file_path="$lockdir/mysql-Columnstore"
# The following variables are only set for letting mysql.server find things.

2
dbcon/mysql/schemaSync.pl
View File

@ -7,7 +7,7 @@ use DBD::mysql;
$| = 1;
$cfgfile='/usr/local/Calpont/mysql/my.cnf';
$cfgfile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
$username = 'root';
$auth = '';