LEX_CSTRING table_name= { table->s->db.str, table->s->table_name.length };

and misc cleanups