• unknown's avatar
    After merge fixes · 616a56b5
    unknown authored
    
    config/ac-macros/character_sets.m4:
      Added latin1_spanish_ci
    dbug/dbug_analyze.c:
      Remove compiler warnings
    include/my_handler.h:
      Reorder structure arguments to be more optimal
    innobase/dict/dict0load.c:
      Fixed wrong define tag (for MySQL 5.0)
    innobase/fil/fil0fil.c:
      Fixed compiler warning
    innobase/os/os0file.c:
      Fixed compiler warning
    myisam/ft_boolean_search.c:
      Fixed compiler warning
    myisam/ft_static.c:
      Update to use new HA_KEYSEG structure
    myisam/mi_open.c:
      Simple optimization
    myisammrg/myrg_static.c:
      Removed compiler warning
    mysql-test/r/grant.result:
      Update results after merge
    mysql-test/r/index_merge.result:
      Update results after merge
    mysql-test/r/information_schema_inno.result:
      Add missing drop table
    mysql-test/r/lowercase_table.result:
      safety fix
    mysql-test/r/multi_update.result:
      safety fix
    mysql-test/r/ps_1general.result:
      safety fix
    mysql-test/r/ps_2myisam.result:
      Update results after merge
      (set is not anymore of binary type)
    mysql-test/r/ps_3innodb.result:
      Update results after merge
    mysql-test/r/ps_4heap.result:
      Update results after merge
    mysql-test/r/ps_5merge.result:
      Update results after merge
    mysql-test/r/ps_6bdb.result:
      Update results after merge
    mysql-test/r/show_check.result:
      Update results after merge
    mysql-test/r/subselect.result:
      Update results after merge
      (added missing quotes)
    mysql-test/r/timezone2.result:
      Update results after merge
    mysql-test/r/view.result:
      Update results after merge
      (note that INSERT IGNORE will work again after next merge from 4.1)
    mysql-test/t/derived.test:
      Removed empty line
    mysql-test/t/grant.test:
      Update results after merge
    mysql-test/t/information_schema_inno.test:
      added missing drop table
    mysql-test/t/lowercase_table.test:
      safety fix
    mysql-test/t/multi_update.test:
      safety fix
    mysql-test/t/ps_1general.test:
      safety fix
    mysql-test/t/view.test:
      update error codes after merge
    ndb/src/mgmsrv/main.cpp:
      after merge fix
    ndb/tools/ndb_test_platform.cpp:
      removed compiler warnings
    regex/main.c:
      remove compiler warnings
    sql/field.cc:
      Remove compiler warning
    sql/gen_lex_hash.cc:
      Added DBUG support
    sql/ha_myisam.cc:
      Removed warning from valgrind
    sql/ha_ndbcluster.cc:
      Remove compiler warning
    sql/item_cmpfunc.cc:
      Better to use val_int() instead of val_real() as we don't want Item_func_nop_all to return different value than the original ref element
    sql/mysqld.cc:
      Remove compiler warning
    sql/sql_acl.cc:
      More debugging
    sql/sql_lex.cc:
      Remove unnecessary 'else'
    sql/sql_parse.cc:
      After merge fixes
      Simplify reset of thd->server_status for SQLCOM_CALL
    sql/sql_prepare.cc:
      After merge fixes
      Removed possible core dump in mysql_stmt_fetch()
    sql/sql_update.cc:
      After merge fixes (together with Sanja)
    strings/ctype-czech.c:
      Remove compiler warning
    strings/ctype-ucs2.c:
      Remove compiler warning
    strings/ctype-win1250ch.c:
      Remove compiler warning
    strings/xml.c:
      Remove compiler warning
    tests/client_test.c:
      Fix test to work with 5.0
    vio/test-sslserver.c:
      Portability fix
    616a56b5
index_merge.result 18.9 KB