Merge with 4.0.3

Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)

1 files changed, 3 insertions, 2 deletions

diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index b226bc1300a..ef26a1f45fe 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -34,7 +34,7 @@ print_where(COND *cond,const char *info)
   if (cond)
   {
     char buff[256];
-    String str(buff,(uint32) sizeof(buff));
+    String str(buff,(uint32) sizeof(buff), default_charset_info);
     str.length(0);
     cond->print(&str);
     str.append('\0');
@@ -100,7 +100,8 @@ void print_cached_tables(void)
 void TEST_filesort(SORT_FIELD *sortorder,uint s_length, ha_rows special)
 {
   char buff[256],buff2[256];
-  String str(buff,sizeof(buff)),out(buff2,sizeof(buff2));
+  String str(buff,sizeof(buff),default_charset_info);
+  String out(buff2,sizeof(buff2),default_charset_info);
   const char *sep;
   DBUG_ENTER("TEST_filesort");