1. 30 Jan, 2006 10 commits
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b16c7d2a
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      b16c7d2a
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss20 · 8482d147
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss20
      
      
      innobase/btr/btr0sea.c:
        Null merged
      innobase/fil/fil0fil.c:
        Null merged
      8482d147
    • unknown's avatar
      Fixed BUG#15653, BUG#16582. · 8eaf6f11
      unknown authored
        Applied innodb-4.1-ss20 snapshot.
      
      
      innobase/btr/btr0sea.c:
        Applied innodb-4.1-ss20 snapshot.
          Account for a race condition when dropping the adaptive
          hash index for a B-tree page (Bug #16582).
          btr_search_drop_page_hash_index(): Retry the operation if a hash
          index with different parameters was built meanwhile. Add
          diagnostics for the case that hash node pointers to the page
          remain. This fix is from Heikki.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      innobase/fil/fil0fil.c:
        Applied innodb-4.1-ss20 snapshot.
          Keep track on unflushed modifications to file spaces. When
          there are tens of thousnads of file spaces, flushing all files
          in fil_flush_file_spaces() would be very slow (Bug #16582).
          fil_flush_file_spaces(): Only flush unflushed file spaces.
          fil_space_t, fil_system_t: Add a list of unflushed spaces.
      innobase/include/btr0sea.ic:
        Applied innodb-4.1-ss20 snapshot.
          btr_search_info_update_hash(), btr_search_info_update_slow():
          Document the parameter "info" as in/out.
      8eaf6f11
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6065cacb
      unknown authored
      into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
      
      
      6065cacb
    • unknown's avatar
      Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 · d42c472e
      unknown authored
      into  selena.:H:/MYSQL/src/#15634-mysql-5.0
      
      
      sql/field.cc:
        Auto merged
      d42c472e
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · e6d7f242
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
      
      
      e6d7f242
    • unknown's avatar
      Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss17 · 78c0d5d5
      unknown authored
      into  mysql.com:/home/alexi/innodb/mysql-5.0-ss17
      
      
      innobase/dict/dict0dict.c:
        Null merged
      mysql-test/r/innodb.result:
        Null merged
      mysql-test/t/innodb.test:
        Null merged
      78c0d5d5
    • unknown's avatar
      Fixed BUG#16387. · cc47eb77
      unknown authored
        Applied innodb-4.1-ss17 snapshot.
        Do not mistake TABLENAME_ibfk_0 for auto-generated id.
      
      
      innobase/dict/dict0dict.c:
        Applied innodb-4.1-ss17 snapshot.
          dict_table_get_highest_foreign_id(): Ignore foreign
          constraint identifiers starting with the pattern
          TABLENAME_ibfk_0 (BUG#16387).
      mysql-test/r/innodb.result:
        Applied innodb-4.1-ss17 snapshot.
          Fixed results for added test case.
      mysql-test/t/innodb.test:
        Applied innodb-4.1-ss17 snapshot.
          Added test case.
      cc47eb77
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719 · d1ed8e22
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
      
      
      sql-common/client.c:
        Auto merged
      tests/mysql_client_test.c:
        Merge
      d1ed8e22
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 462fcf40
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      462fcf40
  2. 29 Jan, 2006 1 commit
    • unknown's avatar
      information_schema_db.result, information_schema.result: · ef0cd2f5
      unknown authored
        Fix test result.
      table.h, sql_show.cc:
        Put I_S tables in lexical order.
      
      
      sql/sql_show.cc:
        Put I_S tables in lexical order.
      sql/table.h:
        Put I_S tables in lexical order.
      mysql-test/r/information_schema.result:
        Fix test result.
      mysql-test/r/information_schema_db.result:
        Fix test result.
      ef0cd2f5
  3. 28 Jan, 2006 1 commit
    • unknown's avatar
      Fixed bug #16260. · 6bfbba34
      unknown authored
      The problem has manifested itself in the cases when we have a nested outer join
      for which it can be inferred that one of the inner tables is a single row table.
      
      
      mysql-test/r/join_nested.result:
        Added a test case for bug #16260.
      mysql-test/t/join_nested.test:
        Added a test case for bug #16260.
      sql/sql_select.cc:
        Fixed bug #16260.
        The problem has manifested itself in the cases when we have a nested outer join
        for which it can be inferred that one of the inner tables is a single row table.
        A table is never considered as a const table if it is used in a nested join 
        that serves as an inner operand of an outer join.
      6bfbba34
  4. 27 Jan, 2006 4 commits
    • unknown's avatar
      BUG# 14768 · e13a840a
      unknown authored
      Added fixes to make last_insert_id() to work.
      
      
      mysql-test/r/federated.result:
        BUG #14768
        
        New test results for last_insert_id()
      mysql-test/t/federated.test:
        BUG #14768
        
        Tests for last_insert_id()
      sql/ha_federated.cc:
        BUG# 14768
        
        * Added code to set last_insert_id()
        * Added code to free share->scheme
      sql/ha_federated.h:
        BUG #14768
        
        New method for setting last_insert_id()
      e13a840a
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 65779cc7
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      65779cc7
    • unknown's avatar
      Merge... · 7ee0c6b5
      unknown authored
      Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/rpl000001.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/r/rpl_loaddata_rule_m.result:
        Auto merged
      mysql-test/r/rpl_loaddata_rule_s.result:
        Auto merged
      mysql-test/r/rpl_misc_functions.result:
        Auto merged
      mysql-test/r/rpl_replicate_do.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view_grant.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl000001.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_loaddata_rule_s.test:
        Auto merged
      mysql-test/t/rpl_misc_functions.test:
        Auto merged
      mysql-test/t/rpl_replicate_do.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/trigger-compat.test:
        Auto merged
      mysql-test/r/trigger-compat.result:
        Merge
      7ee0c6b5
    • unknown's avatar
      Use MYSQLTEST_VARDIR · f300c891
      unknown authored
      
      mysql-test/t/information_schema.test:
        Use MYSQLTEST_VARDIR instead of MYSQL_TEST_DIR/var
      f300c891
  5. 26 Jan, 2006 5 commits
    • unknown's avatar
      Add new option "check-testcases" to mysql-test-run.pl · 313ea47d
      unknown authored
      Cleanup the sideeffects from most of the  testcases with sideeffects.
      
      
      mysql-test/mysql-test-run.pl:
        Add option "check-testcases" to mysql-test-run.pl
        Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
        After the teastcase it will run again and this time compare the output with previously recorded file.
      mysql-test/r/analyze.result:
        Drop table t1 at end of test
      mysql-test/r/create_select_tmp.result:
        Drop table t1 at end of test
      mysql-test/r/ctype_cp932.result:
        Drop table t1 at end of test
      mysql-test/r/ctype_recoding.result:
        Drop table t1 at end of test
      mysql-test/r/grant2.result:
        Drop user mysqltest_2 and mysqltest_A@'%'
      mysql-test/r/join_outer.result:
        Drop view v1 to cleanup
      mysql-test/r/ps_1general.result:
        Drop table t1 at end of test
      mysql-test/r/query_cache.result:
        Drop function "f1"
      mysql-test/r/read_only.result:
        Reset the "read_only" flag
      mysql-test/r/rpl000001.result:
        Remove user "blafasel2"
      mysql-test/r/rpl000017.result:
        Remove user "replicate"
      mysql-test/r/rpl_failed_optimize.result:
        Drop table t1 to cleanup
      mysql-test/r/rpl_flush_tables.result:
        Drop tables t3, t4, t5
      mysql-test/r/rpl_ignore_revoke.result:
        Delete user "user_foo"
      mysql-test/r/rpl_insert_id.result:
        Drop table t1 to cleanup
      mysql-test/r/rpl_loaddata.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_loaddata_rule_m.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_loaddata_rule_s.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_misc_functions.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_multi_update3.result:
        Drop tyable t1 and t2 to cleanup
      mysql-test/r/rpl_replicate_do.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_skip_error.result:
        Drop tyable t1 to cleanup
      mysql-test/r/rpl_slave_status.result:
        Drop tyable t1 to cleanup
      mysql-test/r/sp-prelocking.result:
        Drop view v1 and tables t1, t2, t3 and t4 to cleanup
      mysql-test/r/sp-security.result:
        Delete users to cleanup
        Delete remaining traces in tables_priv and procs_priv
      mysql-test/r/subselect_innodb.result:
        Drop procedure p1 to cleanup
      mysql-test/r/trigger-compat.result:
        Drop trigger wl2818_trg1 and wl2818_trg2.
        Drop table t1, t2
        Drop database mysqltest_db1
        And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
      mysql-test/r/type_bit.result:
        Drop tables t1 and t2 to cleanup
      mysql-test/r/variables.result:
        Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
      mysql-test/r/view_grant.result:
        Dop user "test@localhost" to cleanup
      mysql-test/t/analyze.test:
        Drop table t1 to cleanup
      mysql-test/t/create_select_tmp.test:
        Drop table t1 to cleanup
      mysql-test/t/ctype_cp932.test:
        Drop table t1 to cleanup
      mysql-test/t/ctype_recoding.test:
        Drop table t1 to cleanup
      mysql-test/t/fulltext_var.test:
        Restore the original ft_boolean_syntax
      mysql-test/t/grant2.test:
        Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
      mysql-test/t/innodb_cache.test:
        Reset query_cache_size to original value
      mysql-test/t/join_outer.test:
        Drop view v1 to cleanup
      mysql-test/t/ps_1general.test:
        Drop table t1 to cleanup
      mysql-test/t/query_cache.test:
        Drop function "f1" to cleanup
      mysql-test/t/read_only.test:
        Reset the readonly flag
      mysql-test/t/rpl000001.test:
        Delete user "blafasel2" to cleanup
      mysql-test/t/rpl000017.test:
        Delete user "replicate" to cleanup
      mysql-test/t/rpl_failed_optimize.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_flush_tables.test:
        Droip table t3, t4 and t5 to cleanup
      mysql-test/t/rpl_ignore_revoke.test:
        Delet user "user_foo" to cleanup
      mysql-test/t/rpl_insert_id.test:
        drop table t1 to cleanup
      mysql-test/t/rpl_loaddata.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_loaddata_rule_m.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_loaddata_rule_s.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_misc_functions.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_multi_update3.test:
        Drop table t1 and t2 to cleanup
      mysql-test/t/rpl_replicate_do.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_skip_error.test:
        Drop table t1 to cleanup
      mysql-test/t/rpl_slave_status.test:
        Drop table t1 to cleanup
      mysql-test/t/sp-prelocking.test:
        Drop table t1, t2 t3 and t4 to cleanup
        Drop view v1
      mysql-test/t/sp-security.test:
        Delete  test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
        Drop table t1 to cleanup
      mysql-test/t/subselect_innodb.test:
        Drop procedure p1 to cleanup
      mysql-test/t/trigger-compat.test:
        Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
        Drop table t1, t2
        Drop users
        drop database mysqltest_db1
      mysql-test/t/type_bit.test:
        drop table t1 and t2 to cleanup
      mysql-test/t/variables-master.opt:
        Increase max_join_size to 100.
      mysql-test/t/variables.test:
        Set max_join_size to 10, which was the original value in variables-master.opt
      mysql-test/t/view_grant.test:
        Drop the user "test@localhost"
      mysql-test/include/check-testcase.test:
        New BitKeeper file ``mysql-test/include/check-testcase.test''
      313ea47d
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 6c6e0690
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      mysql-test/t/trigger-grant.test:
        Merge
      6c6e0690
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 9815d9ae
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      9815d9ae
    • unknown's avatar
      Merge · 615e35fb
      unknown authored
      615e35fb
    • unknown's avatar
      Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connect · f220f892
      unknown authored
       - Move init of "reconnect" variable to mysql_init 
       - Add test case to mysql_client_test.
      
      
      sql-common/client.c:
        Move initialisation of reconnect variable to mysql_init instead of doing it in mysql_real_connect.
      tests/mysql_client_test.c:
        Add test to check that reconnect is not modified by a call to mysql_real_connect
      f220f892
  6. 25 Jan, 2006 6 commits
  7. 24 Jan, 2006 13 commits