You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-08-08 14:22:09 +03:00
merge
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
# Copyright (C) 2014 InfiniDB, Inc.
|
||||
# Copyright (C) 2016 MariaDB, Corporation
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
|
@@ -5,7 +5,7 @@
|
||||
use DBI;
|
||||
use DBD::mysql;
|
||||
|
||||
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/MariaDB/Columnstore/mysql/my.cnf';
|
||||
$data_source = 'DBI:mysql:database=calpontsys:mysql_read_default_file=/usr/local/mariadb/columnstore/mysql/my.cnf';
|
||||
$username = 'root';
|
||||
$auth = '';
|
||||
%attr = ();
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2014 InfiniDB, Inc.
|
||||
/* Copyright (C) 2016 MariaDB, Corporation
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License
|
||||
|
@@ -4,14 +4,14 @@
|
||||
#
|
||||
|
||||
prefix=/usr/local
|
||||
installdir=$prefix/MariaDB/Columnstore
|
||||
installdir=$prefix/mariadb/columnstore
|
||||
rpmmode=install
|
||||
pwprompt=" "
|
||||
|
||||
for arg in "$@"; do
|
||||
if [ `expr -- "$arg" : '--prefix='` -eq 9 ]; then
|
||||
prefix="`echo $arg | awk -F= '{print $2}'`"
|
||||
installdir=$prefix/MariaDB/Columnstore
|
||||
installdir=$prefix/mariadb/columnstore
|
||||
elif [ `expr -- "$arg" : '--rpmmode='` -eq 10 ]; then
|
||||
rpmmode="`echo $arg | awk -F= '{print $2}'`"
|
||||
elif [ `expr -- "$arg" : '--password='` -eq 11 ]; then
|
||||
|
@@ -20,15 +20,15 @@
|
||||
[client]
|
||||
#password = your_password
|
||||
port = 3306
|
||||
socket = /usr/local/MariaDB/Columnstore/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/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock
|
||||
datadir = /usr/local/MariaDB/Columnstore/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/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
|
||||
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/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
|
||||
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/MariaDB/Columnstore/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/MariaDB/Columnstore/mysql/lib/mysql/
|
||||
#innodb_log_arch_dir = /usr/local/MariaDB/Columnstore/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
|
||||
|
@@ -25,7 +25,7 @@
|
||||
# Description: MySQL is a very fast and reliable SQL database engine.
|
||||
### END INIT INFO
|
||||
|
||||
# If you install MySQL on some other places than /usr/local/MariaDB/Columnstore/mysql, then you
|
||||
# If you install MySQL on some other places than /usr/local/mariadb/columnstore/mysql, then you
|
||||
# have to do one of the following things for this script to work:
|
||||
#
|
||||
# - Run this script from within the MySQL installation directory
|
||||
@@ -43,8 +43,8 @@
|
||||
# If you change base dir, you must also change datadir. These may get
|
||||
# overwritten by settings in the MySQL configuration files.
|
||||
|
||||
basedir=/usr/local/MariaDB/Columnstore/mysql
|
||||
datadir=/usr/local/MariaDB/Columnstore/mysql/db
|
||||
basedir=/usr/local/mariadb/columnstore/mysql
|
||||
datadir=/usr/local/mariadb/columnstore/mysql/db
|
||||
|
||||
# Default value, in seconds, afterwhich the script should timeout waiting
|
||||
# for server start.
|
||||
@@ -63,7 +63,7 @@ lock_file_path="$lockdir/mysql-Columnstore"
|
||||
mysqld_pid_file_path=
|
||||
if test -z "$basedir"
|
||||
then
|
||||
basedir=/usr/local/MariaDB/Columnstore/mysql
|
||||
basedir=/usr/local/mariadb/columnstore/mysql
|
||||
bindir=/usr/local/bin
|
||||
if test -z "$datadir"
|
||||
then
|
||||
@@ -260,7 +260,7 @@ wait_for_ready () {
|
||||
i=0
|
||||
while test $i -ne $service_startup_timeout ; do
|
||||
|
||||
if $bindir/mysqladmin ping --socket=/usr/local/MariaDB/Columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
|
||||
if $bindir/mysqladmin ping --socket=/usr/local/mariadb/columnstore/mysql/lib/mysql/mysql.sock >/dev/null 2>&1; then
|
||||
log_success_msg
|
||||
return 0
|
||||
elif kill -0 $! 2>/dev/null ; then
|
||||
|
@@ -7,7 +7,7 @@ use DBD::mysql;
|
||||
|
||||
$| = 1;
|
||||
|
||||
$cfgfile='/usr/local/MariaDB/Columnstore/mysql/my.cnf';
|
||||
$cfgfile='/usr/local/mariadb/columnstore/mysql/my.cnf';
|
||||
|
||||
$username = 'root';
|
||||
$auth = '';
|
||||
|
Reference in New Issue
Block a user