Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.clean

libmysqld/lib_sql.cc

@@ -604,7 +604,7 @@ static char *dup_str_aux(MEM_ROOT *root, const char *from, uint length,
     uint new_len= (tocs->mbmaxlen * length) / fromcs->mbminlen + 1;
     result= (char *)alloc_root(root, new_len);
     length= copy_and_convert(result, new_len,
-			     tocs, from, length, fromcs, &dummy_err);
+                             tocs, from, length, fromcs, &dummy_err);
   }
   else
   {
@@ -645,15 +645,15 @@ bool Protocol::send_fields(List<Item> *list, uint flag)
     item->make_field(&server_field);
 
     client_field->db= dup_str_aux(field_alloc, server_field.db_name,
-				  strlen(server_field.db_name), cs, thd_cs);
+                                  strlen(server_field.db_name), cs, thd_cs);
     client_field->table= dup_str_aux(field_alloc, server_field.table_name,
-				     strlen(server_field.table_name), cs, thd_cs);
+                                     strlen(server_field.table_name), cs, thd_cs);
     client_field->name= dup_str_aux(field_alloc, server_field.col_name,
-				    strlen(server_field.col_name), cs, thd_cs);
+                                    strlen(server_field.col_name), cs, thd_cs);
     client_field->org_table= dup_str_aux(field_alloc, server_field.org_table_name,
-					 strlen(server_field.org_table_name), cs, thd_cs);
+                                         strlen(server_field.org_table_name), cs, thd_cs);
     client_field->org_name= dup_str_aux(field_alloc, server_field.org_col_name,
-					strlen(server_field.org_col_name), cs, thd_cs);
+                                        strlen(server_field.org_col_name), cs, thd_cs);
     if (item->collation.collation == &my_charset_bin || thd_cs == NULL)
     {
       /* No conversion */