List:Commits« Previous MessageNext Message »
From:Kristofer Pettersson Date:May 5 2010 1:32pm
Subject:bzr push into mysql-pe branch (kristofer.pettersson:4055 to 4056)
View as plain text  
 4056 Kristofer Pettersson	2010-05-05
      Applied merge fixes from mysql-5.1-bugteam => mysql-pe
     @ mysql-test/suite/backup/t/backup_securebackup-master.opt
        * secure_file_priv must be set to an existing path
     @ mysys/my_getwd.c
        * DBUG_RETURN should be used or debug library will assert.

    modified:
      mysql-test/suite/backup/t/backup_securebackup-master.opt
      mysys/my_getwd.c
 4055 Georgi Kodinov	2010-05-05 [merge]
      merge

    modified:
      mysys/mf_loadpath.c
      mysys/my_getwd.c
      sql/item.cc
      sql/item.h
      sql/mysqld.cc
=== modified file 'mysql-test/suite/backup/t/backup_securebackup-master.opt'
--- a/mysql-test/suite/backup/t/backup_securebackup-master.opt	2009-04-24 14:55:53 +0000
+++ b/mysql-test/suite/backup/t/backup_securebackup-master.opt	2010-05-05 11:54:53 +0000
@@ -1,3 +1,3 @@
 --backupdir=see_comment_in_test_case_re_bug_43767_coverage_test
 --secure-backup-file-priv=$MYSQLTEST_VARDIR/mysqld.1/data/securebackup_path
---secure-file-priv=$MYSQLTEST_VARDIR/mysqld.1/data/securefilepriv_path
+--secure-file-priv=$MYSQLTEST_VARDIR/tmp

=== modified file 'mysys/my_getwd.c'
--- a/mysys/my_getwd.c	2010-05-05 10:50:28 +0000
+++ b/mysys/my_getwd.c	2010-05-05 11:54:53 +0000
@@ -51,7 +51,7 @@ int my_getwd(char * buf, size_t size, my
                    buf, (uint) size, MyFlags));
 
   if (size < 1)
-    return(-1);
+    DBUG_RETURN(-1);
 
   if (curr_dir[0])				/* Current pos is saved here */
     (void) strmake(buf,&curr_dir[0],size-1);
@@ -59,12 +59,12 @@ int my_getwd(char * buf, size_t size, my
   {
 #if defined(HAVE_GETCWD)
     if (size < 2)
-      return(-1);
+      DBUG_RETURN(-1);
     if (!getcwd(buf,size-2) && MyFlags & MY_WME)
     {
       my_errno=errno;
       my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
-      return(-1);
+      DBUG_RETURN(-1);
     }
 #elif defined(HAVE_GETWD)
     {
@@ -74,12 +74,12 @@ int my_getwd(char * buf, size_t size, my
     }
 #elif defined(VMS)
     if (size < 2)
-      return(-1);
+      DBUG_RETURN(-1);
     if (!getcwd(buf,size-2,1) && MyFlags & MY_WME)
     {
       my_errno=errno;
       my_error(EE_GETWD,MYF(ME_BELL+ME_WAITTANG),errno);
-      return(-1);
+      DBUG_RETURN(-1);
     }
     intern_filename(buf,buf);
 #else


Attachment: [text/bzr-bundle]
Thread
bzr push into mysql-pe branch (kristofer.pettersson:4055 to 4056)Kristofer Pettersson5 May