Cleanup + safety comment

sql/share/english/errmsg.txt:
  Added note to ensure that no one adds new error message to 4.0.
  This is important as it causes too many problems with test suite in 4.1
sql/sql_load.cc:
  Removed wrong comment.

2 files changed, 4 insertions, 7 deletions

diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 7104eb64d56..dca9311b277 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -238,5 +238,7 @@
 "Wrong usage/placement of '%s'",
 "This version of MySQL doesn't yet support '%s'",
 "Got fatal error %d: '%-.128s' from master when reading data from binary log",
-"Slave SQL thread ignored the query because of replicate-*-table rules"
+"Slave SQL thread ignored the query because of replicate-*-table rules",
 "Variable '%-.64s' is a %s variable"
+] # End of error messages
+# Do NOT add new error messages here as this makes merges to 4.1 too hard!
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 3b8672188d4..1603a7eb26a 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -92,12 +92,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   LOAD_FILE_INFO lf_info;
   char *db = table_list->db;			// This is never null
   /* If no current database, use database where table is located */
-  char *tdb= thd->db ? thd->db : db;
-  /*
-    'tdb' can be NULL only if both table_list->db and thd->db are NULL
-    'db' itself can be NULL.  but in that  case it   will generate 
-    an error earlier open_ltable()).
-  */
+  char *tdb= thd->db ? thd->db : db;		// Result is never null
   bool transactional_table, log_delayed;
   ulong skip_lines= ex->skip_lines;
   DBUG_ENTER("mysql_load");