• unknown's avatar
    Merge mysql.com:/home/my/mysql-4.1 · 36b6bf2e
    unknown authored
    into  mysql.com:/home/my/mysql-5.0
    
    
    BitKeeper/etc/ignore:
      auto-union
    BitKeeper/deleted/.del-ctype_cp932.test:
      Auto merged
    BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
      Auto merged
    include/thr_lock.h:
      Auto merged
    mysql-test/t/alias.test:
      Auto merged
    mysql-test/t/alter_table.test:
      Auto merged
    mysql-test/t/archive.test:
      Auto merged
    mysql-test/t/backup.test:
      Auto merged
    mysql-test/t/bool.test:
      Auto merged
    mysql-test/t/connect.test:
      Auto merged
    mysql-test/t/count_distinct2.test:
      Auto merged
    mysql-test/t/create.test:
      Auto merged
    mysql-test/t/ctype_many.test:
      Auto merged
    mysql-test/t/ctype_ucs_binlog.test:
      Auto merged
    mysql-test/t/date_formats.test:
      Auto merged
    mysql-test/t/delayed.test:
      Auto merged
    mysql-test/t/derived.test:
      Auto merged
    mysql-test/t/distinct.test:
      Auto merged
    mysql-test/t/drop.test:
      Auto merged
    mysql-test/t/endspace.test:
      Auto merged
    mysql-test/t/flush.test:
      Auto merged
    mysql-test/t/fulltext.test:
      Auto merged
    mysql-test/t/fulltext_order_by.test:
      Auto merged
    mysql-test/t/func_compress.test:
      Auto merged
    mysql-test/t/func_concat.test:
      Auto merged
    mysql-test/t/func_date_add.test:
      Auto merged
    mysql-test/t/func_equal.test:
      Auto merged
    mysql-test/t/func_if.test:
      Auto merged
    mysql-test/t/func_sapdb.test:
      Auto merged
    mysql-test/t/func_set.test:
      Auto merged
    mysql-test/t/func_str.test:
      Auto merged
    mysql-test/t/gis-rtree.test:
      Auto merged
    mysql-test/t/gis.test:
      Auto merged
    mysql-test/t/grant.test:
      Auto merged
    mysql-test/t/grant2.test:
      Auto merged
    mysql-test/t/grant_cache.test:
      Auto merged
    mysql-test/t/heap.test:
      Auto merged
    mysql-test/t/heap_btree.test:
      Auto merged
    mysql-test/t/heap_hash.test:
      Auto merged
    mysql-test/t/init_connect.test:
      Auto merged
    mysql-test/t/insert_select.test:
      Auto merged
    mysql-test/t/insert_update.test:
      Auto merged
    mysql-test/t/key.test:
      Auto merged
    mysql-test/t/keywords.test:
      Auto merged
    mysql-test/t/limit.test:
      Auto merged
    mysql-test/t/lock.test:
      Auto merged
    mysql-test/t/lowercase_table.test:
      Auto merged
    mysql-test/t/lowercase_table3.test:
      Auto merged
    mysql-test/t/merge.test:
      Auto merged
    mysql-test/t/mix_innodb_myisam_binlog.test:
      Auto merged
    mysql-test/t/myisam.test:
      Auto merged
    mysql-test/t/mysqlbinlog2.test:
      Auto merged
    mysql-test/t/ndb_alter_table.test:
      Auto merged
    mysql-test/t/ndb_autodiscover.test:
      Auto merged
    mysql-test/t/ndb_charset.test:
      Auto merged
    mysql-test/t/ndb_grant.later:
      Auto merged
    mysql-test/t/ndb_index_ordered.test:
      Auto merged
    mysql-test/t/ndb_index_unique.test:
      Auto merged
    mysql-test/t/ndb_restore.test:
      Auto merged
    mysql-test/t/ndb_types.test:
      Auto merged
    mysql-test/t/ndb_update.test:
      Auto merged
    mysql-test/t/null.test:
      Auto merged
    mysql-test/t/null_key.test:
      Auto merged
    mysql-test/t/olap.test:
      Auto merged
    mysql-test/t/openssl_1.test:
      Auto merged
    mysql-test/t/order_by.test:
      Auto merged
    mysql-test/t/ps.test:
      Auto merged
    mysql-test/t/ps_1general.test:
      Auto merged
    mysql-test/t/ps_4heap.test:
      Auto merged
    mysql-test/t/ps_5merge.test:
      Auto merged
    mysql-test/t/query_cache.test:
      Auto merged
    mysql-test/t/replace.test:
      Auto merged
    mysql-test/t/row.test:
      Auto merged
    mysql-test/t/rpl000001.test:
      Auto merged
    mysql-test/t/rpl000015.test:
      Auto merged
    mysql-test/t/rpl000017.test:
      Auto merged
    mysql-test/t/rpl000018.test:
      Auto merged
    mysql-test/t/rpl_EE_error.test:
      Auto merged
    mysql-test/t/rpl_change_master.test:
      Auto merged
    mysql-test/t/rpl_charset.test:
      Auto merged
    mysql-test/t/rpl_create_database.test:
      Auto merged
    mysql-test/t/rpl_ddl.test:
      Auto merged
    mysql-test/t/rpl_deadlock.test:
      Auto merged
    mysql-test/t/rpl_empty_master_crash.test:
      Auto merged
    mysql-test/t/rpl_error_ignored_table.test:
      Auto merged
    mysql-test/t/rpl_flush_log_loop.test:
      Auto merged
    mysql-test/t/rpl_flush_tables.test:
      Auto merged
    mysql-test/t/rpl_get_lock.test:
      Auto merged
    mysql-test/t/rpl_heap.test:
      Auto merged
    mysql-test/t/rpl_loaddata.test:
      Auto merged
    mysql-test/t/rpl_loaddata_rule_m.test:
      Auto merged
    mysql-test/t/rpl_log.test:
      Auto merged
    mysql-test/t/rpl_log_pos.test:
      Auto merged
    mysql-test/t/rpl_max_relay_size.test:
      Auto merged
    mysql-test/t/rpl_multi_query.test:
      Auto merged
    mysql-test/t/rpl_openssl.test:
      Auto merged
    mysql-test/t/rpl_redirect.test:
      Auto merged
    mysql-test/t/rpl_relayrotate.test:
      Auto merged
    mysql-test/t/rpl_replicate_do.test:
      Auto merged
    mysql-test/t/rpl_reset_slave.test:
      Auto merged
    mysql-test/t/rpl_server_id2.test:
      Auto merged
    mysql-test/t/rpl_temporary.test:
      Auto merged
    mysql-test/t/rpl_timezone.test:
      Auto merged
    mysql-test/t/rpl_user_variables.test:
      Auto merged
    mysql-test/t/show_check.test:
      Auto merged
    mysql-test/t/subselect.test:
      Auto merged
    mysql-test/t/symlink.test:
      Auto merged
    mysql-test/t/synchronization.test:
      Auto merged
    mysql-test/t/system_mysql_db.test:
      Auto merged
    mysql-test/t/system_mysql_db_fix.test:
      Auto merged
    mysql-test/t/temp_table.test:
      Auto merged
    mysql-test/t/timezone2.test:
      Auto merged
    mysql-test/t/timezone_grant.test:
      Auto merged
    mysql-test/t/type_float.test:
      Auto merged
    mysql-test/t/type_ranges.test:
      Auto merged
    mysql-test/t/type_timestamp.test:
      Auto merged
    mysql-test/t/union.test:
      Auto merged
    mysql-test/t/update.test:
      Auto merged
    mysql-test/t/user_var-binlog.test:
      Auto merged
    mysql-test/t/warnings.test:
      Auto merged
    mysys/thr_lock.c:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    support-files/mysql.spec.sh:
      Auto merged
    BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
      Simple merge
    mysql-test/r/ps_grant.result:
      Simple merge
    mysql-test/t/analyse.test:
      Simple merge
    mysql-test/t/auto_increment.test:
      Simple merge
    mysql-test/t/bdb.test:
      Simple merge
    mysql-test/t/bigint.test:
      Simple merge
    mysql-test/t/case.test:
      Simple merge
    mysql-test/t/cast.test:
      Simple merge
    mysql-test/t/check.test:
      Simple merge
    mysql-test/t/count_distinct.test:
      Simple merge
    mysql-test/t/ctype_latin1_de.test:
      Simple merge
    mysql-test/t/ctype_uca.test:
      Simple merge
    mysql-test/t/ctype_ucs.test:
      Simple merge
    mysql-test/t/ctype_utf8.test:
      Simple merge
    mysql-test/t/delete.test:
      Simple merge
    mysql-test/t/flush_block_commit.test:
      Simple merge
    mysql-test/t/func_default.test:
      Simple merge
    mysql-test/t/func_gconcat.test:
      Simple merge
    mysql-test/t/func_group.test:
      Aligned code with 4.1
    mysql-test/t/func_in.test:
      Simple merge
    mysql-test/t/func_math.test:
      Simple merge
    mysql-test/t/func_misc.test:
      Simple merge
    mysql-test/t/func_test.test:
      Simple merge
    mysql-test/t/func_time.test:
      Simple merge
    mysql-test/t/group_by.test:
      Simple merge
    mysql-test/t/having.test:
      Simple merge
    mysql-test/t/innodb.test:
      Simple merge
    mysql-test/t/insert.test:
      Simple merge
    mysql-test/t/join_outer.test:
      Simple merge
    mysql-test/t/kill.test:
      Simple merge
    mysql-test/t/loaddata.test:
      Simple merge
    mysql-test/t/lock_multi.test:
      Simple merge
    mysql-test/t/multi_update.test:
      Simple merge
    mysql-test/t/mysqlbinlog.test:
      Simple merge
    mysql-test/t/mysqldump.test:
      Aligned code with 4.1
    mysql-test/t/mysqltest.test:
      Simple merge
    mysql-test/t/ndb_basic.test:
      Simple merge
    mysql-test/t/ndb_cache.test:
      Simple merge
    mysql-test/t/ndb_subquery.test:
      Simple merge
    mysql-test/t/ps_grant.test:
      Simple merge
    mysql-test/t/range.test:
      Simple merge
    mysql-test/t/rpl_drop_temp.test:
      Simple merge
    mysql-test/t/rpl_loaddata_rule_s.test:
      Simple merge
    mysql-test/t/rpl_loaddatalocal.test:
      Simple merge
    mysql-test/t/rpl_rotate_logs.test:
      Simple merge
    mysql-test/t/rpl_until.test:
      Simple merge
    mysql-test/t/rpl_variables.test:
      Simple merge
    mysql-test/t/select.test:
      Simple merge
    mysql-test/t/sql_mode.test:
      Simple merge
    mysql-test/t/type_blob.test:
      Simple merge
    mysql-test/t/type_decimal.test:
      Simple merge
    mysql-test/t/user_var.test:
      Simple merge
    mysql-test/t/variables.test:
      Simple merge
    sql/lock.cc:
      Simple optimization
    sql/mysql_priv.h:
      Simple merge
    sql/sql_table.cc:
      Simple merge
    sql/table.cc:
      Simple merge
    sql/unireg.cc:
      Simple merge
    36b6bf2e
ps_grant.test 3.97 KB