Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/home/mysql_src/mysql-5.1-new

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/mysql_src/mysql-5.1-new
3125873c · guilhem@mysql.com · fcb819e0 · 9e5d9519 · 3125873c
Commit 3125873c authored Jan 24, 2006 by guilhem@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/parse_file.cc sql/parse_file.cc +2 -1

No files found.
--- a/sql/parse_file.cc
+++ b/sql/parse_file.cc
@@ -224,7 +224,8 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
  File_option *param;
  DBUG_ENTER("sql_create_definition_file");
  DBUG_PRINT("enter", ("Dir: %s, file: %s, base 0x%lx",
-		       dir->str, file_name->str, (ulong) base));
+		       dir ? dir->str : "(null)",
+                       file_name->str, (ulong) base));

  if (dir)
  {