diff options
| -rw-r--r-- | my-5.5.cnf | 16 | ||||
| -rw-r--r-- | mysql-5.5-report.patch | 38 | ||||
| -rw-r--r-- | mysql-5.5-tests.patch | 11 | ||||
| -rw-r--r-- | mysql-dev.spec | 21 | ||||
| -rw-r--r-- | mysql.init | 1 |
5 files changed, 76 insertions, 11 deletions
@@ -5,6 +5,22 @@ user=mysql # Disabling symbolic-links is recommended to prevent assorted security risks symbolic-links=0 +# Additional storage engines and plugins +plugin-load=archive=ha_archive.so;blackhole=ha_blackhole.so + +# Add to the above plugin-load option, if needed +# http://dev.mysql.com/doc/refman/5.5/en/federated-storage-engine.html +;federated=ha_federated.so +# http://dev.mysql.com/doc/refman/5.5/en/replication-semisync.html +;rpl_semi_sync_master=semisync_master.so +;rpl_semi_sync_slave=semisync_slave.so + +# Others options for Semisynchronous Replication +;rpl_semi_sync_master_enabled=1 +;rpl_semi_sync_master_timeout=10 +;rpl_semi_sync_slave_enabled=1 + + [mysqld_safe] log-error=/var/log/mysqld.log pid-file=/var/run/mysqld/mysqld.pid diff --git a/mysql-5.5-report.patch b/mysql-5.5-report.patch new file mode 100644 index 0000000..241f1bc --- /dev/null +++ b/mysql-5.5-report.patch @@ -0,0 +1,38 @@ +diff -up mysql-5.5.6-rc/libmysqld/Makefile.am.report mysql-5.5.6-rc/libmysqld/Makefile.am +--- mysql-5.5.6-rc/libmysqld/Makefile.am.report 2010-09-25 10:12:21.974211826 +0200 ++++ mysql-5.5.6-rc/libmysqld/Makefile.am 2010-09-25 10:13:22.497467790 +0200 +@@ -82,6 +82,7 @@ sqlsources = derror.cc field.cc field_co + rpl_injector.cc my_user.c partition_info.cc sql_alter.cc \ + sql_servers.cc event_parse_data.cc sql_signal.cc \ + rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \ ++ rpl_reporting.cc \ + sql_partition_admin.cc + + libmysqld_int_a_SOURCES= $(libmysqld_sources) +diff -up mysql-5.5.6-rc/libmysqld/Makefile.in.report mysql-5.5.6-rc/libmysqld/Makefile.in +--- mysql-5.5.6-rc/libmysqld/Makefile.in.report 2010-09-25 10:12:16.071381356 +0200 ++++ mysql-5.5.6-rc/libmysqld/Makefile.in 2010-09-25 10:14:17.781865911 +0200 +@@ -163,6 +163,7 @@ am__objects_3 = derror.$(OBJEXT) field.$ + partition_info.$(OBJEXT) sql_alter.$(OBJEXT) \ + sql_servers.$(OBJEXT) event_parse_data.$(OBJEXT) \ + sql_signal.$(OBJEXT) rpl_handler.$(OBJEXT) mdl.$(OBJEXT) \ ++ rpl_reporting.$(OBJEXT) \ + keycaches.$(OBJEXT) sql_audit.$(OBJEXT) \ + sql_partition_admin.$(OBJEXT) + nodist_libmysqld_int_a_OBJECTS = $(am__objects_2) $(am__objects_3) +@@ -631,6 +632,7 @@ sqlsources = derror.cc field.cc field_co + rpl_injector.cc my_user.c partition_info.cc sql_alter.cc \ + sql_servers.cc event_parse_data.cc sql_signal.cc \ + rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \ ++ rpl_reporting.cc \ + sql_partition_admin.cc + + libmysqld_int_a_SOURCES = $(libmysqld_sources) +@@ -799,6 +801,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/records.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_handler.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_reporting.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_injector.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_record.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_record_old.Po@am__quote@ diff --git a/mysql-5.5-tests.patch b/mysql-5.5-tests.patch new file mode 100644 index 0000000..5faa26b --- /dev/null +++ b/mysql-5.5-tests.patch @@ -0,0 +1,11 @@ +--- mysql-5.5.6-rc/mysql-test/r/mysqld--help-notwin.result.orig 2010-09-25 08:11:15.655515395 +0200 ++++ mysql-5.5.6-rc/mysql-test/r/mysqld--help-notwin.result 2010-09-25 08:11:58.507519135 +0200 +@@ -913,7 +913,7 @@ + slave-type-conversions + slow-launch-time 2 + slow-query-log FALSE +-socket /tmp/mysql.sock ++socket /var/lib/mysql/mysql.sock + sort-buffer-size 2097152 + sporadic-binlog-dump-fail FALSE + sql-mode diff --git a/mysql-dev.spec b/mysql-dev.spec index 724b870..e874a02 100644 --- a/mysql-dev.spec +++ b/mysql-dev.spec @@ -10,7 +10,7 @@ URL: http://www.mysql.com License: GPLv2 with exceptions # Regression tests take a long time, you can skip 'em with this -%{!?runselftest:%global runselftest 1} +%{!?runselftest:%global runselftest 0} # Upstream has a mirror redirector for downloads, so the URL is hard to # represent statically. You can get the tarball by following a link from @@ -44,6 +44,10 @@ Patch10: mysql-5.5-strmov.patch Patch14: mysql-missing-string-code.patch Patch15: mysql-lowercase-bug.patch Patch16: mysql-chain-certs.patch +# mysql.sock path +Patch17: mysql-5.5-tests.patch +# missing rpl_reporting in embedded lib +Patch18: mysql-5.5-report.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gperf, perl, readline-devel, openssl-devel @@ -187,6 +191,8 @@ the MySQL sources. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 # workaround for upstream bug #56342 rm -f mysql-test/t/ssl_8k_key-master.opt @@ -240,15 +246,11 @@ export CFLAGS CXXFLAGS --with-extra-charsets=all \ --with-big-tables \ --with-pic \ - --with-plugin-innobase \ - --with-plugin-archive \ - --with-plugin-blackhole \ - --with-plugin-csv \ - --with-plugin-federated \ --with-plugin-partition \ --without-example-storage-engine \ --without-plugin-daemon_example \ --without-plugin-ftexample \ + --without-plugin-audit_null \ --enable-local-infile \ --enable-largefile \ --enable-thread-safe-client \ @@ -266,16 +268,15 @@ mkdir libmysqld/work cd libmysqld/work ar -x ../libmysqld.a # define twice ?? -rm ha_federated.o +#rm ha_federated.o gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o libmysqld.so.0.0.1 \ *.o \ -lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc # this is to check that we built a complete library cp %{SOURCE9} . ln -s libmysqld.so.0.0.1 libmysqld.so.0 -## This check fails/ !!!!! temporary disable it -## gcc -I../../include $CFLAGS mysql-embedded-check.c libmysqld.so.0 -## LD_LIBRARY_PATH=. ldd ./a.out +gcc -I../../include $CFLAGS -laio -lstdc++ mysql-embedded-check.c libmysqld.so.0 +LD_LIBRARY_PATH=. ldd ./a.out cd ../.. make check @@ -98,7 +98,6 @@ start(){ # alarms, per bug #547485 $exec --datadir="$datadir" --socket="$socketfile" \ --pid-file="$mypidfile" \ - --federated \ --basedir=/usr --user=mysql >/dev/null 2>&1 & safe_pid=$! # Spin for a maximum of N seconds waiting for the server to come up; |