• unknown's avatar
    Merge with 4.1 · bd47a7df
    unknown authored
    BitKeeper/etc/logging_ok:
      auto-union
    client/sql_string.cc:
      Auto merged
    configure.in:
      Auto merged
    include/my_global.h:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Auto merged
    mysql-test/r/create.result:
      Auto merged
    mysql-test/r/olap.result:
      Auto merged
    mysql-test/r/warnings.result:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/warnings.test:
      Auto merged
    mysys/raid.cc:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    sql/field.cc:
      Auto merged
    BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e:
      Auto merged
    BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e:
      Auto merged
    sql/ha_berkeley.cc:
      Auto merged
    sql/ha_blackhole.cc:
      Auto merged
    sql/ha_heap.cc:
      Auto merged
    sql/ha_innodb.cc:
      Auto merged
    sql/ha_myisam.cc:
      Auto merged
    sql/ha_myisammrg.cc:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_geofunc.cc:
      Auto merged
    sql/item_strfunc.cc:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/item_uniq.cc:
      Auto merged
    sql/lock.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/opt_range.h:
      Auto merged
    sql/procedure.cc:
      Auto merged
    sql/protocol.cc:
      Auto merged
    sql/protocol_cursor.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_analyse.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_error.cc:
      Auto merged
    sql/sql_handler.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_map.cc:
      Auto merged
    sql/sql_olap.cc:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    sql/sql_string.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/sql_udf.cc:
      Auto merged
    sql/examples/ha_archive.cc:
      Auto merged
    sql/examples/ha_example.cc:
      Auto merged
    sql/examples/ha_tina.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/tztime.cc:
      Auto merged
    strings/ctype-win1250ch.c:
      Auto merged
    mysql-test/r/func_gconcat.result:
      merge & ensure that 4.1 and 5.0 source have tests in same order
    mysql-test/r/innodb.result:
      merge & ensure that 4.1 and 5.0 source have tests in same order
    mysql-test/t/func_gconcat.test:
      merge & ensure that 4.1 and 5.0 source have tests in same order
    mysql-test/t/innodb.test:
      merge & ensure that 4.1 and 5.0 source have tests in same order
    sql/item_func.cc:
      merge
    sql/mysqld.cc:
      merge
    sql/opt_range.cc:
      merge
    sql/sql_parse.cc:
      merge
      Give better name to goto labels
    sql/sql_select.cc:
      merge
    bd47a7df
raid.cc 23.1 KB