1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for package name change mysql -> mariadb.

Browse Source 
- 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -15,7 +15,7 @@ AC_CANONICAL_SYSTEM
# MySQL version number, but reset the maria subrelease (m1). # MySQL version number, but reset the maria subrelease (m1).
# #
# Note: the following line must be parseable by win/configure.js:GetVersion() # Note: the following line must be parseable by win/configure.js:GetVersion()
AM_INIT_AUTOMAKE(mariadb, 5.1.38m1-beta) AM_INIT_AUTOMAKE(mariadb, 5.1.38-beta)
AM_CONFIG_HEADER([include/config.h:config.h.in]) AM_CONFIG_HEADER([include/config.h:config.h.in])
PROTOCOL_VERSION=10 PROTOCOL_VERSION=10

2
mysql-test/lib/My/ConfigFactory.pm
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 { sub get_basedir {

2
mysql-test/lib/mtr_cases.pm
View File

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

11
mysql-test/mysql-test-run.pl
View File

@ -1018,7 +1018,8 @@ sub command_line_setup {
} }
# Look for language files and charsetsdir, use same share # Look for language files and charsetsdir, use same share
$path_language= mtr_path_exists("$basedir/share/mysql/english", $path_language= mtr_path_exists("$basedir/share/mariadb/english",
"$basedir/share/mysql/english",
"$basedir/sql/share/english", "$basedir/sql/share/english",
"$basedir/share/english"); "$basedir/share/english");
@ -1887,6 +1888,7 @@ sub environment_setup {
my $lib_udf_example= my $lib_udf_example=
mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'), mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'),
"$basedir/sql/.libs/udf_example.so", "$basedir/sql/.libs/udf_example.so",
"$basedir/lib/mariadb/plugin/udf_example.so",
"$basedir/lib/mysql/plugin/udf_example.so",); "$basedir/lib/mysql/plugin/udf_example.so",);
if ( $lib_udf_example ) if ( $lib_udf_example )
@ -1915,6 +1917,7 @@ sub environment_setup {
my $lib_example_plugin= my $lib_example_plugin=
mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename), mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename),
"$basedir/storage/example/.libs/".$plugin_filename, "$basedir/storage/example/.libs/".$plugin_filename,
"$basedir/lib/mariadb/plugin/".$plugin_filename,
"$basedir/lib/mysql/plugin/".$plugin_filename); "$basedir/lib/mysql/plugin/".$plugin_filename);
$ENV{'EXAMPLE_PLUGIN'}= $ENV{'EXAMPLE_PLUGIN'}=
($lib_example_plugin ? basename($lib_example_plugin) : ""); ($lib_example_plugin ? basename($lib_example_plugin) : "");
@ -1931,6 +1934,7 @@ sub environment_setup {
my $lib_simple_parser= my $lib_simple_parser=
mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'), mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'),
"$basedir/plugin/fulltext/.libs/mypluglib.so", "$basedir/plugin/fulltext/.libs/mypluglib.so",
"$basedir/lib/mariadb/plugin/mypluglib.so",
"$basedir/lib/mysql/plugin/mypluglib.so",); "$basedir/lib/mysql/plugin/mypluglib.so",);
$ENV{'SIMPLE_PARSER'}= $ENV{'SIMPLE_PARSER'}=
@ -2074,6 +2078,7 @@ sub environment_setup {
my $file_mysql_fix_privilege_tables= my $file_mysql_fix_privilege_tables=
mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql", mtr_file_exists("$basedir/scripts/mysql_fix_privilege_tables.sql",
"$basedir/share/mysql_fix_privilege_tables.sql", "$basedir/share/mysql_fix_privilege_tables.sql",
"$basedir/share/mariadb/mysql_fix_privilege_tables.sql",
"$basedir/share/mysql/mysql_fix_privilege_tables.sql"); "$basedir/share/mysql/mysql_fix_privilege_tables.sql");
$ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables; $ENV{'MYSQL_FIX_PRIVILEGE_TABLES'}= $file_mysql_fix_privilege_tables;
@ -2870,8 +2875,8 @@ sub mysql_install_db {
my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql"; my $bootstrap_sql_file= "$opt_vardir/tmp/bootstrap.sql";
my $path_sql= my_find_file($install_basedir, my $path_sql= my_find_file($install_basedir,
["mysql", "sql/share", "share/mysql", ["mysql", "sql/share", "share/mariadb",
"share", "scripts"], "share/mysql", "share", "scripts"],
"mysql_system_tables.sql", "mysql_system_tables.sql",
NOT_REQUIRED); NOT_REQUIRED);