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, 23 insertions, 0 deletions

diff --git a/sql/structs.h b/sql/structs.h
index bd058a08e46..c2ad4ef527e 100644
--- a/sql/structs.h
+++ b/sql/structs.h
@@ -156,6 +156,29 @@ typedef struct show_var_st {
   SHOW_TYPE type;
 } SHOW_VAR;
 
+struct show_table_type_st {
+  const char *type;
+  char *value;
+  const char *comment;
+};
+
+struct show_column_type_st {
+  const char *type;
+  uint size;
+  const char *min_value;
+  const char *max_value;
+  uint precision;
+  uint scale;
+  const char *nullable;
+  const char *auto_increment;
+  const char *unsigned_attr;
+  const char *zerofill;
+  const char *searchable;
+  const char *case_sensitivity;
+  const char *default_value;
+  const char *comment;
+};
+
 typedef struct lex_string {
   char *str;
   uint length;