MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:jonas Date:February 22 2008 2:12pm
Subject:bk commit into 5.1 tree (jonas:1.2189) BUG#34078
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-22 15:12:50+01:00, jonas@stripped +1 -0
  bug#34078 backport to drop6 (ndb)

  sql/sql_parse.cc@stripped, 2008-02-22 15:12:49+01:00, jonas@stripped +10 -1
    bug#34078 backport to drop6

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop6

--- 1.482/sql/sql_parse.cc	2008-02-22 15:12:53 +01:00
+++ 1.483/sql/sql_parse.cc	2008-02-22 15:12:53 +01:00
@@ -2693,7 +2693,16 @@
     if (check_global_access(thd, SUPER_ACL | REPL_CLIENT_ACL))
       goto error;
     pthread_mutex_lock(&LOCK_active_mi);
-    res = show_master_info(thd,active_mi);
+    if (active_mi != NULL)
+    {
+      res = show_master_info(thd, active_mi);
+    }
+    else
+    {
+      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                   "the master info structure does not exist");
+      send_ok(thd);
+    }
     pthread_mutex_unlock(&LOCK_active_mi);
     break;
   }
Thread
bk commit into 5.1 tree (jonas:1.2189) BUG#34078jonas22 Feb