1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Fixes for package name change mysql -> mariadb.

- Don't need any m1 prefix for the first release based on given MySQL
   version number.

 - Fix mysql-test-run to understand that some stuff is installed under
   share/mariadb rather than share/mysql.
This commit is contained in:
unknown
2009-10-08 00:57:43 +02:00
parent d1d978ddc4
commit 68602b939b
4 changed files with 12 additions and 5 deletions

View File

@ -19,7 +19,7 @@ my @pre_rules=
);
my @share_locations= ("share/mysql", "sql/share", "share");
my @share_locations= ("share/mariadb", "share/mysql", "sql/share", "share");
sub get_basedir {

View File

@ -490,6 +490,8 @@ sub collect_one_suite($)
my $lib_innodb_plugin=
mtr_file_exists(::vs_config_dirs('storage/innodb_plugin', 'ha_innodb_plugin.dll'),
"$::basedir/storage/innodb_plugin/.libs/ha_innodb_plugin.so",
"$::basedir/lib/mariadb/plugin/ha_innodb_plugin.so",
"$::basedir/lib/mariadb/plugin/ha_innodb_plugin.dll",
"$::basedir/lib/mysql/plugin/ha_innodb_plugin.so",
"$::basedir/lib/mysql/plugin/ha_innodb_plugin.dll");
if ($::mysql_version_id >= 50100 && !(IS_WINDOWS && $::opt_embedded_server) &&