Update to latest from 5.5.50 to 5.5.52, maintenance updates.
includes CVE-2016-6662 affects < 5.5.51
Signed-off-by: Armin Kuster <akuster808@gmail.com>
mysqlbug.sh is a bug report script. It makes a report with the build information,
including gcc version. The CC is the local path of gcc, which is useless for bug
report, and the path may expose private information, so change it to CC_VERSION.
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Add libdbd-mysql-perl to RDEPENDS as mysql_setpermission
depends on DBD::mysql module
root@test:~# mysql_setpermission -h
Option h is ambiguous (help, host)
Password for user to connect to MySQL:
install_driver(mysql) failed: Can't locate DBD/mysql.pm
in @INC (you may need to install the DBD::mysql module)
(@INC contains: /etc/perl /usr/lib64/perl/site_perl/5.22.1/
/usr/lib64/perl/site_perl/5.22.1
/usr/lib64/perl/vendor_perl/5.22.1/
/usr/lib64/perl/vendor_perl/5.22.1
/usr/lib64/perl/5.22.1/ /usr/lib64/perl/5.22.1
/usr/local/lib/site_perl /usr/lib64/perl/5.22.1 .)
at (eval 11) line 3, <STDIN> line 1.
Perhaps the DBD::mysql perl module hasn't been fully installed,
or perhaps the capitalisation of 'mysql' isn't right.
Available drivers: DBM, ExampleP, File, Gofer, Proxy, Sponge.
at /usr/bin/mysql_setpermission line 90.
* Add libmysqlclient to Provides as libdbd-mysql-perl depend on it
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The commands(mysql_convert_table_format and mysql_setpermission) need
the supported API provided by the libdbi-perl package.
So add the libdbi-perl to the variable RDEPENDS of mariabdb-server.
Move libdbi-perl from meta-perl to meta-oe
Signed-off-by: Zhixiong Chi <Zhixiong.Chi@windriver.com>
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Upgrade mariadb from 5.5.46 to 5.5.50.
* update runtime dependency of mariadb-setupdb which requires command install
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
error: file /usr/share/doc/README from install of mariadb-leftovers-5.5.46-*
conflicts with file from package dmidecode-doc-2.12-*
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
While SYSTEMD_AUTO_ENABLE_mariadb-server = "enable", the mysqld service
hungs.
...
[ **] A start job is running for Run pending postinsts (25s / no limit)
[ OK ] Stopped MariaDB database server.
...
In mariadb-server's pkg_postinst, it install db at first runtime. And the
following 'systemctl mysqld restart' casued the hunging. So the fix idea
is to reomove pkg_postinst and still install db at first runtime.
Introduce mysql-systemd-start from ${S}/packaging/rpm-oel/. For review
convenience, we add them as file.
The mysql-systemd-start provides two functions: the install_db is to install
db at fist runtime (the first runtime means if a db existed, the install_db
will directly exit); the pinger is to wait for mysqld service startup
completed.
The mysqld.service add ExecStartPost than previous which invoke
'mysql-systemd-start post' to wait for mysqld service startup completed.
We add a package to provide install_db, so the user could choose it
to install database for mariadb at first boot before mysqld started.
It also fix another issue:
When you manually restart mysqld and do mysql test to connect the server,
the return of the restart could make sure mysqld is ready, and the following db
connect will not fail with:
...
Can't connect to local MySQL server through socket
...
Tweak my.cnf to remove obsolete/incorrect parameter.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The libmysqlclient_r library is now a symbolic link for the
libmysqlclient one, however some code still requires it for
linking.
To easy the transition, when installing the libmysqlclient-dev we
should include the libmysqlclient-r-dev as well.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This is the latest release in the 5.5.x stable series. The CVE patch has been applied upstream.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When 'valgrind' is not in PACKAGECONFIG, 'WITHOUT_VALGRIND' is passed to
cmake but it is not a valid cmake macro. Warning messages show in
log.do_configure:
CMake Warning:
Manually-specified variables were not used by the project:
WITHOUT_VALGRIND
Use -DWITH_VALGRIND=FALSE instead.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Mariadb depends on openssl, openssl conditionally depends on krb5 by
checking if OPENSSL_NO_KRB5 is defined, but cmake can not handle "ifndef"
and always ask krb5.h if krb5.h exist when cmake make_depend;
Faking a kssl.h if krb5 is not in PACKAGECONF, which does not include
krb5 related declaration, install the faked kssl.h into build dir to
be searched firstly
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Support i686 without needing to duplicate the i586 over-ride.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1. change the datadir from /var/mysql to /var/lib/mysql
2. after creating datedir, restorecon on it, make SELinux be able to
work
3. Add the PIDFile for systemd unit file, otherwise systemctl can not
stop mysqld
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
/etc/init.d/mysqld from mariadb-server uses mysqladmin, which is installed
into mariadb-client, so add the dependency to make this script be able
to run
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
mariadb failed to build:
| make[2]: *** No rule to make target
'/.../bitbake_build/tmp/sysroots/qemux86-64/usr/lib64/libevent.so',
needed by 'tests/async_queries'. Stop.
| make[2]: Leaving directory
'/.../bitbake_build/tmp/work/core2-64-wrs-linux/mariadb/5.5.40-r0/build'
CMakeFiles/Makefile2:6742: recipe for target 'tests/CMakeFiles/async_queries.dir/all' failed
| make[1]: *** [tests/CMakeFiles/async_queries.dir/all] Error 2
It is an rare case that when configure mariadb, libevent exists in
sysroot. But when do compile for mariadb, libevent is gone somehow. That
causes build fails. Run follow commands could reproduce this error:
$ bitbake libevent
$ bitbake mariadb -c cleansstate
$ bitbake mariadb -c configure
$ bitbake libevent -c clean
$ bitbake mariadb
Add if without libevent, test case tests/async_queries.c will not be built.
The case is helpful to do unit test. So add libevent as a dependency to fix the
error and make sure async_queries.c will be built.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
There are 3 configure files under /etc/my.cnf.d:
client.cnf: options for client library
mysql-clients.cnf: options for MariaDB tools such as mysqladmin, etc
server.cnf: options for server
They are packaged to mariadb-leftover at this moment. That is not correct.
Split them into sub-packages:
client.cnf --> libmysqlclient
mysql-clients.cnf --> mariadb-client
server.cnf --> mariadb-server
Make these files as configure file by CONFFILES and update global
configure file my.cnf to include /etc/my.cnf.d as well.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* rename mariadb_5.5.39.inc -> mariadb.inc
* add dependency bision-native for mariadb-native
* add revert-fix-for-MDEV-5120.patch to revert an commit for mariadb test suite
which causes packages mysql-python and modphp fail to build
* add PACKAGECONFIG 'libedit'
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Changes:
- Add patch to check valgrind headers only if WITH_VALGRIND is set
- Add PACKAGECONFIG for valgrind and disable it by default
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Use ${PN} instead of hardcoding 'mariadb' so that everything works
fine in case of multilib.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Change socket location to /var/lib/mysql/mysql.sock. Otherwise, we
could spot errors in systemd systems like below.
mysqladmin: connect to server at 'localhost' failed
error: 'Can't connect to local MySQL server through socket '/tmp/mysql.sock' (2)'
Check that mysqld is running and that the socket: '/tmp/mysql.sock' exists!
This is because mysqld.service is using PrivateTmp=true.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The anonymous function redefined bindir to bindir_noprefix (and
others), which broke the sstate between build dirs.
The redefined *_noprefix was to used to pass to the INSTALL_*
variables to change the layout as we want, but in fact we can
do this in other ways instead of the pain one:
1) Change the default layout and a little adjustment.
There are 4 install layout: STANDALONE(default), RPM, DEB and SVR4.
And RPM is the one close to what we are using.
2) Don't use prefix and pass full paths to INSTALL_*.
The mariadb's cmake define some of the INSTALL_* relative to
CMAKE_INSTALL_PREFIX, So we can use empty CMAKE_INSTALL_PREFIX,
then we can pass our full paths to INSTALL_* directly.
This patch set the default layout to RPM and pass paths only for:
- INSTALL_DOCDIR: no prefix prepending, so ${datadir} works.
- INSTALL_LIBDIR/INSTALL_PLUGINDIR: use ${baselib}.
The mysql-test is moved from /usr to /usr/share which is more
reasonable, fix the FILES inclusion accordingly.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Upgrade mariadb from 5.5.38 to 5.5.39. Previous upgrade made a lot of
work, so it is easy this time.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
The service file mainly comes from Fedora20.
This patch also adds a configuration file under /etc/tmpfiles.d so
that mysqld could start correctly.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
In ubuntu/redhat, we have:
...
ps -eo user,group,cmd | grep "mysql"
mysql mysql /usr/sbin/mysqld
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Upstream switched from autotools to cmake
* Separate build dir and parallel make now work
* Library versioning no longer used for plugins; other libtool cruft
gone
* Proper upstream initscript
* Plugins moved from client library package to mariadb-server package
(matches how Fedora packages these)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Perl and perl modules don't be installed in small image, but mariadb-server, mariadb-client
and mariadb-leftovers need them in runtime, so we add them to RDEPENDS.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Changes:
- rename SUMMARY with length > 80 to DESCRIPTION
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
When using a recent cross-binutils you need this fix as well, so move it from -native to the .inc.
Signed-off-by: Koen Kooi <koen.kooi@linaro.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Add patch to tell autoconf about with-plugin option.
In this way we avoid warnings like:
configure: WARNING: unrecognized options: --with-plugin-maria
Change-Id: Id64ac01d7f2072e1bca8979c5da3e8c6520105cb
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* unlike BBCLASSEXTENDed native support, dependencies in mariadb-native don't get
automatic -native suffix, so mariadb-native was depending on target ncurses and zlib.
* move the dependency from .inc and apply it with right suffix
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Below errors only occurs on Ubuntu 13.10:
$arch-linux-libtool: link: g++ ... -o .libs/mysqltest_embedded \
../../libmysqld/.libs/libmysqld.so -ldl
../../libmysqld/.libs/libmysqld.so: undefined reference to `dlopen'
../../libmysqld/.libs/libmysqld.so: undefined reference to `dlclose'
../../libmysqld/.libs/libmysqld.so: undefined reference to `dlerror'
../../libmysqld/.libs/libmysqld.so: undefined reference to `dlsym'
GCC/ld verion on the host:
gcc (Ubuntu/Linaro 4.8.1-10ubuntu8) 4.8.1
GNU ld (GNU Binutils for Ubuntu) 2.23.52.20130913
This is a strange behavior on Ub13.10, it fails even '-ldl' in the
link command line. This patch will append '-ldl' to dependency_libs
in libmysqld.la.
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
bitbake lib32-mariadb
...
WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_xtradb.so.0.0.0' has relocations in .text
WARNING: QA Issue: ELF binary 'bitbake_build/tmp/work/x86-wrsmllib32-linux/lib32-mariadb/5.1.67-r0/packages-split/lib32-libmysqlclient/usr/lib/plugin/ha_innodb_plugin.so.0.0.0' has relocations in .text
...
The mariadb used absolute addresses on IA-32, we should forbid this.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Remove all PR = "r0" from all .bb files in meta-oe repo. This was done
with the command sed -e '/^PR.*=.*r0\"/d' meta*/recipes*/*/*.bb -i
* We've switching to the PR server, PR bumps are no longer needed and
this saves people either accidentally bumping them or forgetting to
remove the lines (r0 is the default anyway).
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Mariadb will provide zlib.* if it can't find zlib binaries and headers
from sysroots path. We have set it to use external zlib.* firstly with
these definitions/configs in inc file:
+ DEPENDS = "ncurses zlib"
+ --with-zlib-dir=${STAGING_EXECPREFIXDIR}
But native bb file overrides the dependencies with:
+ DEPENDS = "ncurses-native"
If mariadb-naitve was built before zlib-native, its own zlib will be
built and provide zlib.la which will brake other packages link to real
zlib with errors like:
* .../usr/lib/libz.a(gzclose.o): relocation R_X86_64_32 against \
`a local symbol' can not be used when making a shared object; \
recompile with -fPIC
* .../usr/lib/libz.a: could not read symbols: Bad value
By removing the DEPENDS = "ncurses-native" from the native bb file,
mariadb-native will still have the DEPENDS (ncurses zlib) from the
inc file, and since the recipe is mariadb-native, this is equivalent
to DEPENDS = "ncurses-native zlib-native" due to the map_dependencies()
inner fuction for native_virtclass_handler() in "oe-core/meta/classes/
native.bbclass".
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Khem Raj
Peter Kjellerstedt
Tim Orling
Armin Kuster
Yue Tao
Mingli Yu
Zhixiong Chi
Martin Jansa
Kai Kang
Li xin
Koen Kooi
Hongxu Jia
Randy MacLeod
Otavio Salvador
Roy Li
Koen Kooi
Mario Domenech Goulart
Andre McCurdy
Paul Eggleton
Jackie Huang
Chen Qi
Chong Lu
Matthieu CRAPET
Andrei Gherzan
Wenzong Fan