• unknown's avatar
    Merging lex-pointer change from 4.1 to 5.0. · 24e886a3
    unknown authored
    
    libmysqld/lib_sql.cc:
      Auto merged
    sql/filesort.cc:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/protocol.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_cache.cc:
      Auto merged
    sql/sql_delete.cc:
      Auto merged
    sql/sql_error.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_union.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    24e886a3
ha_myisam.cc 40.7 KB