delta/mariadb-git.git/scripts, branch 10.0-merge github.com: MariaDB/server.git WIP Merge 5.5 into bb-10.0-vicentiu 2018-01-23T18:49:31+00:00 Marko Mäkelä marko.makela@mariadb.com 2018-01-23T18:49:31+00:00 c93405b7153df01362f9869bac7c2e305dd06af9 Unresolved conflicts: both modified: sql/item_cmpfunc.cc both modified: sql/item_cmpfunc.h both modified: sql/sql_partition.cc both modified: storage/tokudb/CMakeLists.txt 
Unresolved conflicts:
	both modified:   sql/item_cmpfunc.cc
	both modified:   sql/item_cmpfunc.h
	both modified:   sql/sql_partition.cc
	both modified:   storage/tokudb/CMakeLists.txt
mysql_install_db: correct hosting/source/maillist information 2018-01-23T11:03:30+00:00 Daniel Black daniel@linux.vnet.ibm.com 2018-01-22T20:37:00+00:00 9ee372736faf999e9c6189019ac3faa5063e7777 






mysql_install_db: correct --skip-grant-tables help
2018-01-23T11:03:30+00:00

Daniel Black
daniel@linux.vnet.ibm.com

2018-01-22T20:35:38+00:00

c98906e4fe779430e1392d70ba71fb7ac41eb6ff












Merge branch '5.5' into 10.0
2018-01-22T21:35:50+00:00

Vicențiu Ciorbaru
vicentiu@mariadb.org

2018-01-22T21:35:50+00:00

6e449d1ef0c79864d150090505d5b4e555ae6ab6












Fixed mysql_install_db --no-defaults
2018-01-13T09:05:09+00:00

Sergey Vojtovich
svoj@mariadb.org

2018-01-13T09:04:44+00:00

b75d767689aff33f4d6963169bb7044165494885

Regression after 5ea2801.





Regression after 5ea2801.







mysql_install_db: Use --defaults-group-suffix if specified
2018-01-12T08:09:06+00:00

Daniel Black
daniel@linux.vnet.ibm.com

2017-12-12T04:22:22+00:00

5ea28015d5864bec1e44722bbc7a3d1f2371c85d

Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>





Signed-off-by: Daniel Black <daniel@linux.vnet.ibm.com>







Merge remote-tracking branch '5.5' into 10.0
2017-12-20T10:51:57+00:00

Vicențiu Ciorbaru
vicentiu@mariadb.org

2017-12-20T10:51:57+00:00

042f763268c0f209e7c12e0a6a72bb5d204dfe29












MDEV-14337 mysqld_safe may suppress error messages with --log-output=file
2017-11-10T11:48:52+00:00

Sergei Golubchik
serg@mariadb.org

2017-11-10T11:48:52+00:00

36f84744031430747d27bfb2087c7ae51019a70a

don't close stdout/stderr, redirect them to /dev/null instead.
otherwise redirections like >&2 fail with "invalid file descriptor"





don't close stdout/stderr, redirect them to /dev/null instead.
otherwise redirections like >&2 fail with "invalid file descriptor"







Merge branch '5.5' into 10.0
2017-10-18T13:14:39+00:00

Sergei Golubchik
serg@mariadb.org

2017-10-18T13:14:39+00:00

da4503e956ee067947e504c6e73052d9d906742c












MDEV-13440 mysql_install_db fails with hard-coded langdir
2017-10-17T05:37:39+00:00

Sergei Golubchik
serg@mariadb.org

2017-10-13T19:26:30+00:00

93144b9e92d3d4fee3247895c1e06e8e7cfedcaa

always search in compile-time specified paths
INSTALL_BINDIR, INSTALL_SBINDIR, INSTALL_MYSQLSHAREDIR. User
can set them to arbitrary values, it's not enough to search only
in their usual values of bin, sbin and libexec, share and share/mysql.





always search in compile-time specified paths
INSTALL_BINDIR, INSTALL_SBINDIR, INSTALL_MYSQLSHAREDIR. User
can set them to arbitrary values, it's not enough to search only
in their usual values of bin, sbin and libexec, share and share/mysql.