• unknown's avatar
    After merge fixes · 6fdb9848
    unknown authored
    Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
    
    
    client/client_priv.h:
      Added option 'create_options' for mysqldump
    client/mysqldump.c:
      Changed '--all' to '--create-options' as the old name was meaningless
    innobase/buf/buf0buf.c:
      After merge fixes
    innobase/buf/buf0lru.c:
      After merge fixes
    innobase/buf/buf0rea.c:
      After merge fixes
    innobase/dict/dict0load.c:
      After merge fixes
    innobase/fil/fil0fil.c:
      After merge fixes
    innobase/ibuf/ibuf0ibuf.c:
      After merge fixes
    innobase/include/fil0fil.h:
      After merge fixes
    innobase/include/row0mysql.h:
      After merge fixes
    innobase/include/ut0mem.h:
      After merge fixes
    innobase/log/log0recv.c:
      After merge fixes
    innobase/row/row0mysql.c:
      After merge fixes
    innobase/row/row0sel.c:
      After merge fixes
    innobase/srv/srv0start.c:
      After merge fixes
    innobase/sync/sync0rw.c:
      After merge fixes
    innobase/sync/sync0sync.c:
      After merge fixes
    myisam/ft_boolean_search.c:
      After merge fixes
    myisam/ft_nlq_search.c:
      After merge fixes
    mysql-test/r/mysqldump.result:
      After merge fixes
    mysql-test/t/mysqldump.test:
      Make result file smaller
      Some new tests
    sql/ha_innodb.cc:
      After merge fixes
    sql/set_var.cc:
      Removed compiler warning
    sql/slave.cc:
      After merge fixes
    sql/slave.h:
      After merge fixes
    sql/sql_show.cc:
      Type -> Engine
    6fdb9848
set_var.cc 89.6 KB