On 08/21/14 11:26, Giovanni Bechis wrote:
> On 08/19/14 23:15, Brad Smith wrote:
>> Here is a diff to make attempt #2 at switching to MariaDB.
>>
> what about the upgrade path ?
> a default install of mysql-server will not upgrade easily (see log file), atm
> I have 2 options:
> 1) change the default values of iblog and ibdata file size to match the ones
> of mysql-5.0.x
> 2) add an entry in current.html to proceed this way:
> # mysqladmin flush logs
> # /etc/rc.d/mysql stop
> # pkg_add -ui mysql
> # rm -f /var/mysql/ib_logfile[0-9]
> uncomment the line "innodb_data_file_path = ibdata1:10M:autoextend" in
> /etc/my.cnf
> # /etc/rc.d/mysqld start
>
> I think that 1) should be the way to go, if you changed my.cnf it will not be
> overwritten and mariadb will not start but you should know how to fix it.
> Cheers
> Giovanni
>
Now with patch, anyway we should add an entry in current.html as well.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 19 Aug 2014 16:42:40 -0000 1.16
+++ Makefile 21 Aug 2014 13:42:17 -0000
@@ -7,6 +7,7 @@ COMMENT-server= multithreaded SQL databa
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 10.0.13
+REVISION= 0
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
Index: patches/patch-cmake_install_macros_cmake
===================================================================
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-cmake_install_macros_cmake,v
retrieving revision 1.6
diff -u -p -r1.6 patch-cmake_install_macros_cmake
--- patches/patch-cmake_install_macros_cmake 19 Aug 2014 16:42:40 -0000 1.6
+++ patches/patch-cmake_install_macros_cmake 21 Aug 2014 13:41:54 -0000
@@ -1,7 +1,14 @@
+<<<<<<< patch-cmake_install_macros_cmake
+$OpenBSD: patch-cmake_install_macros_cmake,v 1.5 2014/06/19 23:04:42 brad Exp $
+--- cmake/install_macros.cmake.orig Fri Aug 8 18:13:47 2014
++++ cmake/install_macros.cmake Mon Aug 11 17:35:30 2014
+@@ -198,6 +198,36 @@ IF(UNIX)
+=======
$OpenBSD: patch-cmake_install_macros_cmake,v 1.6 2014/08/19 16:42:40 brad Exp $
--- cmake/install_macros.cmake.orig Fri Aug 8 18:13:47 2014
+++ cmake/install_macros.cmake Mon Aug 11 17:35:30 2014
@@ -198,6 +198,36 @@ IF(UNIX)
+>>>>>>> 1.6
ENDIF()
ENDMACRO()
Index: patches/patch-libmysql_CMakeLists_txt
===================================================================
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-libmysql_CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-libmysql_CMakeLists_txt
--- patches/patch-libmysql_CMakeLists_txt 19 Aug 2014 16:42:40 -0000 1.7
+++ patches/patch-libmysql_CMakeLists_txt 21 Aug 2014 14:09:32 -0000
@@ -1,6 +1,12 @@
+<<<<<<< patch-libmysql_CMakeLists_txt
+$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.6 2014/06/19 23:04:42 brad Exp $
+--- libmysql/CMakeLists.txt.orig Fri Aug 8 18:13:37 2014
++++ libmysql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+=======
$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.7 2014/08/19 16:42:40 brad Exp $
--- libmysql/CMakeLists.txt.orig Fri Aug 8 18:13:37 2014
+++ libmysql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+>>>>>>> 1.7
@@ -259,6 +259,8 @@ mariadb_dyncol_column_count
mariadb_dyncol_prepare_decimal
)
Index: patches/patch-scripts_mysqld_safe_sh
===================================================================
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-scripts_mysqld_safe_sh,v
retrieving revision 1.5
diff -u -p -r1.5 patch-scripts_mysqld_safe_sh
--- patches/patch-scripts_mysqld_safe_sh 19 Aug 2014 16:42:40 -0000 1.5
+++ patches/patch-scripts_mysqld_safe_sh 21 Aug 2014 13:41:54 -0000
@@ -1,6 +1,12 @@
+<<<<<<< patch-scripts_mysqld_safe_sh
+$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.4 2014/06/19 23:04:42 brad Exp $
+--- scripts/mysqld_safe.sh.orig Fri Aug 8 18:13:37 2014
++++ scripts/mysqld_safe.sh Mon Aug 11 17:35:30 2014
+=======
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.5 2014/08/19 16:42:40 brad Exp $
--- scripts/mysqld_safe.sh.orig Fri Aug 8 18:13:37 2014
+++ scripts/mysqld_safe.sh Mon Aug 11 17:35:30 2014
+>>>>>>> 1.5
@@ -25,7 +25,8 @@ numa_interleave=0
logging=init
want_syslog=0
Index: patches/patch-sql_CMakeLists_txt
===================================================================
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-sql_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -r1.8 patch-sql_CMakeLists_txt
--- patches/patch-sql_CMakeLists_txt 19 Aug 2014 16:42:40 -0000 1.8
+++ patches/patch-sql_CMakeLists_txt 21 Aug 2014 13:46:58 -0000
@@ -1,6 +1,7 @@
-$OpenBSD: patch-sql_CMakeLists_txt,v 1.8 2014/08/19 16:42:40 brad Exp $
---- sql/CMakeLists.txt.orig Fri Aug 8 18:13:44 2014
-+++ sql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+<<<<<<< patch-sql_CMakeLists_txt
+$OpenBSD: patch-sql_CMakeLists_txt,v 1.7 2014/06/19 23:04:42 brad Exp $
+--- sql/CMakeLists.txt.orig Sat Aug 9 00:13:44 2014
++++ sql/CMakeLists.txt Tue Aug 19 16:02:48 2014
@@ -286,7 +286,7 @@ ADD_CUSTOM_TARGET(distclean
VERBATIM
)
Index: patches/patch-support-files_my-medium_cnf_sh
===================================================================
RCS file: patches/patch-support-files_my-medium_cnf_sh
diff -N patches/patch-support-files_my-medium_cnf_sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-support-files_my-medium_cnf_sh 21 Aug 2014 13:46:58 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- support-files/my-medium.cnf.sh.orig Thu Aug 21 15:44:32 2014
++++ support-files/my-medium.cnf.sh Thu Aug 21 15:46:29 2014
+@@ -118,14 +118,14 @@ server-id = 1
+
+ # Uncomment the following if you are using InnoDB tables
+ #innodb_data_home_dir = @localstatedir@
+-#innodb_data_file_path = ibdata1:10M:autoextend
++innodb_data_file_path = ibdata1:10M:autoextend
+ #innodb_log_group_home_dir = @localstatedir@
+ # You can set .._buffer_pool_size up to 50 - 80 %
+ # of RAM but beware of setting memory usage too high
+ #innodb_buffer_pool_size = 16M
+ #innodb_additional_mem_pool_size = 2M
+ # Set .._log_file_size to 25 % of buffer pool size
+-#innodb_log_file_size = 5M
++innodb_log_file_size = 5M
+ #innodb_log_buffer_size = 8M
+ #innodb_flush_log_at_trx_commit = 1
+ #innodb_lock_wait_timeout = 50
