diff --git a/sql/filesort.cc b/sql/filesort.cc
index ec49163f8a0..b7745ccb8ca 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -87,6 +87,7 @@ ha_rows filesort(TABLE *table, SORT_FIELD *sortorder, uint s_length,
   for(i=0;i<table->fields;i++)
     if (!table->field[i]->binary())
       charset=((Field_str*)(table->field[i]))->charset();
+  charset=charset?charset:default_charset_info;
   // /BAR TODO
 
   outfile= table->io_cache;
@@ -930,7 +931,6 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
 #ifdef USE_STRCOLL
 	if (!sortorder->field->binary())
 	{
-	  // BAR TODO: need checking that it is really Field_str based class
 	  CHARSET_INFO *cs=((Field_str*)(sortorder->field))->charset();
 	  if (use_strcoll(cs))
 	    sortorder->length= sortorder->length*cs->strxfrm_multiply;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index a60ff793cb6..36c4f4cba48 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -476,9 +476,6 @@ int mysql_create_table(THD *thd,const char *db, const char *table_name,
        checking for proper key parts number:
     */
    
-printf("key_info->flags=%d key_info->algorithm=%d\n",
-  key_info->flags,key_info->algorithm);
- 
     if(key_info->flags == HA_SPATIAL){
       if(key_info->key_parts!=1){
         my_printf_error(ER_WRONG_ARGUMENTS,