From 7a87f6626a8b007f14385eabb60d925ccf7b676e55509bca75bedf3d88b0d947 Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Wed, 5 Jun 2013 05:52:53 +0000 Subject: [PATCH] - New default config file OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=115 --- configuration-tweaks.tar.bz2 | 4 +- install.inc | 16 +++--- mariadb.changes | 5 ++ mariadb.spec | 4 +- my.ini | 99 ++++++++++++++++++++++++++++++++++++ mysql-patches.tar.bz2 | 4 +- 6 files changed, 119 insertions(+), 13 deletions(-) create mode 100644 my.ini diff --git a/configuration-tweaks.tar.bz2 b/configuration-tweaks.tar.bz2 index df08a85..ce61d3c 100644 --- a/configuration-tweaks.tar.bz2 +++ b/configuration-tweaks.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71b134417cbb991970d50072412a272f466f679db6603463e03647e4b0b687fb -size 315 +oid sha256:f2261ec50c13f51c3f47479758ae0a44e5912e30136a187981bb1492c4605ba4 +size 316 diff --git a/install.inc b/install.inc index a34bfff..871980f 100644 --- a/install.inc +++ b/install.inc @@ -56,11 +56,14 @@ filelist mysqlslap >mysql-bench.files filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files # all binaries that don't need to be in a "default" install (mysql.rpm + # mysql-client.rpm) -filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files +filelist msql2mysql mysql_config_editor mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded mytop hsclient >mysql-tools.files filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files filelist ndb_mgmd >mysql-ndb-management.files filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files filelist ndb_{cpcd,delete_all,drop_index,index_stat,print_file,redo_log_reader,drop_table} ndbinfo_select_all memcached >mysql-ndb-extra.files +[ -z "`ls -1 "%buildroot/usr/share/mysql/"*.ini`" ] || echo '/usr/share/mysql/*.ini' >> mysql.files +[ -z "`ls -1 "%buildroot/usr/share/mysql/"*.cnf`" ] || echo '/usr/share/mysql/*.cnf' >> mysql.files +[ \! -f "%buildroot/usr/share/%name"/dictionary.txt ] || echo "/usr/share/%name/dictionary.txt" >> mysql.files errmsg_list() { echo '%%defattr(-, root, root)' @@ -87,7 +90,7 @@ install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0 ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so %endif -install -m 660 _build/support-files/my-medium.cnf %buildroot/etc/my.cnf +install -m 660 %{S:14} %buildroot/etc/my.cnf install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf for i in "${DOCS[@]}"; do install -m 644 "${i}" "${DOCDIR}" || true @@ -129,15 +132,15 @@ cat mysql-ndb-storage.files mysql-ndb-management.files \ done %endif %if ! 0%{prefered} > 0 -cat libmysqlclient-devel.files | while read tmp; do +cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do cd '%buildroot' - rm -f .$tmp + rm -f ."$tmp" done rm -rf '%buildroot'/%_libdir/libmysqld.* rm -rf '%buildroot'/%_libdir/*.la rm -rf '%buildroot'/%_libdir/*.so +rm -rf '%buildroot'/%_datadir/man/*/mysql_config.1* rm -rf '%buildroot'/%_includedir -rm -rf '%buildroot'/%_datadir/man/*/mysql_config* rm -rf '%buildroot'/%_datadir/aclocal rm -rf '%buildroot'/%_libdir/*.a %endif @@ -163,6 +166,5 @@ if [ "`ls '%buildroot'%_libdir/mysql/plugin/dialog*.so`" ]; then echo '%%dir %%_libdir/mysql/plugin' >> mysql-client.files echo '%%_libdir/mysql/plugin/dialog*.so' >> mysql-client.files fi -rm -rf '%buildroot'/etc/my.cnf.d rm -rf '%buildroot'/usr/share/doc/%{name}-%{version} -rm -rf '%buildroot'/usr/share/mysql/SELinux +rm -rf '%buildroot'/usr/share/mysql/solaris diff --git a/mariadb.changes b/mariadb.changes index 1bace39..e4fdf53 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 5 05:51:45 UTC 2013 - mhrusecky@suse.com + +- New default config file + ------------------------------------------------------------------- Fri May 24 08:27:48 CEST 2013 - mhrusecky@suse.cz diff --git a/mariadb.spec b/mariadb.spec index 5c3c2d2..61e5841 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -51,6 +51,7 @@ Source10: build.inc Source11: install.inc Source12: series Source13: configuration-tweaks.tar.bz2 +Source14: my.ini BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} PreReq: pwdutils @@ -60,6 +61,7 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libedit-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openssl-devel @@ -479,8 +481,6 @@ fi %dir /usr/share/%{name} %dir /usr/share/mysql /usr/share/%{name}/charsets/ -/usr/share/mysql/*.cnf -/usr/share/mysql/*.ini /usr/share/%{name}/*.sql %ghost %dir %attr(755,mysql,mysql)/var/run/mysql %dir %{_libdir}/mysql diff --git a/my.ini b/my.ini new file mode 100644 index 0000000..070f964 --- /dev/null +++ b/my.ini @@ -0,0 +1,99 @@ +# This is default example of MySQL/MariaDB configuration provided with openSUSE package +# It is based on upstream defaults with some additional examples. + + +# The following options will be passed to all MariaDB clients +[client] +# password = your_password +# port = 3306 +# socket = /var/run/mysql/mysql.sock + +[mysqld] + +# Remove leading # and set to the amount of RAM for the most important data +# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%. +# innodb_buffer_pool_size = 128M + +# Using newer file format that supports dynamic and compressed row formats. +# If you are using replication you have to make sure, that these options are +# set everywhere the same way (probably comment them out is the easiest way) +innodb_file_format=Barracuda +innodb_file_per_table=ON + +# Remove leading # to turn on a very important data integrity option: logging +# changes to the binary log between backups. +# log_bin=mysql-bin +# binlog_format=mixed + +# Remove leading # if you want to store your database elsewhere +# datadir = /var/lib/mysql + +# required unique id between 1 and 2^32 - 1 +# defaults to 1 if master-host is not set +# but will not function as a master if omitted +server-id = 1 + +# These are commonly set, remove the # and set as required. +# port = 3306 +# socket = /var/run/mysql/mysql.sock + +# 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. +# All interaction with mysqld must be made via Unix sockets or named pipes. +# Note that using this option without enabling named pipes on Windows +# (via the "enable-named-pipe" option) will render mysqld useless! +# +# skip-networking + +# Remove leading # to set options mainly useful for reporting servers. +# The server defaults are faster for transactions and fast SELECTs. +# Adjust sizes as needed, experiment to find the optimal values. +# join_buffer_size = 128M +# sort_buffer_size = 2M +# read_rnd_buffer_size = 2M + +sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES + +[mysqld_multi] +mysqld = /usr/bin/mysqld_safe +mysqladmin = /usr/bin/mysqladmin +log = /var/log/mysqld_multi.log + +# If you want to use mysqld_multi uncomment 1 or more mysqld sections +# below or add your own ones. + +# WARNING +# -------- +# If you uncomment mysqld1 than make absolutely sure, that database mysql, +# configured above, is not started. This may result in corrupted data! +# +# [mysqld1] +# port = 3306 +# datadir = /var/lib/mysql +# pid-file = /var/lib/mysql/mysqld.pid +# socket = /var/lib/mysql/mysql.sock +# user = mysql + +# [mysqld2] +# port = 3307 +# datadir = /var/lib/mysql-databases/mysqld2 +# pid-file = /var/lib/mysql-databases/mysqld2/mysql.pid +# socket = /var/lib/mysql-databases/mysqld2/mysql.sock +# user = mysql + +# [mysqld3] +# port = 3308 +# datadir = /var/lib/mysql-databases/mysqld3 +# pid-file = /var/lib/mysql-databases/mysqld3/mysql.pid +# socket = /var/lib/mysql-databases/mysqld3/mysql.sock +# user = mysql + +# [mysqld6] +# port = 3309 +# datadir = /var/lib/mysql-databases/mysqld6 +# pid-file = /var/lib/mysql-databases/mysqld6/mysql.pid +# socket = /var/lib/mysql-databases/mysqld6/mysql.sock +# user = mysql + +!include_dir /etc/mysql + diff --git a/mysql-patches.tar.bz2 b/mysql-patches.tar.bz2 index c32d445..9da6a2d 100644 --- a/mysql-patches.tar.bz2 +++ b/mysql-patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73932aa47404b788b4ca58e8f586cf12b46e8976d928fedc6ad6df3c3598dba0 -size 11792 +oid sha256:7935739f70f9e0e29aecbfa9d7a7bc18bf91e63141b1f4493ed0f3406563aaef +size 11806