Re: [PATCH] mysql: upgraded to MariaDB 10.1.12

["Daniel Weismüller" <daniel.weismueller@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 50759 bytes --]

Hi Marcel

My answer is a bit late because I was in easter-holidays. ;-)

Did you a fresh install or was it an upgrade?
In my opinion mysql was already installed and you use the install.sh 
instead of the update.sh

The logs Micheal means is of course the /var/log/mysqld.log

- Daniel

Am 23.03.2016 um 18:52 schrieb Marcel Lorenz:
> Hi Michael,
>
> sorry, what for logs you mean? This is the output from the command line
> after call ./install.sh in putty...
>
> I have test the installation of the MariaDB in a "next" test VM 
> manually..
>
> Marcel
>
> Am 2016-03-23 12:50, schrieb Michael Tremer:
>> Logs?
>>
>> On Wed, 2016-03-23 at 08:22 +0100, Marcel Lorenz wrote:
>>> Hi,
>>>
>>> have next effect at install.sh :
>>> ****
>>> /opt/pakfire/lib/functions.sh: line 93: /etc/init.d/: Is a directory
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL server is still not running. Waiting 5 seconds.
>>> MySQL still noch running... Exiting.
>>> mysqladmin: connect to server at 'localhost' failed
>>> error: 'Can't connect to local MySQL server through socket
>>> '/var/run/mysql/mysql.sock' (2 "No such file or directory")'
>>> Check that mysqld is running and that the socket:
>>> '/var/run/mysql/mysql.sock' exists!
>>> ****
>>> The daemon was not started automatically...
>>>
>>> A simple: "/etc/init.d/mysql start" is needed.
>>>
>>> Marcel
>>>
>>> Am 2016-03-22 22:55, schrieb Michael Tremer:
>>> >
>>> > Hi,
>>> >
>>> > On Tue, 2016-03-22 at 22:07 +0100, Marcel Lorenz wrote:
>>> > >
>>> > > Hi Michael,
>>> > >
>>> > > I have seen this mail too late...
>>> > >
>>> > > After adding the "\",  the build was ok without jemalloc and 
>>> libaio.
>>> > > You can ignore this two patches from me. :)
>>> > I will drop these for now then. We can always pull them in later and
>>> > ship a new
>>> > release of maria/mysql if we need them.
>>> >
>>> > >
>>> > > I have a question to Daniel. Why you create the main DB's with
>>> > > "mysql_install_db --user=mysql --force"
>>> > > in the LFS file. In my older MariaDB LFS, used for my dovecot based
>>> > > mail
>>> > > server, i do this in the install.sh at the target machine.
>>> > > The addon file is around 8MB if i make it so. With your LFS an
>>> > > rootfile
>>> > > around 14MB.
>>> > This is not compressed, yet. It will probably a bit less after the
>>> > package is
>>> > compressed and signed.
>>> >
>>> > >
>>> > >
>>> > > Marcel Lorenz
>>> > >
>>> > -Michael
>>> >
>>> > >
>>> > >
>>> > > Am 2016-03-21 17:59, schrieb Michael Tremer:
>>> > > >
>>> > > >
>>> > > > Hi,
>>> > > >
>>> > > > thanks for reviewing this.
>>> > > >
>>> > > > In the original patch there is a \ missing in the line that 
>>> defines the
>>> > > > path of
>>> > > > the PID file (Daniel pointed that out in a follow up email).
>>> > > >
>>> > > > Just add that slash and it should build.
>>> > > >
>>> > > > Please also send your feedback. I will wait with merging this 
>>> patch
>>> > > > until I have
>>> > > > heard back from you.
>>> > > >
>>> > > > Best,
>>> > > > -Michael
>>> > > >
>>> > > > On Sun, 2016-03-20 at 20:22 +0100, Marcel Lorenz wrote:
>>> > > > >
>>> > > > >
>>> > > > > Hi Daniel,
>>> > > > >
>>> > > > > i test the build of MariaDB with cmake 3.5. The build fails 
>>> with
>>> > > > > erros:
>>> > > > >
>>> > > > > -- Looking for include file libaio.h
>>> > > > > -- Looking for include file libaio.h - not found
>>> > > > >
>>> > > > > and:
>>> > > > > -- Looking for malloc_stats_print in jemalloc_pic
>>> > > > > -- Looking for malloc_stats_print in jemalloc_pic - not found
>>> > > > > CMake Error at cmake/jemalloc.cmake:38 (MESSAGE):
>>> > > > >    jemalloc is not found
>>> > > > > Call Stack (most recent call first):
>>> > > > >    CMakeLists.txt:337 (CHECK_JEMALLOC)
>>> > > > >
>>> > > > > The switches : -DIGNORE_AIO_CHECK=ON and -DWITH_JEMALLOC=OFF 
>>> have no
>>> > > > > effect.
>>> > > > > After integration of libaio and lemalloc 2.0.4 is the build
>>> > > > > successfully.
>>> > > > > Jemalloc 2.1.0 is to new and brings the same error.
>>> > > > >
>>> > > > > Marcel Lorenz
>>> > > > >
>>> > > > >
>>> > > > > Am 2016-03-15 11:09, schrieb Daniel Weismüller:
>>> > > > > >
>>> > > > > >
>>> > > > > >
>>> > > > > > It is required to manually run mysql_upgrade after the new
>>> > > > > > package has been installed.
>>> > > > > >
>>> > > > > > Signed-off-by: Daniel Weismüller 
>>> <daniel.weismueller(a)ipfire.org>
>>> > > > > > ---
>>> > > > > >  config/backup/includes/mysql       |   1 +
>>> > > > > >  config/mysql/my.cnf                |   1 -
>>> > > > > >  config/rootfiles/common/mysql-libs |  16 +-
>>> > > > > >  config/rootfiles/packages/mysql    | 525
>>> > > > > > +++++++++++++++++++++++++++++++++----
>>> > > > > >  lfs/mysql                          |  68 +++--
>>> > > > > >  make.sh                            |   6 +-
>>> > > > > >  src/initscripts/init.d/mysql       |   4 +-
>>> > > > > >  src/paks/mysql/update.sh           |   4 +
>>> > > > > >  8 files changed, 534 insertions(+), 91 deletions(-)
>>> > > > > >
>>> > > > > > diff --git a/config/backup/includes/mysql
>>> > > > > > b/config/backup/includes/mysql
>>> > > > > > index bcb837c..be6bc5c 100644
>>> > > > > > --- a/config/backup/includes/mysql
>>> > > > > > +++ b/config/backup/includes/mysql
>>> > > > > > @@ -1,2 +1,3 @@
>>> > > > > >  /etc/my.cnf
>>> > > > > > +/etc/my.cnf.d
>>> > > > > >  /srv/mysql
>>> > > > > > diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf
>>> > > > > > index d9b75e8..29a568a 100644
>>> > > > > > --- a/config/mysql/my.cnf
>>> > > > > > +++ b/config/mysql/my.cnf
>>> > > > > > @@ -11,7 +11,6 @@ bind-address=127.0.0.1
>>> > > > > >
>>> > > > > >  [mysql.server]
>>> > > > > >  user=mysql
>>> > > > > > -basedir=/var/lib
>>> > > > > >
>>> > > > > >  [mysqld_safe]
>>> > > > > >  log-error=/var/log/mysqld.log
>>> > > > > > diff --git a/config/rootfiles/common/mysql-libs
>>> > > > > > b/config/rootfiles/common/mysql-libs
>>> > > > > > index 6eb0384..e3e4bf3 100644
>>> > > > > > --- a/config/rootfiles/common/mysql-libs
>>> > > > > > +++ b/config/rootfiles/common/mysql-libs
>>> > > > > > @@ -1,10 +1,10 @@
>>> > > > > > -usr/lib/libmysqlclient.so.15
>>> > > > > > -usr/lib/libmysqlclient.so.15.0.0
>>> > > > > > -usr/lib/libmysqlclient_r.so.15
>>> > > > > > -usr/lib/libmysqlclient_r.so.15.0.0
>>> > > > > > +usr/lib/libmysqlclient.so.18
>>> > > > > > +usr/lib/libmysqlclient.so.18.0.0
>>> > > > > > +usr/lib/libmysqlclient_r.so.18
>>> > > > > > +usr/lib/libmysqlclient_r.so.18.0.0
>>> > > > > >  usr/lib/mysql/libmysqlclient.so
>>> > > > > > -usr/lib/mysql/libmysqlclient.so.15
>>> > > > > > -usr/lib/mysql/libmysqlclient.so.15.0.0
>>> > > > > > +usr/lib/mysql/libmysqlclient.so.18
>>> > > > > > +usr/lib/mysql/libmysqlclient.so.18.0.0
>>> > > > > >  usr/lib/mysql/libmysqlclient_r.so
>>> > > > > > -usr/lib/mysql/libmysqlclient_r.so.15
>>> > > > > > -usr/lib/mysql/libmysqlclient_r.so.15.0.0
>>> > > > > > +usr/lib/mysql/libmysqlclient_r.so.18
>>> > > > > > +usr/lib/mysql/libmysqlclient_r.so.18.0.0
>>> > > > > > diff --git a/config/rootfiles/packages/mysql
>>> > > > > > b/config/rootfiles/packages/mysql
>>> > > > > > index 8f1414a..cb54804 100644
>>> > > > > > --- a/config/rootfiles/packages/mysql
>>> > > > > > +++ b/config/rootfiles/packages/mysql
>>> > > > > > @@ -1,16 +1,39 @@
>>> > > > > > -etc/my.cnf
>>> > > > > >  etc/rc.d/init.d/mysql
>>> > > > > > +#etc/logrotate.d
>>> > > > > > +etc/logrotate.d/mysql
>>> > > > > > +etc/my.cnf
>>> > > > > > +etc/my.cnf.d
>>> > > > > > +etc/my.cnf.d/client.cnf
>>> > > > > > +etc/my.cnf.d/enable_encryption.preset
>>> > > > > > +etc/my.cnf.d/mysql-clients.cnf
>>> > > > > > +etc/my.cnf.d/server.cnf
>>> > > > > >  srv/mysql
>>> > > > > > +#srv/mysql/aria_log.00000001
>>> > > > > > +#srv/mysql/aria_log_control
>>> > > > > > +#srv/mysql/ib_logfile0
>>> > > > > > +#srv/mysql/ib_logfile1
>>> > > > > > +#srv/mysql/ibdata1
>>> > > > > >  #srv/mysql/mysql
>>> > > > > > +#srv/mysql/mysql/column_stats.MYD
>>> > > > > > +#srv/mysql/mysql/column_stats.MYI
>>> > > > > > +#srv/mysql/mysql/column_stats.frm
>>> > > > > >  #srv/mysql/mysql/columns_priv.MYD
>>> > > > > >  #srv/mysql/mysql/columns_priv.MYI
>>> > > > > >  #srv/mysql/mysql/columns_priv.frm
>>> > > > > >  #srv/mysql/mysql/db.MYD
>>> > > > > >  #srv/mysql/mysql/db.MYI
>>> > > > > >  #srv/mysql/mysql/db.frm
>>> > > > > > +#srv/mysql/mysql/event.MYD
>>> > > > > > +#srv/mysql/mysql/event.MYI
>>> > > > > > +#srv/mysql/mysql/event.frm
>>> > > > > >  #srv/mysql/mysql/func.MYD
>>> > > > > >  #srv/mysql/mysql/func.MYI
>>> > > > > >  #srv/mysql/mysql/func.frm
>>> > > > > > +#srv/mysql/mysql/general_log.CSM
>>> > > > > > +#srv/mysql/mysql/general_log.CSV
>>> > > > > > +#srv/mysql/mysql/general_log.frm
>>> > > > > > +#srv/mysql/mysql/gtid_slave_pos.frm
>>> > > > > > +#srv/mysql/mysql/gtid_slave_pos.ibd
>>> > > > > >  #srv/mysql/mysql/help_category.MYD
>>> > > > > >  #srv/mysql/mysql/help_category.MYI
>>> > > > > >  #srv/mysql/mysql/help_category.frm
>>> > > > > > @@ -26,12 +49,37 @@ srv/mysql
>>> > > > > >  #srv/mysql/mysql/host.MYD
>>> > > > > >  #srv/mysql/mysql/host.MYI
>>> > > > > >  #srv/mysql/mysql/host.frm
>>> > > > > > +#srv/mysql/mysql/index_stats.MYD
>>> > > > > > +#srv/mysql/mysql/index_stats.MYI
>>> > > > > > +#srv/mysql/mysql/index_stats.frm
>>> > > > > > +#srv/mysql/mysql/innodb_index_stats.frm
>>> > > > > > +#srv/mysql/mysql/innodb_index_stats.ibd
>>> > > > > > +#srv/mysql/mysql/innodb_table_stats.frm
>>> > > > > > +#srv/mysql/mysql/innodb_table_stats.ibd
>>> > > > > > +#srv/mysql/mysql/plugin.MYD
>>> > > > > > +#srv/mysql/mysql/plugin.MYI
>>> > > > > > +#srv/mysql/mysql/plugin.frm
>>> > > > > >  #srv/mysql/mysql/proc.MYD
>>> > > > > >  #srv/mysql/mysql/proc.MYI
>>> > > > > >  #srv/mysql/mysql/proc.frm
>>> > > > > >  #srv/mysql/mysql/procs_priv.MYD
>>> > > > > >  #srv/mysql/mysql/procs_priv.MYI
>>> > > > > >  #srv/mysql/mysql/procs_priv.frm
>>> > > > > > +#srv/mysql/mysql/proxies_priv.MYD
>>> > > > > > +#srv/mysql/mysql/proxies_priv.MYI
>>> > > > > > +#srv/mysql/mysql/proxies_priv.frm
>>> > > > > > +#srv/mysql/mysql/roles_mapping.MYD
>>> > > > > > +#srv/mysql/mysql/roles_mapping.MYI
>>> > > > > > +#srv/mysql/mysql/roles_mapping.frm
>>> > > > > > +#srv/mysql/mysql/servers.MYD
>>> > > > > > +#srv/mysql/mysql/servers.MYI
>>> > > > > > +#srv/mysql/mysql/servers.frm
>>> > > > > > +#srv/mysql/mysql/slow_log.CSM
>>> > > > > > +#srv/mysql/mysql/slow_log.CSV
>>> > > > > > +#srv/mysql/mysql/slow_log.frm
>>> > > > > > +#srv/mysql/mysql/table_stats.MYD
>>> > > > > > +#srv/mysql/mysql/table_stats.MYI
>>> > > > > > +#srv/mysql/mysql/table_stats.frm
>>> > > > > >  #srv/mysql/mysql/tables_priv.MYD
>>> > > > > >  #srv/mysql/mysql/tables_priv.MYI
>>> > > > > >  #srv/mysql/mysql/tables_priv.frm
>>> > > > > > @@ -53,8 +101,14 @@ srv/mysql
>>> > > > > >  #srv/mysql/mysql/user.MYD
>>> > > > > >  #srv/mysql/mysql/user.MYI
>>> > > > > >  #srv/mysql/mysql/user.frm
>>> > > > > > -srv/mysql/test
>>> > > > > > -usr/bin/comp_err
>>> > > > > > +#srv/mysql/performance_schema
>>> > > > > > +#srv/mysql/performance_schema/db.opt
>>> > > > > > +#srv/mysql/test
>>> > > > > > +usr/bin/aria_chk
>>> > > > > > +usr/bin/aria_dump_log
>>> > > > > > +usr/bin/aria_ftdump
>>> > > > > > +usr/bin/aria_pack
>>> > > > > > +usr/bin/aria_read_log
>>> > > > > >  usr/bin/innochecksum
>>> > > > > >  usr/bin/msql2mysql
>>> > > > > >  usr/bin/my_print_defaults
>>> > > > > > @@ -63,20 +117,16 @@ usr/bin/myisamchk
>>> > > > > >  usr/bin/myisamlog
>>> > > > > >  usr/bin/myisampack
>>> > > > > >  usr/bin/mysql
>>> > > > > > -usr/bin/mysql_client_test
>>> > > > > >  usr/bin/mysql_config
>>> > > > > >  usr/bin/mysql_convert_table_format
>>> > > > > > -usr/bin/mysql_explain_log
>>> > > > > >  usr/bin/mysql_find_rows
>>> > > > > >  usr/bin/mysql_fix_extensions
>>> > > > > > -usr/bin/mysql_fix_privilege_tables
>>> > > > > >  usr/bin/mysql_install_db
>>> > > > > > +usr/bin/mysql_plugin
>>> > > > > >  usr/bin/mysql_secure_installation
>>> > > > > >  usr/bin/mysql_setpermission
>>> > > > > > -usr/bin/mysql_tableinfo
>>> > > > > >  usr/bin/mysql_tzinfo_to_sql
>>> > > > > >  usr/bin/mysql_upgrade
>>> > > > > > -usr/bin/mysql_upgrade_shell
>>> > > > > >  usr/bin/mysql_waitpid
>>> > > > > >  usr/bin/mysql_zap
>>> > > > > >  usr/bin/mysqlaccess
>>> > > > > > @@ -91,41 +141,347 @@ usr/bin/mysqldumpslow
>>> > > > > >  usr/bin/mysqlhotcopy
>>> > > > > >  usr/bin/mysqlimport
>>> > > > > >  usr/bin/mysqlshow
>>> > > > > > +usr/bin/mysqlslap
>>> > > > > >  usr/bin/mysqltest
>>> > > > > > -usr/bin/mysqltestmanager
>>> > > > > > -usr/bin/mysqltestmanager-pwgen
>>> > > > > > -usr/bin/mysqltestmanagerc
>>> > > > > > +#usr/bin/mytop
>>> > > > > >  usr/bin/perror
>>> > > > > >  usr/bin/replace
>>> > > > > >  usr/bin/resolve_stack_dump
>>> > > > > >  usr/bin/resolveip
>>> > > > > > +usr/bin/wsrep_sst_common
>>> > > > > > +usr/bin/wsrep_sst_mysqldump
>>> > > > > > +usr/bin/wsrep_sst_rsync
>>> > > > > > +usr/bin/wsrep_sst_xtrabackup
>>> > > > > > +usr/bin/wsrep_sst_xtrabackup-v2
>>> > > > > > +#usr/data
>>> > > > > > +#usr/data/test
>>> > > > > > +#usr/data/test/db.opt
>>> > > > > >  #usr/include/mysql
>>> > > > > > +#usr/include/mysql/auth_dialog_client.h
>>> > > > > > +#usr/include/mysql/big_endian.h
>>> > > > > > +#usr/include/mysql/byte_order_generic.h
>>> > > > > > +#usr/include/mysql/byte_order_generic_x86.h
>>> > > > > > +#usr/include/mysql/byte_order_generic_x86_64.h
>>> > > > > > +#usr/include/mysql/client_plugin.h
>>> > > > > >  #usr/include/mysql/decimal.h
>>> > > > > >  #usr/include/mysql/errmsg.h
>>> > > > > > +#usr/include/mysql/handler_ername.h
>>> > > > > > +#usr/include/mysql/handler_state.h
>>> > > > > >  #usr/include/mysql/keycache.h
>>> > > > > > +#usr/include/mysql/little_endian.h
>>> > > > > >  #usr/include/mysql/m_ctype.h
>>> > > > > >  #usr/include/mysql/m_string.h
>>> > > > > > +#usr/include/mysql/ma_dyncol.h
>>> > > > > >  #usr/include/mysql/my_alloc.h
>>> > > > > >  #usr/include/mysql/my_attribute.h
>>> > > > > > +#usr/include/mysql/my_byteorder.h
>>> > > > > > +#usr/include/mysql/my_compiler.h
>>> > > > > >  #usr/include/mysql/my_config.h
>>> > > > > >  #usr/include/mysql/my_dbug.h
>>> > > > > > +#usr/include/mysql/my_decimal_limits.h
>>> > > > > >  #usr/include/mysql/my_dir.h
>>> > > > > >  #usr/include/mysql/my_getopt.h
>>> > > > > >  #usr/include/mysql/my_global.h
>>> > > > > >  #usr/include/mysql/my_list.h
>>> > > > > >  #usr/include/mysql/my_net.h
>>> > > > > > -#usr/include/mysql/my_no_pthread.h
>>> > > > > >  #usr/include/mysql/my_pthread.h
>>> > > > > >  #usr/include/mysql/my_sys.h
>>> > > > > > +#usr/include/mysql/my_valgrind.h
>>> > > > > >  #usr/include/mysql/my_xml.h
>>> > > > > >  #usr/include/mysql/mysql.h
>>> > > > > >  #usr/include/mysql/mysql_com.h
>>> > > > > > +#usr/include/mysql/mysql_com_server.h
>>> > > > > >  #usr/include/mysql/mysql_embed.h
>>> > > > > >  #usr/include/mysql/mysql_time.h
>>> > > > > >  #usr/include/mysql/mysql_version.h
>>> > > > > >  #usr/include/mysql/mysqld_ername.h
>>> > > > > >  #usr/include/mysql/mysqld_error.h
>>> > > > > > -#usr/include/mysql/raid.h
>>> > > > > > +#usr/include/mysql/plugin.h
>>> > > > > > +#usr/include/mysql/plugin_audit.h
>>> > > > > > +#usr/include/mysql/plugin_auth.h
>>> > > > > > +#usr/include/mysql/plugin_auth_common.h
>>> > > > > > +#usr/include/mysql/plugin_encryption.h
>>> > > > > > +#usr/include/mysql/plugin_ftparser.h
>>> > > > > > +#usr/include/mysql/plugin_password_validation.h
>>> > > > > > +#usr/include/mysql/private
>>> > > > > > +#usr/include/mysql/private/atomic
>>> > > > > > +#usr/include/mysql/private/atomic/gcc_builtins.h
>>> > > > > > +#usr/include/mysql/private/atomic/generic-msvc.h
>>> > > > > > +#usr/include/mysql/private/atomic/nolock.h
>>> > > > > > +#usr/include/mysql/private/atomic/solaris.h
>>> > > > > > +#usr/include/mysql/private/atomic/x86-gcc.h
>>> > > > > > +#usr/include/mysql/private/authors.h
>>> > > > > > +#usr/include/mysql/private/base64.h
>>> > > > > > +#usr/include/mysql/private/bounded_queue.h
>>> > > > > > +#usr/include/mysql/private/client_settings.h
>>> > > > > > +#usr/include/mysql/private/compat56.h
>>> > > > > > +#usr/include/mysql/private/config.h
>>> > > > > > +#usr/include/mysql/private/contributors.h
>>> > > > > > +#usr/include/mysql/private/create_options.h
>>> > > > > > +#usr/include/mysql/private/custom_conf.h
>>> > > > > > +#usr/include/mysql/private/datadict.h
>>> > > > > > +#usr/include/mysql/private/debug_sync.h
>>> > > > > > +#usr/include/mysql/private/derror.h
>>> > > > > > +#usr/include/mysql/private/des_key_file.h
>>> > > > > > +#usr/include/mysql/private/discover.h
>>> > > > > > +#usr/include/mysql/private/event_data_objects.h
>>> > > > > > +#usr/include/mysql/private/event_db_repository.h
>>> > > > > > +#usr/include/mysql/private/event_parse_data.h
>>> > > > > > +#usr/include/mysql/private/event_queue.h
>>> > > > > > +#usr/include/mysql/private/event_scheduler.h
>>> > > > > > +#usr/include/mysql/private/events.h
>>> > > > > > +#usr/include/mysql/private/field.h
>>> > > > > > +#usr/include/mysql/private/filesort.h
>>> > > > > > +#usr/include/mysql/private/filesort_utils.h
>>> > > > > > +#usr/include/mysql/private/ft_global.h
>>> > > > > > +#usr/include/mysql/private/gcalc_slicescan.h
>>> > > > > > +#usr/include/mysql/private/gcalc_tools.h
>>> > > > > > +#usr/include/mysql/private/group_by_handler.h
>>> > > > > > +#usr/include/mysql/private/gstream.h
>>> > > > > > +#usr/include/mysql/private/ha_partition.h
>>> > > > > > +#usr/include/mysql/private/handler.h
>>> > > > > > +#usr/include/mysql/private/hash.h
>>> > > > > > +#usr/include/mysql/private/hash_filo.h
>>> > > > > > +#usr/include/mysql/private/heap.h
>>> > > > > > +#usr/include/mysql/private/hostname.h
>>> > > > > > +#usr/include/mysql/private/init.h
>>> > > > > > +#usr/include/mysql/private/innodb_priv.h
>>> > > > > > +#usr/include/mysql/private/item.h
>>> > > > > > +#usr/include/mysql/private/item_cmpfunc.h
>>> > > > > > +#usr/include/mysql/private/item_create.h
>>> > > > > > +#usr/include/mysql/private/item_func.h
>>> > > > > > +#usr/include/mysql/private/item_geofunc.h
>>> > > > > > +#usr/include/mysql/private/item_inetfunc.h
>>> > > > > > +#usr/include/mysql/private/item_row.h
>>> > > > > > +#usr/include/mysql/private/item_strfunc.h
>>> > > > > > +#usr/include/mysql/private/item_subselect.h
>>> > > > > > +#usr/include/mysql/private/item_sum.h
>>> > > > > > +#usr/include/mysql/private/item_timefunc.h
>>> > > > > > +#usr/include/mysql/private/item_xmlfunc.h
>>> > > > > > +#usr/include/mysql/private/key.h
>>> > > > > > +#usr/include/mysql/private/keycaches.h
>>> > > > > > +#usr/include/mysql/private/lex.h
>>> > > > > > +#usr/include/mysql/private/lex_hash.h
>>> > > > > > +#usr/include/mysql/private/lex_symbol.h
>>> > > > > > +#usr/include/mysql/private/lex_token.h
>>> > > > > > +#usr/include/mysql/private/lf.h
>>> > > > > > +#usr/include/mysql/private/lock.h
>>> > > > > > +#usr/include/mysql/private/log.h
>>> > > > > > +#usr/include/mysql/private/log_event.h
>>> > > > > > +#usr/include/mysql/private/log_event_old.h
>>> > > > > > +#usr/include/mysql/private/log_slow.h
>>> > > > > > +#usr/include/mysql/private/maria.h
>>> > > > > > +#usr/include/mysql/private/mdl.h
>>> > > > > > +#usr/include/mysql/private/mem_root_array.h
>>> > > > > > +#usr/include/mysql/private/message.h
>>> > > > > > +#usr/include/mysql/private/multi_range_read.h
>>> > > > > > +#usr/include/mysql/private/my_alarm.h
>>> > > > > > +#usr/include/mysql/private/my_apc.h
>>> > > > > > +#usr/include/mysql/private/my_atomic.h
>>> > > > > > +#usr/include/mysql/private/my_base.h
>>> > > > > > +#usr/include/mysql/private/my_bit.h
>>> > > > > > +#usr/include/mysql/private/my_bitmap.h
>>> > > > > > +#usr/include/mysql/private/my_check_opt.h
>>> > > > > > +#usr/include/mysql/private/my_compare.h
>>> > > > > > +#usr/include/mysql/private/my_context.h
>>> > > > > > +#usr/include/mysql/private/my_cpu.h
>>> > > > > > +#usr/include/mysql/private/my_crypt.h
>>> > > > > > +#usr/include/mysql/private/my_decimal.h
>>> > > > > > +#usr/include/mysql/private/my_default.h
>>> > > > > > +#usr/include/mysql/private/my_handler_errors.h
>>> > > > > > +#usr/include/mysql/private/my_json_writer.h
>>> > > > > > +#usr/include/mysql/private/my_libwrap.h
>>> > > > > > +#usr/include/mysql/private/my_md5.h
>>> > > > > > +#usr/include/mysql/private/my_nosys.h
>>> > > > > > +#usr/include/mysql/private/my_rdtsc.h
>>> > > > > > +#usr/include/mysql/private/my_rnd.h
>>> > > > > > +#usr/include/mysql/private/my_stacktrace.h
>>> > > > > > +#usr/include/mysql/private/my_systemd.h
>>> > > > > > +#usr/include/mysql/private/my_time.h
>>> > > > > > +#usr/include/mysql/private/my_tree.h
>>> > > > > > +#usr/include/mysql/private/my_uctype.h
>>> > > > > > +#usr/include/mysql/private/my_user.h
>>> > > > > > +#usr/include/mysql/private/myisam.h
>>> > > > > > +#usr/include/mysql/private/myisamchk.h
>>> > > > > > +#usr/include/mysql/private/myisammrg.h
>>> > > > > > +#usr/include/mysql/private/myisampack.h
>>> > > > > > +#usr/include/mysql/private/mysql_async.h
>>> > > > > > +#usr/include/mysql/private/mysqld.h
>>> > > > > > +#usr/include/mysql/private/mysqld_default_groups.h
>>> > > > > > +#usr/include/mysql/private/mysqld_suffix.h
>>> > > > > > +#usr/include/mysql/private/mysys_err.h
>>> > > > > > +#usr/include/mysql/private/nt_servc.h
>>> > > > > > +#usr/include/mysql/private/opt_range.h
>>> > > > > > +#usr/include/mysql/private/opt_subselect.h
>>> > > > > > +#usr/include/mysql/private/parse_file.h
>>> > > > > > +#usr/include/mysql/private/partition_element.h
>>> > > > > > +#usr/include/mysql/private/partition_info.h
>>> > > > > > +#usr/include/mysql/private/password.h
>>> > > > > > +#usr/include/mysql/private/probes_mysql.h
>>> > > > > > +#usr/include/mysql/private/probes_mysql_nodtrace.h
>>> > > > > > +#usr/include/mysql/private/procedure.h
>>> > > > > > +#usr/include/mysql/private/protocol.h
>>> > > > > > +#usr/include/mysql/private/queues.h
>>> > > > > > +#usr/include/mysql/private/records.h
>>> > > > > > +#usr/include/mysql/private/repl_failsafe.h
>>> > > > > > +#usr/include/mysql/private/replication.h
>>> > > > > > +#usr/include/mysql/private/rijndael.h
>>> > > > > > +#usr/include/mysql/private/rpl_constants.h
>>> > > > > > +#usr/include/mysql/private/rpl_filter.h
>>> > > > > > +#usr/include/mysql/private/rpl_gtid.h
>>> > > > > > +#usr/include/mysql/private/rpl_handler.h
>>> > > > > > +#usr/include/mysql/private/rpl_injector.h
>>> > > > > > +#usr/include/mysql/private/rpl_mi.h
>>> > > > > > +#usr/include/mysql/private/rpl_parallel.h
>>> > > > > > +#usr/include/mysql/private/rpl_record.h
>>> > > > > > +#usr/include/mysql/private/rpl_record_old.h
>>> > > > > > +#usr/include/mysql/private/rpl_reporting.h
>>> > > > > > +#usr/include/mysql/private/rpl_rli.h
>>> > > > > > +#usr/include/mysql/private/rpl_tblmap.h
>>> > > > > > +#usr/include/mysql/private/rpl_utility.h
>>> > > > > > +#usr/include/mysql/private/scheduler.h
>>> > > > > > +#usr/include/mysql/private/service_versions.h
>>> > > > > > +#usr/include/mysql/private/set_var.h
>>> > > > > > +#usr/include/mysql/private/sha1.h
>>> > > > > > +#usr/include/mysql/private/sha2.h
>>> > > > > > +#usr/include/mysql/private/slave.h
>>> > > > > > +#usr/include/mysql/private/sp.h
>>> > > > > > +#usr/include/mysql/private/sp_cache.h
>>> > > > > > +#usr/include/mysql/private/sp_head.h
>>> > > > > > +#usr/include/mysql/private/sp_pcontext.h
>>> > > > > > +#usr/include/mysql/private/sp_rcontext.h
>>> > > > > > +#usr/include/mysql/private/spatial.h
>>> > > > > > +#usr/include/mysql/private/sql_acl.h
>>> > > > > > +#usr/include/mysql/private/sql_admin.h
>>> > > > > > +#usr/include/mysql/private/sql_alter.h
>>> > > > > > +#usr/include/mysql/private/sql_analyse.h
>>> > > > > > +#usr/include/mysql/private/sql_analyze_stmt.h
>>> > > > > > +#usr/include/mysql/private/sql_array.h
>>> > > > > > +#usr/include/mysql/private/sql_audit.h
>>> > > > > > +#usr/include/mysql/private/sql_base.h
>>> > > > > > +#usr/include/mysql/private/sql_binlog.h
>>> > > > > > +#usr/include/mysql/private/sql_bitmap.h
>>> > > > > > +#usr/include/mysql/private/sql_bootstrap.h
>>> > > > > > +#usr/include/mysql/private/sql_cache.h
>>> > > > > > +#usr/include/mysql/private/sql_callback.h
>>> > > > > > +#usr/include/mysql/private/sql_class.h
>>> > > > > > +#usr/include/mysql/private/sql_cmd.h
>>> > > > > > +#usr/include/mysql/private/sql_connect.h
>>> > > > > > +#usr/include/mysql/private/sql_const.h
>>> > > > > > +#usr/include/mysql/private/sql_crypt.h
>>> > > > > > +#usr/include/mysql/private/sql_cursor.h
>>> > > > > > +#usr/include/mysql/private/sql_db.h
>>> > > > > > +#usr/include/mysql/private/sql_delete.h
>>> > > > > > +#usr/include/mysql/private/sql_derived.h
>>> > > > > > +#usr/include/mysql/private/sql_digest.h
>>> > > > > > +#usr/include/mysql/private/sql_digest_stream.h
>>> > > > > > +#usr/include/mysql/private/sql_do.h
>>> > > > > > +#usr/include/mysql/private/sql_error.h
>>> > > > > > +#usr/include/mysql/private/sql_explain.h
>>> > > > > > +#usr/include/mysql/private/sql_expression_cache.h
>>> > > > > > +#usr/include/mysql/private/sql_get_diagnostics.h
>>> > > > > > +#usr/include/mysql/private/sql_handler.h
>>> > > > > > +#usr/include/mysql/private/sql_help.h
>>> > > > > > +#usr/include/mysql/private/sql_hset.h
>>> > > > > > +#usr/include/mysql/private/sql_insert.h
>>> > > > > > +#usr/include/mysql/private/sql_join_cache.h
>>> > > > > > +#usr/include/mysql/private/sql_lex.h
>>> > > > > > +#usr/include/mysql/private/sql_lifo_buffer.h
>>> > > > > > +#usr/include/mysql/private/sql_list.h
>>> > > > > > +#usr/include/mysql/private/sql_load.h
>>> > > > > > +#usr/include/mysql/private/sql_locale.h
>>> > > > > > +#usr/include/mysql/private/sql_manager.h
>>> > > > > > +#usr/include/mysql/private/sql_parse.h
>>> > > > > > +#usr/include/mysql/private/sql_partition.h
>>> > > > > > +#usr/include/mysql/private/sql_partition_admin.h
>>> > > > > > +#usr/include/mysql/private/sql_plist.h
>>> > > > > > +#usr/include/mysql/private/sql_plugin.h
>>> > > > > > +#usr/include/mysql/private/sql_plugin_compat.h
>>> > > > > > +#usr/include/mysql/private/sql_prepare.h
>>> > > > > > +#usr/include/mysql/private/sql_priv.h
>>> > > > > > +#usr/include/mysql/private/sql_profile.h
>>> > > > > > +#usr/include/mysql/private/sql_reload.h
>>> > > > > > +#usr/include/mysql/private/sql_rename.h
>>> > > > > > +#usr/include/mysql/private/sql_repl.h
>>> > > > > > +#usr/include/mysql/private/sql_select.h
>>> > > > > > +#usr/include/mysql/private/sql_servers.h
>>> > > > > > +#usr/include/mysql/private/sql_show.h
>>> > > > > > +#usr/include/mysql/private/sql_signal.h
>>> > > > > > +#usr/include/mysql/private/sql_sort.h
>>> > > > > > +#usr/include/mysql/private/sql_statistics.h
>>> > > > > > +#usr/include/mysql/private/sql_string.h
>>> > > > > > +#usr/include/mysql/private/sql_table.h
>>> > > > > > +#usr/include/mysql/private/sql_tablespace.h
>>> > > > > > +#usr/include/mysql/private/sql_test.h
>>> > > > > > +#usr/include/mysql/private/sql_time.h
>>> > > > > > +#usr/include/mysql/private/sql_trigger.h
>>> > > > > > +#usr/include/mysql/private/sql_truncate.h
>>> > > > > > +#usr/include/mysql/private/sql_type.h
>>> > > > > > +#usr/include/mysql/private/sql_udf.h
>>> > > > > > +#usr/include/mysql/private/sql_union.h
>>> > > > > > +#usr/include/mysql/private/sql_update.h
>>> > > > > > +#usr/include/mysql/private/sql_view.h
>>> > > > > > +#usr/include/mysql/private/sql_yacc.h
>>> > > > > > +#usr/include/mysql/private/strfunc.h
>>> > > > > > +#usr/include/mysql/private/structs.h
>>> > > > > > +#usr/include/mysql/private/sys_vars_shared.h
>>> > > > > > +#usr/include/mysql/private/t_ctype.h
>>> > > > > > +#usr/include/mysql/private/table.h
>>> > > > > > +#usr/include/mysql/private/table_cache.h
>>> > > > > > +#usr/include/mysql/private/thr_alarm.h
>>> > > > > > +#usr/include/mysql/private/thr_lock.h
>>> > > > > > +#usr/include/mysql/private/thr_malloc.h
>>> > > > > > +#usr/include/mysql/private/thr_timer.h
>>> > > > > > +#usr/include/mysql/private/thread_pool_priv.h
>>> > > > > > +#usr/include/mysql/private/threadpool.h
>>> > > > > > +#usr/include/mysql/private/transaction.h
>>> > > > > > +#usr/include/mysql/private/tzfile.h
>>> > > > > > +#usr/include/mysql/private/tztime.h
>>> > > > > > +#usr/include/mysql/private/unireg.h
>>> > > > > > +#usr/include/mysql/private/violite.h
>>> > > > > > +#usr/include/mysql/private/waiting_threads.h
>>> > > > > > +#usr/include/mysql/private/welcome_copyright_notice.h
>>> > > > > > +#usr/include/mysql/private/winservice.h
>>> > > > > > +#usr/include/mysql/private/wqueue.h
>>> > > > > > +#usr/include/mysql/private/wsrep.h
>>> > > > > > +#usr/include/mysql/private/wsrep_applier.h
>>> > > > > > +#usr/include/mysql/private/wsrep_binlog.h
>>> > > > > > +#usr/include/mysql/private/wsrep_mysqld.h
>>> > > > > > +#usr/include/mysql/private/wsrep_priv.h
>>> > > > > > +#usr/include/mysql/private/wsrep_sst.h
>>> > > > > > +#usr/include/mysql/private/wsrep_thd.h
>>> > > > > > +#usr/include/mysql/private/wsrep_utils.h
>>> > > > > > +#usr/include/mysql/private/wsrep_var.h
>>> > > > > > +#usr/include/mysql/private/wsrep_xid.h
>>> > > > > > +#usr/include/mysql/psi
>>> > > > > > +#usr/include/mysql/psi/mysql_file.h
>>> > > > > > +#usr/include/mysql/psi/mysql_idle.h
>>> > > > > > +#usr/include/mysql/psi/mysql_socket.h
>>> > > > > > +#usr/include/mysql/psi/mysql_stage.h
>>> > > > > > +#usr/include/mysql/psi/mysql_statement.h
>>> > > > > > +#usr/include/mysql/psi/mysql_table.h
>>> > > > > > +#usr/include/mysql/psi/mysql_thread.h
>>> > > > > > +#usr/include/mysql/psi/psi.h
>>> > > > > > +#usr/include/mysql/psi/psi_abi_v0.h
>>> > > > > > +#usr/include/mysql/psi/psi_abi_v1.h
>>> > > > > > +#usr/include/mysql/psi/psi_abi_v2.h
>>> > > > > > +#usr/include/mysql/service_debug_sync.h
>>> > > > > > +#usr/include/mysql/service_encryption.h
>>> > > > > > +#usr/include/mysql/service_encryption_scheme.h
>>> > > > > > +#usr/include/mysql/service_kill_statement.h
>>> > > > > > +#usr/include/mysql/service_logger.h
>>> > > > > > +#usr/include/mysql/service_md5.h
>>> > > > > > +#usr/include/mysql/service_my_snprintf.h
>>> > > > > > +#usr/include/mysql/service_progress_report.h
>>> > > > > > +#usr/include/mysql/service_sha1.h
>>> > > > > > +#usr/include/mysql/service_thd_alloc.h
>>> > > > > > +#usr/include/mysql/service_thd_autoinc.h
>>> > > > > > +#usr/include/mysql/service_thd_error_context.h
>>> > > > > > +#usr/include/mysql/service_thd_specifics.h
>>> > > > > > +#usr/include/mysql/service_thd_timezone.h
>>> > > > > > +#usr/include/mysql/service_thd_wait.h
>>> > > > > > +#usr/include/mysql/service_wsrep.h
>>> > > > > > +#usr/include/mysql/services.h
>>> > > > > >  #usr/include/mysql/sql_common.h
>>> > > > > >  #usr/include/mysql/sql_state.h
>>> > > > > >  #usr/include/mysql/sslopt-case.h
>>> > > > > > @@ -133,33 +489,78 @@ usr/bin/resolveip
>>> > > > > >  #usr/include/mysql/sslopt-vars.h
>>> > > > > >  #usr/include/mysql/typelib.h
>>> > > > > >  #usr/lib/libmysqlclient.so
>>> > > > > > -#usr/lib/libmysqlclient.so.15
>>> > > > > > -#usr/lib/libmysqlclient.so.15.0.0
>>> > > > > > +#usr/lib/libmysqlclient.so.18
>>> > > > > > +#usr/lib/libmysqlclient.so.18.0.0
>>> > > > > >  #usr/lib/libmysqlclient_r.so
>>> > > > > > -#usr/lib/libmysqlclient_r.so.15
>>> > > > > > -#usr/lib/libmysqlclient_r.so.15.0.0
>>> > > > > > +#usr/lib/libmysqlclient_r.so.18
>>> > > > > > +#usr/lib/libmysqlclient_r.so.18.0.0
>>> > > > > >  #usr/lib/mysql
>>> > > > > > -#usr/lib/mysql/libdbug.a
>>> > > > > > -#usr/lib/mysql/libheap.a
>>> > > > > > -#usr/lib/mysql/libmyisam.a
>>> > > > > > -#usr/lib/mysql/libmyisammrg.a
>>> > > > > >  #usr/lib/mysql/libmysqlclient.a
>>> > > > > > -#usr/lib/mysql/libmysqlclient.la
>>> > > > > >  #usr/lib/mysql/libmysqlclient.so
>>> > > > > > -#usr/lib/mysql/libmysqlclient.so.15
>>> > > > > > -#usr/lib/mysql/libmysqlclient.so.15.0.0
>>> > > > > > +#usr/lib/mysql/libmysqlclient.so.18
>>> > > > > > +#usr/lib/mysql/libmysqlclient.so.18.0.0
>>> > > > > >  #usr/lib/mysql/libmysqlclient_r.a
>>> > > > > > -#usr/lib/mysql/libmysqlclient_r.la
>>> > > > > >  #usr/lib/mysql/libmysqlclient_r.so
>>> > > > > > -#usr/lib/mysql/libmysqlclient_r.so.15
>>> > > > > > -#usr/lib/mysql/libmysqlclient_r.so.15.0.0
>>> > > > > > -#usr/lib/mysql/libmystrings.a
>>> > > > > > -#usr/lib/mysql/libmysys.a
>>> > > > > > -#usr/lib/mysql/libvio.a
>>> > > > > > -usr/sbin/mysqld
>>> > > > > > -usr/sbin/mysqlmanager
>>> > > > > > -#usr/share/info/mysql.info
>>> > > > > > -#usr/share/man/man1/comp_err.1
>>> > > > > > +#usr/lib/mysql/libmysqlclient_r.so.18
>>> > > > > > +#usr/lib/mysql/libmysqlclient_r.so.18.0.0
>>> > > > > > +#usr/lib/mysql/libmysqlservices.a
>>> > > > > > +usr/lib/mysql/plugin
>>> > > > > > +#usr/lib/mysql/plugin/adt_null.so
>>> > > > > > +#usr/lib/mysql/plugin/auth_0x0100.so
>>> > > > > > +#usr/lib/mysql/plugin/auth_pam.so
>>> > > > > > +#usr/lib/mysql/plugin/auth_socket.so
>>> > > > > > +#usr/lib/mysql/plugin/auth_test_plugin.so
>>> > > > > > +#usr/lib/mysql/plugin/daemon_example.ini
>>> > > > > > +#usr/lib/mysql/plugin/debug_key_management.so
>>> > > > > > +#usr/lib/mysql/plugin/dialog.so
>>> > > > > > +#usr/lib/mysql/plugin/dialog_examples.so
>>> > > > > > +#usr/lib/mysql/plugin/example_key_management.so
>>> > > > > > +#usr/lib/mysql/plugin/file_key_management.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_archive.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_blackhole.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_connect.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_example.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_federated.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_federatedx.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_innodb.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_mroonga.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_sphinx.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_spider.so
>>> > > > > > +#usr/lib/mysql/plugin/ha_test_sql_discovery.so
>>> > > > > > +#usr/lib/mysql/plugin/handlersocket.so
>>> > > > > > +#usr/lib/mysql/plugin/libdaemon_example.so
>>> > > > > > +#usr/lib/mysql/plugin/locales.so
>>> > > > > > +#usr/lib/mysql/plugin/metadata_lock_info.so
>>> > > > > > +#usr/lib/mysql/plugin/mypluglib.so
>>> > > > > > +#usr/lib/mysql/plugin/mysql_clear_password.so
>>> > > > > > +#usr/lib/mysql/plugin/qa_auth_client.so
>>> > > > > > +#usr/lib/mysql/plugin/qa_auth_interface.so
>>> > > > > > +#usr/lib/mysql/plugin/qa_auth_server.so
>>> > > > > > +#usr/lib/mysql/plugin/query_cache_info.so
>>> > > > > > +#usr/lib/mysql/plugin/query_response_time.so
>>> > > > > > +#usr/lib/mysql/plugin/semisync_master.so
>>> > > > > > +#usr/lib/mysql/plugin/semisync_slave.so
>>> > > > > > +#usr/lib/mysql/plugin/server_audit.so
>>> > > > > > +#usr/lib/mysql/plugin/simple_password_check.so
>>> > > > > > +#usr/lib/mysql/plugin/sql_errlog.so
>>> > > > > > +#usr/lib/mysql/plugin/wsrep_info.so
>>> > > > > > +usr/libexec/mysqld
>>> > > > > > +usr/libexec/rcmysql
>>> > > > > > +#usr/share/aclocal/mysql.m4
>>> > > > > > +#usr/share/doc/mariadb-10.1.12
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/COPYING
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/COPYING.LESSER
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/COPYING.thirdparty
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/CREDITS
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/EXCEPTIONS-CLIENT
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/INSTALL-BINARY
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/README
>>> > > > > > +#usr/share/doc/mariadb-10.1.12/README-wsrep
>>> > > > > > +#usr/share/man/man1/aria_chk.1
>>> > > > > > +#usr/share/man/man1/aria_dump_log.1
>>> > > > > > +#usr/share/man/man1/aria_ftdump.1
>>> > > > > > +#usr/share/man/man1/aria_pack.1
>>> > > > > > +#usr/share/man/man1/aria_read_log.1
>>> > > > > >  #usr/share/man/man1/innochecksum.1
>>> > > > > >  #usr/share/man/man1/msql2mysql.1
>>> > > > > >  #usr/share/man/man1/my_print_defaults.1
>>> > > > > > @@ -172,16 +573,15 @@ usr/sbin/mysqlmanager
>>> > > > > >  #usr/share/man/man1/mysql.1
>>> > > > > >  #usr/share/man/man1/mysql.server.1
>>> > > > > >  #usr/share/man/man1/mysql_client_test.1
>>> > > > > > +#usr/share/man/man1/mysql_client_test_embedded.1
>>> > > > > >  #usr/share/man/man1/mysql_config.1
>>> > > > > >  #usr/share/man/man1/mysql_convert_table_format.1
>>> > > > > > -#usr/share/man/man1/mysql_explain_log.1
>>> > > > > >  #usr/share/man/man1/mysql_find_rows.1
>>> > > > > >  #usr/share/man/man1/mysql_fix_extensions.1
>>> > > > > > -#usr/share/man/man1/mysql_fix_privilege_tables.1
>>> > > > > >  #usr/share/man/man1/mysql_install_db.1
>>> > > > > > +#usr/share/man/man1/mysql_plugin.1
>>> > > > > >  #usr/share/man/man1/mysql_secure_installation.1
>>> > > > > >  #usr/share/man/man1/mysql_setpermission.1
>>> > > > > > -#usr/share/man/man1/mysql_tableinfo.1
>>> > > > > >  #usr/share/man/man1/mysql_tzinfo_to_sql.1
>>> > > > > >  #usr/share/man/man1/mysql_upgrade.1
>>> > > > > >  #usr/share/man/man1/mysql_waitpid.1
>>> > > > > > @@ -197,18 +597,38 @@ usr/sbin/mysqlmanager
>>> > > > > >  #usr/share/man/man1/mysqldumpslow.1
>>> > > > > >  #usr/share/man/man1/mysqlhotcopy.1
>>> > > > > >  #usr/share/man/man1/mysqlimport.1
>>> > > > > > -#usr/share/man/man1/mysqlman.1
>>> > > > > >  #usr/share/man/man1/mysqlshow.1
>>> > > > > > +#usr/share/man/man1/mysqlslap.1
>>> > > > > >  #usr/share/man/man1/mysqltest.1
>>> > > > > > +#usr/share/man/man1/mysqltest_embedded.1
>>> > > > > >  #usr/share/man/man1/perror.1
>>> > > > > >  #usr/share/man/man1/replace.1
>>> > > > > >  #usr/share/man/man1/resolve_stack_dump.1
>>> > > > > >  #usr/share/man/man1/resolveip.1
>>> > > > > > -#usr/share/man/man1/safe_mysqld.1
>>> > > > > >  #usr/share/man/man8/mysqld.8
>>> > > > > > -#usr/share/man/man8/mysqlmanager.8
>>> > > > > > +#usr/share/mariadb-10.1.12
>>> > > > > > +#usr/share/mariadb-10.1.12/binary-configure
>>> > > > > > +#usr/share/mariadb-10.1.12/magic
>>> > > > > > +#usr/share/mariadb-10.1.12/my-huge.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/my-innodb-heavy-4G.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/my-large.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/my-medium.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/my-small.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/mysql-log-rotate
>>> > > > > > +#usr/share/mariadb-10.1.12/mysql.server
>>> > > > > > +#usr/share/mariadb-10.1.12/mysqld_multi.server
>>> > > > > > +#usr/share/mariadb-10.1.12/policy
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/apparmor
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/apparmor/README
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/apparmor/usr.sbin.mysqld
>>> > > > > > 
>>> +#usr/share/mariadb-10.1.12/policy/apparmor/usr.sbin.mysqld.local
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/selinux
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/selinux/README
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/selinux/mariadb-server.fc
>>> > > > > > +#usr/share/mariadb-10.1.12/policy/selinux/mariadb-server.te
>>> > > > > > +#usr/share/mariadb-10.1.12/wsrep.cnf
>>> > > > > > +#usr/share/mariadb-10.1.12/wsrep_notify
>>> > > > > >  usr/share/mysql
>>> > > > > > -#usr/share/mysql/binary-configure
>>> > > > > >  #usr/share/mysql/charsets
>>> > > > > >  #usr/share/mysql/charsets/Index.xml
>>> > > > > >  #usr/share/mysql/charsets/README
>>> > > > > > @@ -244,7 +664,7 @@ usr/share/mysql
>>> > > > > >  #usr/share/mysql/dutch/errmsg.sys
>>> > > > > >  #usr/share/mysql/english
>>> > > > > >  #usr/share/mysql/english/errmsg.sys
>>> > > > > > -#usr/share/mysql/errmsg.txt
>>> > > > > > +#usr/share/mysql/errmsg-utf8.txt
>>> > > > > >  #usr/share/mysql/estonian
>>> > > > > >  #usr/share/mysql/estonian/errmsg.sys
>>> > > > > >  #usr/share/mysql/fill_help_tables.sql
>>> > > > > > @@ -256,27 +676,22 @@ usr/share/mysql
>>> > > > > >  #usr/share/mysql/greek/errmsg.sys
>>> > > > > >  #usr/share/mysql/hungarian
>>> > > > > >  #usr/share/mysql/hungarian/errmsg.sys
>>> > > > > > +#usr/share/mysql/install_spider.sql
>>> > > > > >  #usr/share/mysql/italian
>>> > > > > >  #usr/share/mysql/italian/errmsg.sys
>>> > > > > >  #usr/share/mysql/japanese
>>> > > > > >  #usr/share/mysql/japanese/errmsg.sys
>>> > > > > >  #usr/share/mysql/korean
>>> > > > > >  #usr/share/mysql/korean/errmsg.sys
>>> > > > > > -#usr/share/mysql/mi_test_all
>>> > > > > > -#usr/share/mysql/mi_test_all.res
>>> > > > > > -#usr/share/mysql/my-huge.cnf
>>> > > > > > -#usr/share/mysql/my-innodb-heavy-4G.cnf
>>> > > > > > -#usr/share/mysql/my-large.cnf
>>> > > > > > -#usr/share/mysql/my-medium.cnf
>>> > > > > > -#usr/share/mysql/my-small.cnf
>>> > > > > > -#usr/share/mysql/mysql-log-rotate
>>> > > > > > -#usr/share/mysql/mysql.server
>>> > > > > > -#usr/share/mysql/mysql_fix_privilege_tables.sql
>>> > > > > > +#usr/share/mysql/maria_add_gis_sp.sql
>>> > > > > > +#usr/share/mysql/maria_add_gis_sp_bootstrap.sql
>>> > > > > > +#usr/share/mysql/mroonga
>>> > > > > > +#usr/share/mysql/mroonga/install.sql
>>> > > > > > +#usr/share/mysql/mroonga/uninstall.sql
>>> > > > > > +#usr/share/mysql/mysql_performance_tables.sql
>>> > > > > >  #usr/share/mysql/mysql_system_tables.sql
>>> > > > > >  #usr/share/mysql/mysql_system_tables_data.sql
>>> > > > > >  #usr/share/mysql/mysql_test_data_timezone.sql
>>> > > > > > -#usr/share/mysql/mysqld_multi.server
>>> > > > > > -#usr/share/mysql/ndb-config-2-node.ini
>>> > > > > >  #usr/share/mysql/norwegian
>>> > > > > >  #usr/share/mysql/norwegian-ny
>>> > > > > >  #usr/share/mysql/norwegian-ny/errmsg.sys
>>> > > > > > @@ -299,5 +714,5 @@ usr/share/mysql
>>> > > > > >  #usr/share/mysql/swedish/errmsg.sys
>>> > > > > >  #usr/share/mysql/ukrainian
>>> > > > > >  #usr/share/mysql/ukrainian/errmsg.sys
>>> > > > > > +#usr/share/pkgconfig/mariadb.pc
>>> > > > > >  var/ipfire/backup/addons/includes/mysql
>>> > > > > > -#var/run/mysql
>>> > > > > > diff --git a/lfs/mysql b/lfs/mysql
>>> > > > > > index edcd651..2253928 100644
>>> > > > > > --- a/lfs/mysql
>>> > > > > > +++ b/lfs/mysql
>>> > > > > > @@ -24,17 +24,17 @@
>>> > > > > >
>>> > > > > >  include Config
>>> > > > > >
>>> > > > > > -VER        = 5.0.96
>>> > > > > > +VER        = 10.1.12
>>> > > > > >
>>> > > > > > -THISAPP    = mysql-$(VER)
>>> > > > > > +THISAPP    = mariadb-$(VER)
>>> > > > > >  DL_FILE    = $(THISAPP).tar.gz
>>> > > > > >  DL_FROM    = $(URL_IPFIRE)
>>> > > > > >  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>>> > > > > >  TARGET     = $(DIR_INFO)/$(THISAPP)
>>> > > > > >  PROG       = mysql
>>> > > > > > -PAK_VER    = 3
>>> > > > > > +PAK_VER    = 4
>>> > > > > >
>>> > > > > > -CFLAGS += -fno-strict-aliasing
>>> > > > > > +CFLAGS    += -fno-strict-aliasing 
>>> -fno-delete-null-pointer-checks
>>> > > > > >
>>> > > > > >
>>> > > > > > 
>>> ####################################################################
>>> > > > > > ####
>>> > > > > > ####
>>> > > > > > ###
>>> > > > > >  # Top-level Rules
>>> > > > > > @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>>> > > > > >
>>> > > > > >  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>> > > > > >
>>> > > > > > -$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79
>>> > > > > > +$(DL_FILE)_MD5 = a2c0809f27ec112139c2c50f03569b2b
>>> > > > > >
>>> > > > > >  install : $(TARGET)
>>> > > > > >
>>> > > > > > @@ -77,30 +77,54 @@ $(subst %,%_MD5,$(objects)) :
>>> > > > > >  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>> > > > > >      @$(PREBUILD)
>>> > > > > >      @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf
>>> > > > > > $(DIR_DL)/$(DL_FILE)
>>> > > > > > -    cd $(DIR_APP) && ./configure --prefix=/usr \
>>> > > > > > -             --sysconfdir=/etc \
>>> > > > > > -             --libexecdir=/usr/sbin \
>>> > > > > > -             --localstatedir=/srv/mysql \
>>> > > > > > -             --enable-thread-safe-client \
>>> > > > > > -             --enable-assembler \
>>> > > > > > -             --enable-local-infile \
>>> > > > > > -             --with-unix-socket-
>>> > > > > > path=/var/run/mysql/mysql.sock \
>>> > > > > > -                    --without-debug \
>>> > > > > > -                    --without-bench \
>>> > > > > > -             --without-readline \
>>> > > > > > -             --with-berkeley-db \
>>> > > > > > -             --with-extra-charsets=all
>>> > > > > > +    cd $(DIR_APP) && cmake . \
>>> > > > > > +        -DBUILD_CONFIG=mysql_release \
>>> > > > > > +        -DFEATURE_SET="community" \
>>> > > > > > + -DNICE_PROJECT_NAME="MariaDB" \
>>> > > > > > + -DCMAKE_INSTALL_PREFIX="/usr" \
>>> > > > > > +        -DINSTALL_SYSCONFDIR="/etc" \
>>> > > > > > + -DINSTALL_SYSCONF2DIR="/etc/my.cnf.d" \
>>> > > > > > + -DINSTALL_DOCDIR="share/doc/$(THISAPP)" \
>>> > > > > > + -DINSTALL_DOCREADMEDIR="share/doc/$(THISAPP)" \
>>> > > > > > + -DINSTALL_INCLUDEDIR="include/mysql" \
>>> > > > > > + -DINSTALL_INFODIR="share/info" \
>>> > > > > > +        -DINSTALL_LIBDIR="lib/mysql" \
>>> > > > > > +        -DINSTALL_MANDIR="share/man" \
>>> > > > > > + -DINSTALL_MYSQLSHAREDIR="share/mysql" \
>>> > > > > > + -DINSTALL_MYSQLTESTDIR="share/mysql-test" \
>>> > > > > > + -DINSTALL_PLUGINDIR="lib/mysql/plugin" \
>>> > > > > > +        -DINSTALL_SBINDIR="libexec" \
>>> > > > > > +        -DINSTALL_SCRIPTDIR="bin" \
>>> > > > > > + -DINSTALL_SQLBENCHDIR="share" \
>>> > > > > > + -DINSTALL_SUPPORTFILESDIR="share/$(THISAPP)" \
>>> > > > > > + -DMYSQL_UNIX_ADDR="/var/run/mysql/mysql.sock" \
>>> > > > > > +        -DMYSQL_DATADIR="/srv/mysql" \
>>> > > > > > +        -DTMPDIR="/var/tmp" \
>>> > > > > > + -DPID_FILE_DIR="/var/run/mysql"
>>> > > > > > +        -DENABLED_LOCAL_INFILE=ON \
>>> > > > > > +        -DWITH_EMBEDDED_SERVER=OFF \
>>> > > > > > +        -DWITH_SSL=system \
>>> > > > > > +        -DWITH_ZLIB=system \
>>> > > > > > +        -DWITH_PCRE=system \
>>> > > > > > +        -DIGNORE_AIO_CHECK=ON \
>>> > > > > > +        -DWITH_JEMALLOC=OFF
>>> > > > > >      cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING)
>>> > > > > >      cd $(DIR_APP) && make testdir=/tmp/mysql install
>>> > > > > > -    rm -rf /tmp/mysql
>>> > > > > >      cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
>>> > > > > > -    install -v -m644 $(DIR_SRC)/config/mysql/my.cnf 
>>> /etc/my.cnf
>>> > > > > > +    rm -rf /usr/share/mysql-test /usr/bin/mysql_client_test
>>> > > > > > +    rm -rf /usr/share/sql-bench
>>> > > > > > +    rm -rf /tmp/mysql
>>> > > > > > +    install -v -m 644 $(DIR_SRC)/config/mysql/my.cnf
>>> > > > > > /etc/my.cnf
>>> > > > > >      mkdir -p /srv/mysql
>>> > > > > > -    mysql_install_db --user=mysql --force
>>> > > > > > +    cd /usr/ && mysql_install_db --user=mysql --force
>>> > > > > >      chgrp -v mysql /srv/mysql{,/test,/mysql}
>>> > > > > >      chown mysql.mysql /srv/mysql/
>>> > > > > > -    install -v -m755 -o mysql -g mysql -d /var/run/mysql
>>> > > > > > +    install -v -m 755 -o mysql -g mysql -d /var/run/mysql
>>> > > > > >      install -v -m 644 
>>> $(DIR_SRC)/config/backup/includes/mysql \
>>> > > > > > /var/ipfire/backup/addons/includes/mysql
>>> > > > > > +
>>> > > > > > +    # Install initscript
>>> > > > > > +    install -v -m 754 
>>> $(DIR_SRC)/src/initscripts/init.d/mysql \
>>> > > > > > +        /etc/rc.d/init.d/mysql
>>> > > > > >      @rm -rf $(DIR_APP)
>>> > > > > >      @$(POSTBUILD)
>>> > > > > > diff --git a/make.sh b/make.sh
>>> > > > > > index 8392e30..0a2b8ae 100755
>>> > > > > > --- a/make.sh
>>> > > > > > +++ b/make.sh
>>> > > > > > @@ -391,6 +391,7 @@ buildipfire() {
>>> > > > > >    export LOGFILE
>>> > > > > >    ipfiremake configroot
>>> > > > > >    ipfiremake backup
>>> > > > > > +  ipfiremake initscripts
>>> > > > > >    ipfiremake pkg-config
>>> > > > > >    ipfiremake libusb
>>> > > > > >    ipfiremake libusb-compat
>>> > > > > > @@ -521,6 +522,8 @@ buildipfire() {
>>> > > > > >    ipfiremake libxml2
>>> > > > > >    ipfiremake libxslt
>>> > > > > >    ipfiremake BerkeleyDB
>>> > > > > > +  ipfiremake libarchive
>>> > > > > > +  ipfiremake cmake
>>> > > > > >    ipfiremake mysql
>>> > > > > >    ipfiremake cyrus-sasl
>>> > > > > >    ipfiremake openldap
>>> > > > > > @@ -552,7 +555,6 @@ buildipfire() {
>>> > > > > >    ipfiremake hdparm
>>> > > > > >    ipfiremake sdparm
>>> > > > > >    ipfiremake mtools
>>> > > > > > -  ipfiremake initscripts
>>> > > > > >    ipfiremake whatmask
>>> > > > > >    ipfiremake conntrack-tools
>>> > > > > >    ipfiremake libupnp
>>> > > > > > @@ -668,8 +670,6 @@ buildipfire() {
>>> > > > > >    ipfiremake libshout
>>> > > > > >    ipfiremake xvid
>>> > > > > >    ipfiremake libmpeg2
>>> > > > > > -  ipfiremake libarchive
>>> > > > > > -  ipfiremake cmake
>>> > > > > >    ipfiremake gnump3d
>>> > > > > >    ipfiremake rsync
>>> > > > > >    ipfiremake tcpwrapper
>>> > > > > > diff --git a/src/initscripts/init.d/mysql
>>> > > > > > b/src/initscripts/init.d/mysql
>>> > > > > > index 994e3c2..2c8cfbc 100644
>>> > > > > > --- a/src/initscripts/init.d/mysql
>>> > > > > > +++ b/src/initscripts/init.d/mysql
>>> > > > > > @@ -10,7 +10,7 @@
>>> > > > > >  . /etc/sysconfig/rc
>>> > > > > >  . $rc_functions
>>> > > > > >
>>> > > > > > -PIDFILE=/srv/mysql/`/bin/hostname`.pid
>>> > > > > > +PIDFILE=/var/run/mysql/mysql.pid
>>> > > > > >  KILLDELAY=20
>>> > > > > >
>>> > > > > >  case "$1" in
>>> > > > > > @@ -66,7 +66,7 @@ case "$1" in
>>> > > > > >          ;;
>>> > > > > >
>>> > > > > >      status)
>>> > > > > > -        statusproc /usr/sbin/mysqld
>>> > > > > > +        statusproc /usr/libexec/mysqld
>>> > > > > >          ;;
>>> > > > > >
>>> > > > > >      *)
>>> > > > > > diff --git a/src/paks/mysql/update.sh 
>>> b/src/paks/mysql/update.sh
>>> > > > > > index 548b9db..5e76574 100644
>>> > > > > > --- a/src/paks/mysql/update.sh
>>> > > > > > +++ b/src/paks/mysql/update.sh
>>> > > > > > @@ -27,6 +27,7 @@
>>> > > > > >  if [ ! -e "/var/ipfire/backup/addons/includes/mysql" ]; then
>>> > > > > >      cat <<EOF > /var/ipfire/backup/addons/includes/mysql
>>> > > > > >  /etc/my.cnf
>>> > > > > > +/etc/my.cnf.d
>>> > > > > >  /srv/mysql
>>> > > > > >  EOF
>>> > > > > >  fi
>>> > > > > > @@ -44,6 +45,9 @@ extract_files
>>> > > > > >  # Restore backup
>>> > > > > >  restore_backup "${NAME}"
>>> > > > > >
>>> > > > > > +# Remove basedir configuration line
>>> > > > > > +sed -e "/^basedir=/d" -i /etc/my.cnf
>>> > > > > > +
>>> > > > > >  # Restart the service
>>> > > > > >  start_service "${NAME}"
>