[Maria-developers] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (knielsen:2767)

[knielsen]

#At lp:maria

 2767 kniel...@knielsen-hq.org  2009-10-08
      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.
      modified:
        configure.in
        mysql-test/lib/My/ConfigFactory.pm
        mysql-test/lib/mtr_cases.pm
        mysql-test/mysql-test-run.pl

=== modified file 'configure.in'
--- a/configure.in      2009-10-07 17:26:36 +0000
+++ b/configure.in      2009-10-07 22:57:43 +0000
@@ -15,7 +15,7 @@ AC_CANONICAL_SYSTEM
 # MySQL version number, but reset the maria subrelease (m1).
 #
 # 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])
 
 PROTOCOL_VERSION=10

=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm        2009-04-25 09:04:38 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm        2009-10-07 22:57:43 +0000
@@ -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 {

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm       2009-09-07 20:50:10 +0000
+++ b/mysql-test/lib/mtr_cases.pm       2009-10-07 22:57:43 +0000
@@ -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) 
&&

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl      2009-10-06 14:02:53 +0000
+++ b/mysql-test/mysql-test-run.pl      2009-10-07 22:57:43 +0000
@@ -1018,7 +1018,8 @@ sub command_line_setup {
   }
 
   # 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/share/english");
 
@@ -1887,6 +1888,7 @@ sub environment_setup {
   my $lib_udf_example=
     mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'),
                    "$basedir/sql/.libs/udf_example.so",
+                    "$basedir/lib/mariadb/plugin/udf_example.so",
                     "$basedir/lib/mysql/plugin/udf_example.so",);
 
   if ( $lib_udf_example )
@@ -1915,6 +1917,7 @@ sub environment_setup {
     my $lib_example_plugin=
       mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename),
                      "$basedir/storage/example/.libs/".$plugin_filename,
+                      "$basedir/lib/mariadb/plugin/".$plugin_filename,
                       "$basedir/lib/mysql/plugin/".$plugin_filename);
     $ENV{'EXAMPLE_PLUGIN'}=
       ($lib_example_plugin ? basename($lib_example_plugin) : "");
@@ -1931,6 +1934,7 @@ sub environment_setup {
   my $lib_simple_parser=
     mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'),
                    "$basedir/plugin/fulltext/.libs/mypluglib.so",
+                    "$basedir/lib/mariadb/plugin/mypluglib.so",
                     "$basedir/lib/mysql/plugin/mypluglib.so",);
 
   $ENV{'SIMPLE_PARSER'}=
@@ -2074,6 +2078,7 @@ sub environment_setup {
   my $file_mysql_fix_privilege_tables=
     mtr_file_exists("$basedir/scripts/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");
   $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 $path_sql= my_find_file($install_basedir,
-                            ["mysql", "sql/share", "share/mysql",
-                             "share", "scripts"],
+                            ["mysql", "sql/share", "share/mariadb",
+                             "share/mysql", "share", "scripts"],
                             "mysql_system_tables.sql",
                             NOT_REQUIRED);
 


_______________________________________________
Mailing list: https://launchpad.net/~maria-developers
Post to     : maria-developers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~maria-developers
More help   : https://help.launchpad.net/ListHelp