Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

1 files changed, 2 insertions, 2 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 5d87701fe10..56fce3d7332 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2630,7 +2630,7 @@ static void dump_table(char *table, char *db)
                   dynstr_append(&extended_row, "NULL");
                 else
                 {
-                  if (field->type == FIELD_TYPE_DECIMAL)
+                  if (field->type == MYSQL_TYPE_DECIMAL)
                   {
                     /* add " signs around */
                     dynstr_append(&extended_row, "'");
@@ -2703,7 +2703,7 @@ static void dump_table(char *table, char *db)
               else if (my_isalpha(charset_info, *ptr) ||
                        (*ptr == '-' && my_isalpha(charset_info, ptr[1])))
                 fputs("NULL", md_result_file);
-              else if (field->type == FIELD_TYPE_DECIMAL)
+              else if (field->type == MYSQL_TYPE_DECIMAL)
               {
                 /* add " signs around */
                 fputc('\'', md_result_file);