Merge from mysql-5.6 to mysql-trunk

Author: jhauglid

sql/auth/sql_user_table.cc

@@ -368,7 +368,7 @@ update_user_table(THD *thd, TABLE *table,
   }
 
   table->use_all_columns();
-  DBUG_ASSERT(host != '\0');
+  DBUG_ASSERT(host != NULL);
   table->field[MYSQL_USER_FIELD_HOST]->store(host, strlen(host),
 					     system_charset_info);
   table->field[MYSQL_USER_FIELD_USER]->store(user, strlen(user),
@@ -485,7 +485,7 @@ int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
   }
 
   table->use_all_columns();
-  DBUG_ASSERT(combo->host.str != '\0');
+  DBUG_ASSERT(combo->host.str != NULL);
   table->field[MYSQL_USER_FIELD_HOST]->store(combo->host.str,combo->host.length,
                                              system_charset_info);
   table->field[MYSQL_USER_FIELD_USER]->store(combo->user.str,combo->user.length,
@@ -576,7 +576,7 @@ int replace_user_table(THD *thd, TABLE *table, LEX_USER *combo,
 
     old_row_exists = 0;
     restore_record(table,s->default_values);
-    DBUG_ASSERT(combo->host.str != '\0');
+    DBUG_ASSERT(combo->host.str != NULL);
     table->field[MYSQL_USER_FIELD_HOST]->store(combo->host.str,combo->host.length,
                                                system_charset_info);
     table->field[MYSQL_USER_FIELD_USER]->store(combo->user.str,combo->user.length,

storage/innobase/row/row0vers.cc

@@ -251,7 +251,7 @@ row_vers_impl_x_locked_low(
 		}
 	}
 
-	DBUG_PRINT("info", ("Implicit lock is held by trx:"TRX_ID_FMT, trx_id));
+	DBUG_PRINT("info", ("Implicit lock is held by trx:" TRX_ID_FMT, trx_id));
 
 	mem_heap_free(heap);
 	DBUG_RETURN(trx);