1. 30 Aug, 2005 10 commits
  2. 29 Aug, 2005 18 commits
    • unknown's avatar
      Fix for BUG#12720: In QUICK_RANGE_SELECT::reset(), reset in_range so next get_next() call · 17ffd514
      unknown authored
      doesn't continue reading the last range.
      
      
      mysql-test/r/index_merge_innodb.result:
        Testcase for BUG#12720
      mysql-test/t/index_merge_innodb.test:
        Testcase for BUG#12720
      17ffd514
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 5bd86195
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      5bd86195
    • unknown's avatar
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · d985a7b1
      unknown authored
      into lmy004.:/work/mysql-5.0-clean
      
      d985a7b1
    • unknown's avatar
      Remove a no longer used header. · aa5cd9de
      unknown authored
      aa5cd9de
    • unknown's avatar
      Cleanup the instance manager code. · 1f888f62
      unknown authored
      
      BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53:
        Delete: server-tools/instance-manager/factory.h
      BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d:
        Delete: server-tools/instance-manager/factory.cc
      server-tools/instance-manager/Makefile.am:
        - remove Commands_factory: it'll be needed when we add support
        for NNTP/HTTP connections, currently it only adds unnecessary
        complexity.
      server-tools/instance-manager/commands.cc:
        - fix coding style: no else after return; fix comments, make
        one place a bit faster.
      server-tools/instance-manager/guardian.cc:
        - fix coding style and comments.
        - we must register the current thread in the thread registry
          before entering pthread_cond_timedwait, because at shutdown
          the thread registry will try to kick out of wait all blocked 
          threads. Unregistered threads are not awakened by the registry. 
          This fixes the failinig assert in Thread_registry::~Thread_registry
          at shutdown, when shutdown is requested and there is an
          instance monitored by Guardian.
      server-tools/instance-manager/guardian.h:
        - fix coding style: enums must start with enum_
      server-tools/instance-manager/instance.h:
        - move comment to the variable it comments
      server-tools/instance-manager/instance_map.cc:
        - cleanup
      server-tools/instance-manager/instance_options.cc:
        - cleanup; no else after return (fix coding style).
      server-tools/instance-manager/manager.cc:
        - fix alignment; make some code easier to read.
      server-tools/instance-manager/mysql_connection.cc:
        - remove Commands_factory
      server-tools/instance-manager/options.cc:
        - fix a possible crash when the instance manager is started with
        --no-defaults --defaults-file=~/.my.cnf: if we return
        without cloning saved_argv by calling load_defaults, Options::cleanup
        will crash on attempt to free_defaults(saved_argv);
      server-tools/instance-manager/parse.cc:
        - get rid of Commands_factory
      server-tools/instance-manager/parse.h:
        - get rid of Commands_factory
      server-tools/instance-manager/parse_output.cc:
        - in parse_output_and_get_value return error also if the specified
          pattern was not found, or the command failed to execute.
      server-tools/instance-manager/portability.h:
        - fix coding style (// comments are allowed only at ends of lines)
      server-tools/instance-manager/thread_registry.cc:
        - implement Thread_registry::cond_timedwait
      server-tools/instance-manager/thread_registry.h:
        - implement Thread_registry::cond_timedwait; remove
          unused out parameter from Thread_registry::cond_wait.
      server-tools/instance-manager/user_map.cc:
        - safety: newline can take 2 bytes.
      1f888f62
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · a74be2a1
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      a74be2a1
    • unknown's avatar
      fix for bug 12207 (alter table discard tablespace on MyISAM table · d53350b3
      unknown authored
      causes ERROR 2013).
      (all-in-one approved patch)
      
      
      mysql-test/r/alter_table.result:
        result for test for bug #12207
        (alter table discard database works on mysiam and causes error 2013)
      mysql-test/t/alter_table.test:
        test for bug #12207 (alter table discard tablescpae on MyISAM table
        causes ERROR 2013)
      sql/sql_table.cc:
        send all error message to table->file->print_error() thus not missing
        handing of some (like engine not supported).
        
        fix for bug #12207 (alter table discard tablespace on MyISAM table
        causes ERROR 2013)
      d53350b3
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-12705 · 800ba5b9
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      800ba5b9
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 2338c1ea
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      sql/item.h:
        don't merge bug#12371 fix into 5.0.
        It's correct only for 4.1.
      2338c1ea
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11523 · 876c588a
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      client/mysql.cc:
        Auto merged
      876c588a
    • unknown's avatar
      Fix for BUG#12672. · abd50a93
      unknown authored
      
      mysql-test/r/group_min_max.result:
        Test for BUG#12672.
      mysql-test/t/group_min_max.test:
        Test for BUG#12672.
      sql/opt_range.cc:
        Some storage managers like InnoDB always retrieve the value of
        the primary key (if any) with any other key. For such storage
        managers the optimizer marks an index as covering if that index
        and the primary key contain all query fields. This is good for
        reading data from an index, but not for lookup. The patch detects
        such cases and tests whether an index is really a covering index
        by itself, without the primary key. If yes, then that index can
        be used for the index skip algorithm of the GROUP_MIN_MAX
        access method.
      abd50a93
    • unknown's avatar
      fix for bug #12841 · dd62a4bd
      unknown authored
      (Server crash on DO IFNULL(NULL,NULL)
      (fixes also "SELECT CAST(IFNULL(NULL,NULL) as DECIMAL)" unreported
       crash)
      (new revampled fix with suggestions from Igor)
      
      
      mysql-test/r/select.result:
        result of test for bug 12841
      mysql-test/t/select.test:
        test for bug #12841
        (Server crash on DO IFNULL(NULL,NULL)
      sql/item_func.cc:
        don't use the return value of ::str_op() without checking it
        whether checking it for NULL. (fixes bug #12841 as well as
        another not reported bug, but existing one - test case added).
        All other places where ::str_op() is used are safe.
      dd62a4bd
    • unknown's avatar
      ctype_utf8.result, ctype_utf8.test, item.cc: · f68520c9
      unknown authored
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      
      
      sql/item.cc:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      mysql-test/t/ctype_utf8.test:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      mysql-test/r/ctype_utf8.result:
        Bug#12371 executing prepared statement fails (illegal mix of collations)
        After review fixes.
      f68520c9
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · ead894c1
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12371
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      ead894c1
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7e128939
      unknown authored
      into lmy004.:/work/mysql-5.0-ready4
      
      
      sql/sql_yacc.yy:
        Auto merged
      7e128939
    • unknown's avatar
      fix for bug #12490 (all-in-one patch) · abffcad7
      unknown authored
      (Packets out of order if calling HELP CONTENTS from Stored Procedure)
      
      
      mysql-test/r/sp-error.result:
        results of test of bug 12490
      mysql-test/t/sp-error.test:
        test for bug 12490
        (Packets out of order if calling HELP CONTENTS from Stored Procedure)
      sql/sql_yacc.yy:
        disable HELP in SP
        (fixes bug 12490)
      abffcad7
    • unknown's avatar
      Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33e9fee9
      unknown authored
      into  127.(none):/home/osku/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      33e9fee9
  3. 28 Aug, 2005 6 commits
  4. 27 Aug, 2005 6 commits