Attachment 931372 Details for Bug 1134328 – add mariadb-galera searchdir to mysql_install_db

add mariadb-galera searchdir to mysql_install_db

mysql_install_db_sharedir.patch (text/plain), 1.79 KB, created by Lukas Bezdicka on 2014-08-27 10:05:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Bezdicka

Created: 2014-08-27 10:05:55 UTC

Size: 1.79 KB

patch

obsolete

>diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
>index 3903140..efbe053 100644
>--- a/scripts/mysql_install_db.pl.in
>+++ b/scripts/mysql_install_db.pl.in
>@@ -318,7 +318,7 @@ elsif ( $opt->{basedir} )
>                     find_in_basedir($opt,"file","mysqld-nt",
>                                   "bin");  # ,"sql"
>   $pkgdatadir     = find_in_basedir($opt,"dir","fill_help_tables.sql",
>-                                    "share","share/mysql");  # ,"scripts"
>+                                    "share","share/mysql","share/mariadb-galera");  # ,"scripts"
>   $scriptdir      = "$opt->{basedir}/scripts";
> }
> else
>diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
>index 6237a6f..2aa30df 100644
>--- a/scripts/mysql_install_db.sh
>+++ b/scripts/mysql_install_db.sh
>@@ -280,16 +280,16 @@ then
>     cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
>     exit 1
>   fi
>-  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
>+  langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english share/mariadb-galera/english`
>   if test -z "$langdir"
>   then
>-    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
>+    cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english $basedir/share/mariadb-galera/english
>     exit 1
>   fi
>-  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
>+  pkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql share/mariadb-galera`
>   if test -z "$pkgdatadir"
>   then
>-    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
>+    cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql $basedir/share/mariadb-galera
>     exit 1
>   fi
>   scriptdir="$basedir/scripts"

Actions: View

Attachments on bug 1134328: 931372