1. 20 Sep, 2005 1 commit
  2. 19 Sep, 2005 6 commits
  3. 18 Sep, 2005 3 commits
  4. 16 Sep, 2005 1 commit
    • unknown's avatar
      mysql-test-run.pl: · d6afdcb7
      unknown authored
        Enabled --valgrind to work (bug#13280)
      
      
      mysql-test/mysql-test-run.pl:
        Enabled --valgrind to work (bug#13280)
      d6afdcb7
  5. 15 Sep, 2005 8 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 2a5505c7
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      2a5505c7
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4805236e
      unknown authored
      into moonbone.local:/work/12887-bug-4.1-mysql
      
      
      4805236e
    • unknown's avatar
      Fix bug#12887 Distinct is not always applied after rollup · 36d163d6
      unknown authored
      For queries with GROUP BY and without hidden GROUP BY fields DISTINCT is
      optimized away becuase such queries produce result set without duplicates.
      But ROLLUP can add rows which may be same to some rows and this fact was
      ignored.
      
      Added check so if ROLLUP is present DISTINCT can't be optimized away.
      
      
      sql/sql_select.cc:
        Fix bug #12887 Distinct is not always applied after rollup
      mysql-test/r/olap.result:
        Test case for bug #12887 Distinct is not always applied after rollup
      mysql-test/t/olap.test:
        Test case for bug #12887 Distinct is not always applied after rollup
      36d163d6
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-12723 · 1600ee94
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      vio/viosocket.c:
        Auto merged
      1600ee94
    • unknown's avatar
      Turn off EOLN_NATIVE flag of some test files · c11974e6
      unknown authored
      
      mysql-test/r/analyze.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/create_select_tmp.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/flush_block_commit.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/flush_table.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/have_moscow_leap_timezone.require:
        Turn off EOLN_NATIVE flag
      mysql-test/r/have_outfile.require:
        Turn off EOLN_NATIVE flag
      mysql-test/r/innodb-lock.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/lock_multi.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_commit_after_flush.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_drop.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_free_items.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_delete2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_update.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_multi_update2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_server_id1.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_server_id2.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_set_charset.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/rpl_start_stop_slave.result:
        Turn off EOLN_NATIVE flag
      mysql-test/r/timezone3.result:
        Turn off EOLN_NATIVE flag
      c11974e6
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 · f6da85f4
      unknown authored
      into  mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106:
        Auto merged
      BitKeeper/deleted/.del-ctype_tis620-master.opt~38b79f80b9348a14:
        Auto merged
      BitKeeper/deleted/.del-ansi-master.opt~4d337eb61642a838:
        Auto merged
      BitKeeper/deleted/.del-convert.test~f4ceb743194dfe72:
        Auto merged
      BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
        Auto merged
      BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
        Auto merged
      BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
        Auto merged
      BitKeeper/deleted/.del-ctype_ujis-master.opt~9f5cc09930fc1cf9:
        Auto merged
      BitKeeper/deleted/.del-query_cache_notembedded.test:
        Auto merged
      BitKeeper/deleted/.del-rpl000016-slave.opt~ef76f85ddcc13b87:
        Auto merged
      mysql-test/t/analyze.test:
        Auto merged
      mysql-test/t/ansi.test:
        Auto merged
      mysql-test/t/backup-master.sh:
        Auto merged
      mysql-test/t/bdb-alter-table-2-master.opt:
        Auto merged
      mysql-test/t/bdb-deadlock.test:
        Auto merged
      mysql-test/t/bdb_cache-master.opt:
        Auto merged
      mysql-test/t/bdb_cache.test:
        Auto merged
      mysql-test/t/bool.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/constraints.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/ctype_cp1251.test:
        Auto merged
      mysql-test/t/ctype_latin1_de-master.opt:
        Auto merged
      mysql-test/t/ctype_latin1_de.test:
        Auto merged
      mysql-test/t/ctype_tis620.test:
        Auto merged
      mysql-test/t/ctype_ujis.test:
        Auto merged
      mysql-test/t/drop_temp_table.test:
        Auto merged
      mysql-test/t/func_concat.test:
        Auto merged
      mysql-test/t/func_encrypt-master.opt:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/func_if.test:
        Auto merged
      mysql-test/t/func_isnull.test:
        Auto merged
      mysql-test/t/gcc296.test:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant_cache.test:
        Auto merged
      mysql-test/t/init_file-master.opt:
        Auto merged
      mysql-test/t/init_file.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb_cache-master.opt:
        Auto merged
      mysql-test/t/innodb_cache.test:
        Auto merged
      mysql-test/t/innodb_handler.test:
        Auto merged
      mysql-test/t/isam.test:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      mysql-test/t/lock_tables_lost_commit-master.opt:
        Auto merged
      mysql-test/t/lock_tables_lost_commit.test:
        Auto merged
      mysql-test/t/lowercase_table-master.opt:
        Auto merged
      mysql-test/t/lowercase_table.test:
        Auto merged
      mysql-test/t/lowercase_table2.test:
        Auto merged
      mysql-test/t/lowercase_table3-master.opt:
        Auto merged
      mysql-test/t/lowercase_table3.test:
        Auto merged
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Auto merged
      mysql-test/t/multi_update-master.opt:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/myisam-blob-master.opt:
        Auto merged
      mysql-test/t/myisam-blob.test:
        Auto merged
      mysql-test/t/mysqlbinlog-master.opt:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      mysql-test/t/packet.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/query_cache_merge.test:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_alter.test:
        Auto merged
      mysql-test/t/rpl_chain_temp_table.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_do_grant.test:
        Auto merged
      mysql-test/t/rpl_empty_master_crash.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table-slave.opt:
        Auto merged
      mysql-test/t/rpl_commit_after_flush.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_failsafe.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-master.opt:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-master.sh:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-slave.opt:
        Auto merged
      mysql-test/t/rpl_flush_log_loop-slave.sh:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_get_lock.test:
        Auto merged
      mysql-test/t/rpl_heap.test:
        Auto merged
      mysql-test/t/rpl_ignore_grant-slave.opt:
        Auto merged
      mysql-test/t/rpl_ignore_grant.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_free_items.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m-master.opt:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_m.test:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_s-slave.opt:
        Auto merged
      mysql-test/t/rpl_loaddata_rule_s.test:
        Auto merged
      mysql-test/t/rpl_loaddatalocal.test:
        Auto merged
      mysql-test/t/rpl_log-master.opt:
        Auto merged
      mysql-test/t/rpl_log-slave.opt:
        Auto merged
      mysql-test/t/rpl_master_pos_wait.test:
        Auto merged
      mysql-test/t/rpl_max_relay_size.test:
        Auto merged
      mysql-test/t/rpl_multi_delete-slave.opt:
        Auto merged
      mysql-test/t/rpl_multi_delete.test:
        Auto merged
      mysql-test/t/rpl_multi_delete2.test:
        Auto merged
      mysql-test/t/rpl_optimize.test:
        Auto merged
      mysql-test/t/rpl_relayspace-slave.opt:
        Auto merged
      mysql-test/t/rpl_relayspace.test:
        Auto merged
      mysql-test/t/rpl_reset_slave.test:
        Auto merged
      mysql-test/t/rpl_skip_error-slave.opt:
        Auto merged
      mysql-test/t/rpl_skip_error.test:
        Auto merged
      mysql-test/t/rpl_multi_update.test:
        Auto merged
      mysql-test/t/rpl_multi_update2.test:
        Auto merged
      mysql-test/t/rpl_server_id1.test:
        Auto merged
      mysql-test/t/rpl_server_id2.test:
        Auto merged
      mysql-test/t/rpl_set_charset.test:
        Auto merged
      mysql-test/t/rpl_start_stop_slave.test:
        Auto merged
      mysql-test/t/rpl_trunc_binlog.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/system_mysql_db_refs.test:
        Auto merged
      mysql-test/t/system_mysql_db_fix-master.opt:
        Auto merged
      mysql-test/t/timezone-master.opt:
        Auto merged
      mysql-test/t/timezone.test:
        Auto merged
      mysql-test/t/type_set.test:
        Auto merged
      mysql-test/t/variables-master.opt:
        Auto merged
      mysql-test/t/timezone3.test:
        Auto merged
      f6da85f4
    • unknown's avatar
      Turn off EOLN_NATIVE flag for all test files · 900645b8
      unknown authored
      Ignored some generated files
      
      
      mysql-test/t/analyze.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ansi-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ansi.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/backup-master.sh:
        Turn off EOLN_NATIVE flag
      mysql-test/t/bdb-alter-table-2-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/bdb-deadlock.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/bdb_cache-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/bdb_cache.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/bool.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/cast.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/constraints.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/convert.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/create_select_tmp.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_cp1251-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_cp1251.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_latin1_de-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_latin1_de.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_tis620-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_tis620.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_ujis-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/ctype_ujis.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/drop_temp_table.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/flush_block_commit.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/func_concat.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/func_encrypt-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/func_if.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/func_isnull.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/gcc296.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/grant.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/grant_cache-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/grant_cache.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/init_file-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/init_file.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/innodb-deadlock.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/innodb-lock.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/innodb_cache-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/innodb_cache.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/innodb_handler.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/isam.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/loaddata.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lock_multi.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lock_tables_lost_commit-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lock_tables_lost_commit.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lowercase_table-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lowercase_table.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lowercase_table2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lowercase_table3-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/lowercase_table3.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/mix_innodb_myisam_binlog-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/multi_update-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/myisam-blob-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/myisam-blob.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/mysqlbinlog-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/mysqlbinlog.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/mysqldump.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/packet.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/query_cache.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/query_cache_merge.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/query_cache_notembedded.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/repair.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/repair_part2-master.sh:
        Turn off EOLN_NATIVE flag
      mysql-test/t/repair_part2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl000016-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_EE_error.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_alter.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_chain_temp_table.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_change_master.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_commit_after_flush.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_do_grant.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_drop.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_empty_master_crash.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_error_ignored_table-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_error_ignored_table.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_failsafe.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_flush_log_loop-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_flush_log_loop-master.sh:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_flush_log_loop-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_flush_log_loop-slave.sh:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_flush_log_loop.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_free_items-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_free_items.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_get_lock.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_heap.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_ignore_grant-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_ignore_grant.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_insert_id.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddata.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddata_rule_m-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddata_rule_m.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddata_rule_s-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddata_rule_s.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_loaddatalocal.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_log-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_log-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_master_pos_wait.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_max_relay_size.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_delete-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_delete.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_delete2-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_delete2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_update.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_update2-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_multi_update2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_optimize.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_relayspace-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_relayspace.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_reset_slave.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_server_id1.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_server_id2-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_server_id2.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_set_charset.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_skip_error-slave.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_skip_error.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_start_stop_slave.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/rpl_trunc_binlog.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/system_mysql_db.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/system_mysql_db_fix-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/system_mysql_db_fix.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/system_mysql_db_refs.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/timezone-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/timezone.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/timezone3-master.opt:
        Turn off EOLN_NATIVE flag
      mysql-test/t/timezone3.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/type_set.test:
        Turn off EOLN_NATIVE flag
      mysql-test/t/variables-master.opt:
        Turn off EOLN_NATIVE flag
      BitKeeper/etc/ignore:
        added support-files/MacOSX/preflight
      900645b8
    • unknown's avatar
      ndb - bug#9994 backpatch fixes from 5.0 · 6363fd57
      unknown authored
            IGNORE on merge 4.1->5.0
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        bug#9994 backpatch fixes from 5.0
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        bug#9994 backpatch fixes from 5.0
      ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
        bug#9994 backpatch fixes from 5.0
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        bug#9994 backpatch fixes from 5.0
      ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
        bug#9994 backpatch fixes from 5.0
      6363fd57
  6. 14 Sep, 2005 6 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 6a47ca25
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      6a47ca25
    • unknown's avatar
      Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent). · abd4974f
      unknown authored
      
      mysql-test/lib/mtr_process.pl:
        Handle errors in child processes separate from the parent process (patch supplied by Kent).
      mysql-test/lib/mtr_report.pl:
        New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
        Expected to avoid HUP signals.
      abd4974f
    • unknown's avatar
      Bug#12920 - key_read_requests counter appears to re-set · 5fe65297
      unknown authored
      After merge fix.
      
      
      include/keycache.h:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Status variables moved into KEY_CACHE in 4.1.
        Enlarging them there.
      include/my_sys.h:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Status variables moved into KEY_CACHE in 4.1.
        Removed unused global variables.
      myisam/mi_test2.c:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Status variables moved into KEY_CACHE in 4.1.
        Changed to print default key cache status.
      mysys/mf_keycache.c:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Status variables moved into KEY_CACHE in 4.1.
        Changed their debug printout.
      sql/mysqld.cc:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Changed to print full value.
      sql/sql_show.cc:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Added a branch for long long values.
      sql/sql_test.cc:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        changed to print full values.
      sql/structs.h:
        Bug#12920 - key_read_requests counter appears to re-set
        After merge fix.
        Added a branch for long long keycache values.
      5fe65297
    • unknown's avatar
      Minor output format change of the Perl test suite script (align with the shell script). · a5903ed9
      unknown authored
      
      mysql-test/lib/mtr_report.pl:
        Make the Perl test script output identical to that of the (old) shell script,
        so that reported differences compare as equal strings (for automatic analysis).
      a5903ed9
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.0-4000 · 683e228a
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      include/my_sys.h:
        Bug#12920 - key_read_requests counter appears to re-set
        Manual merge requiring after merge fix.
      myisam/mi_test2.c:
        Bug#12920 - key_read_requests counter appears to re-set
        Manual merge requiring after merge fix.
      mysys/mf_keycache.c:
        Bug#12920 - key_read_requests counter appears to re-set
        Manual merge requiring after merge fix.
      sql/mysqld.cc:
        Bug#12920 - key_read_requests counter appears to re-set
        Manual merge requiring after merge fix.
      sql/sql_test.cc:
        Bug#12920 - key_read_requests counter appears to re-set
        Manual merge requiring after merge fix.
      683e228a
    • unknown's avatar
      Bug#12920 - key_read_requests counter appears to re-set · 07b61cbb
      unknown authored
      Enlarged the counter variables to ulonglong.
      
      
      07b61cbb
  7. 13 Sep, 2005 4 commits
  8. 12 Sep, 2005 11 commits