• unknown's avatar
    Merge with 4.0 · e943ca1f
    unknown authored
    
    mysql-test/r/bigint.result:
      Auto merged
    mysql-test/t/bigint.test:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/item.h:
      merge (use local copy)
    sql/sql_show.cc:
      merge
    e943ca1f
sql_show.cc 53.7 KB