From: Date: February 1 2006 9:28pm
Subject: bk commit into 4.1 tree (jimw:1.2489) BUG#16389
List-Archive: http://lists.mysql.com/commits/2024
X-Bug: 16389
Message-Id: <20060201202843.2CD061480A6@rama.trainedmonkey.com>

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw 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
  1.2489 06/02/01 12:28:39 jimw@stripped +1 -0
  Fix mysqldump crash when encountering a VIEW (when used against a
  5.0 or later server, obviously). (Bug #16389)

  client/mysqldump.c
    1.198 06/02/01 12:28:34 jimw@stripped +5 -2
    Prevent dumping data from a view (and crashing when we see one)

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-16389

--- 1.197/client/mysqldump.c	2005-12-04 05:32:54 -08:00
+++ 1.198/client/mysqldump.c	2006-02-01 12:28:34 -08:00
@@ -2557,8 +2557,11 @@
     mysql_free_result(res);
     return 0;					/* assume table is ok */
   }
-  if (strcmp(row[1], (result= "MRG_MyISAM")) &&
-      strcmp(row[1], (result= "MRG_ISAM")))
+  /* Some forward-compatibility: don't dump data from a VIEW */
+  if (!row[1])
+    result= "VIEW";
+  else if (strcmp(row[1], (result= "MRG_MyISAM")) &&
+           strcmp(row[1], (result= "MRG_ISAM")))
     result= 0;
   mysql_free_result(res);
   return result;