1. 11 Dec, 2007 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 0813b6f5
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/buf/buf0flu.c:
        Auto merged
      storage/innobase/buf/buf0lru.c:
        Auto merged
      storage/innobase/include/buf0buf.h:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/include/sync0arr.h:
        Auto merged
      storage/innobase/include/sync0rw.h:
        Auto merged
      storage/innobase/include/sync0rw.ic:
        Auto merged
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/os/os0sync.c:
        Auto merged
      storage/innobase/sync/sync0arr.c:
        Auto merged
      storage/innobase/sync/sync0rw.c:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      0813b6f5
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 1cdc43dd
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      innobase/buf/buf0buf.c:
        use local (null merge)
      innobase/buf/buf0flu.c:
        use local (null merge)
      innobase/buf/buf0lru.c:
        use local (null merge)
      innobase/include/buf0buf.h:
        use local (null merge)
      innobase/include/buf0buf.ic:
        use local (null merge)
      innobase/include/sync0arr.h:
        Auto merged
      innobase/include/sync0rw.h:
        use local (null merge)
      innobase/include/sync0rw.ic:
        use local (null merge)
      innobase/include/sync0sync.h:
        use local
      innobase/os/os0sync.c:
        use local (null merge)
      innobase/sync/sync0arr.c:
        use local (null merge)
      innobase/sync/sync0rw.c:
        use local (null merge)
      innobase/sync/sync0sync.c:
        use local (null merge)
      mysql-test/mysql-test-run.pl:
        use local (null merge)
      1cdc43dd
  2. 10 Dec, 2007 1 commit
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-bug15815 · d802c0ac
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/buf/buf0flu.c:
        Auto merged
      innobase/buf/buf0lru.c:
        Auto merged
      innobase/include/buf0buf.h:
        Auto merged
      innobase/include/buf0buf.ic:
        Auto merged
      innobase/include/sync0arr.h:
        Auto merged
      innobase/include/sync0rw.h:
        Auto merged
      innobase/include/sync0rw.ic:
        Auto merged
      innobase/include/sync0sync.h:
        Auto merged
      innobase/os/os0sync.c:
        Auto merged
      innobase/sync/sync0arr.c:
        Auto merged
      innobase/sync/sync0rw.c:
        Auto merged
      innobase/sync/sync0sync.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      d802c0ac
  3. 07 Dec, 2007 9 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 7d734a87
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      7d734a87
    • unknown's avatar
      Add a way to remove options which mysql-test-run.pl no longer uses. · f77684f3
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Add a way to remove options which mysql-test-run.pl no longer uses.  Since
        mysql-test-run.pl passes unrecognized options through to mysqld directly,
        it is not possible to just remove an option.  Otherwise it would be given
        to mysqld, which probably will not recognize it and will fail to start.
        
        Instead, we now explicitly ignore the option, and print a warning to
        the user.
      f77684f3
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · cba3ed19
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_table.cc:
        Auto merged
      cba3ed19
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 284cb0e5
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
      
      
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/grant.result:
        Manual merge
      mysql-test/t/grant.test:
        Manual merge
      284cb0e5
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · a4df2210
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      sql/sql_table.cc:
        Auto merged
      a4df2210
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 6e776686
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
      
      
      mysql-test/t/grant.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      mysql-test/r/grant.result:
        Manual merge
      6e776686
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 8c033250
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      strings/ctype-simple.c:
        use local (null merge)
      8c033250
    • unknown's avatar
      Make tests more robust (clean up better after grant.test) · 7d3a61e1
      unknown authored
      
      mysql-test/r/grant.result:
        Update test results to .test changes
      mysql-test/t/grant.test:
        Drop users when done with them, to avoid skewing results of later tests.
        
        For example, running some test which examines the cardinality of the
        mysql.user table would fail if run right after this test, due to the
        extra users.
      7d3a61e1
    • unknown's avatar
      Move the test case for bug #20901 from create.test to grant.test, so · 20bbe71d
      unknown authored
      testing embedded server works correctly.
      
      
      mysql-test/r/create.result:
        Move one test from create.test to grant.test, because it actually tests
        privileges (and thus doesn't work with embedded server).
      mysql-test/r/grant.result:
        Move one test from create.test to grant.test, because it actually tests
        privileges (and thus doesn't work with embedded server).
      mysql-test/t/create.test:
        Move one test from create.test to grant.test, because it actually tests
        privileges (and thus doesn't work with embedded server).
      mysql-test/t/grant.test:
        Move one test from create.test to grant.test, because it actually tests
        privileges (and thus doesn't work with embedded server).
      20bbe71d
  4. 06 Dec, 2007 2 commits
  5. 05 Dec, 2007 8 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 80360321
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
      
      
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/suite/binlog/t/binlog_killed.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      mysql-test/t/func_misc.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      80360321
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · a9383147
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      a9383147
    • unknown's avatar
      Post-merge fix (reorder tests in ctype_ucs.test) · 98ab044d
      unknown authored
      
      mysql-test/t/ctype_ucs.test:
        Post-merge fix (fix order of tests to match results).
      98ab044d
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 068b6e42
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
      
      
      client/mysqldump.c:
        Auto merged
      include/my_base.h:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/suite/rpl/t/rpl_ssl.test:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/records.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      storage/myisam/ft_boolean_search.c:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysql-test/t/log_state.test:
        Manual merge fix-up
      mysql-test/include/mix1.inc:
        Manual merge
      mysql-test/r/ctype_ucs.result:
        Manual merge
      mysql-test/r/func_misc.result:
        Manual merge
      mysql-test/r/innodb_mysql.result:
        Manual merge
      mysql-test/r/key.result:
        Manual merge
      mysql-test/r/log_state.result:
        Manual merge
      mysql-test/suite/binlog/t/binlog_killed.test:
        Manual merge
      mysql-test/t/ctype_ucs.test:
        Manual merge
      mysql-test/t/func_misc.test:
        Manual merge
      mysql-test/t/key.test:
        Manual merge
      sql/item_strfunc.h:
        Manual merge
      strings/ctype-simple.c:
        Manual merge
      068b6e42
    • unknown's avatar
      Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 · b5f919dd
      unknown authored
      into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
      
      
      b5f919dd
    • unknown's avatar
      Bug#32996 log_tables.test fails sporadically · 6bfa2a01
      unknown authored
      Only select entries from the general_log that were issued by the current
      connection.
      
      
      mysql-test/r/log_tables.result:
        Update test result.
      mysql-test/t/log_tables.test:
        Only select entries from the current thread.
      6bfa2a01
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 55a420e1
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
      
      
      client/mysqldump.c:
        Auto merged
      include/my_sys.h:
        Auto merged
      libmysql/CMakeLists.txt:
        Auto merged
      libmysql/Makefile.shared:
        Auto merged
      myisam/ft_boolean_search.c:
        Auto merged
      myisam/sort.c:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Manual merge
      mysql-test/r/ctype_ucs.result:
        Manual merge
      mysql-test/r/func_misc.result:
        Manual merge
      mysql-test/t/binlog_killed.test:
        Manual merge
      mysql-test/t/ctype_ucs.test:
        Manual merge
      mysql-test/t/func_misc.test:
        Manual merge
      sql/item_strfunc.h:
        Manual merge
      strings/ctype-simple.c:
        Manual merge
      55a420e1
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9f26f5c0
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
      
      
      sql/set_var.cc:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Manual merge
      mysql-test/t/ctype_ucs.test:
        Manual merge
      9f26f5c0
  6. 04 Dec, 2007 2 commits
  7. 02 Dec, 2007 5 commits
  8. 01 Dec, 2007 11 commits