1. 21 Apr, 2005 2 commits
    • unknown's avatar
      InnoDB: Reduce memcpy() load in row_sel_pop_cached_row_for_mysql() · 7b07e332
      unknown authored
      by copying only a prefix of the row that covers the requested
      columns.
      
      
      innobase/include/row0mysql.h:
        row_prebuilt_struct: Add field mysql_prefix_len
        in order to reduce memcpy() time in
        row_sel_pop_cached_row_for_mysql().
      innobase/row/row0sel.c:
        row_sel_pop_cached_row_for_mysql(): memcpy() only
        mysql_prefix_len bytes instead of mysql_row_len.
      sql/ha_innodb.cc:
        build_template(): Initialize prebuilt->mysql_prefix_len.
      7b07e332
    • unknown's avatar
      InnoDB: Define some macros around GCC's __builtin_expect() · 4e0e9a3b
      unknown authored
      and __builtin_prefetch().
      Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      
      
      innobase/btr/btr0btr.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/btr/btr0cur.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/btr/btr0sea.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/include/univ.i:
        Define UNIV_EXPECT(), UNIV_LIKELY(), UNIV_UNLIKELY(),
        UNIV_LIKELY_NULL(), UNIV_PREFETCH_R() and UNIV_PREFETCH_RW().
      innobase/lock/lock0lock.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/page/page0cur.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/page/page0page.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/rem/rem0rec.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0ins.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0mysql.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0purge.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0row.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0sel.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0undo.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/row/row0upd.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      innobase/trx/trx0rec.c:
        Add UNIV_LIKELY_NULL to if (heap) mem_free_heap(heap) tests.
      4e0e9a3b
  2. 20 Apr, 2005 1 commit
    • unknown's avatar
      InnoDB: Make CHECK TABLE killable. (Bug #9730) · ea5c2a14
      unknown authored
      
      innobase/btr/btr0btr.c:
        Enclose btr_print_size() and btr_print_tree() in #ifdef UNIV_BTR_PRINT
        Add trx_t* parameter to btr_validate_tree() and btr_validate_level().
        btr_validate_level(): Call trx_is_interrupted() on each page.
      innobase/ibuf/ibuf0ibuf.c:
        Add trx_t* parameter to btr_validate_tree().
      innobase/include/btr0btr.h:
        Enclose btr_print_size() and btr_print_tree() in #ifdef UNIV_BTR_PRINT
        Add trx_t* parameter to btr_validate_tree().
      innobase/include/trx0trx.h:
        Declare trx_is_interrupted().
      innobase/row/row0mysql.c:
        row_scan_and_check_index(): Check trx_is_interrupted() every 1,000
        scanned rows.
        row_check_table_for_mysql(): Check trx_is_interrupted()
        for each index after btr_validate_tree().
      sql/ha_innodb.cc:
        Define trx_is_interrupted().
      ea5c2a14
  3. 18 Apr, 2005 4 commits
    • unknown's avatar
      InnoDB: Replace the redo log entry type · dfa485b4
      unknown authored
      MLOG_COMP_REC_SEC_DELETE_MARK with MLOG_REC_SEC_DELETE_MARK
      in order to reduce the space occupied by the redo log.
      
      
      innobase/btr/btr0cur.c:
        Replace MLOG_COMP_REC_SEC_DELETE_MARK with MLOG_REC_SEC_DELETE_MARK
        and eliminate redundant dict_index_t* parameters.
      innobase/ibuf/ibuf0ibuf.c:
        Remove unnecessary parameter to btr_cur_del_unmark_for_ibuf()
      innobase/include/btr0cur.h:
        Remove unnecessary dict_index_t* parameters
      innobase/include/mtr0mtr.h:
        Note that MLOG_COMP_REC_SEC_DELETE_MARK is obsolete
      innobase/log/log0recv.c:
        recv_parse_or_apply_log_rec_body():
        Ignore the index information in MLOG_COMP_REC_SEC_DELETE_MARK.
        Add assertions about page_is_comp().
      dfa485b4
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 44bab0ea
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      
      sql/sql_yacc.yy:
        Auto merged
      44bab0ea
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · ede0adac
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      
      ede0adac
    • unknown's avatar
      Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/clone-5.0.4-build · e371d05b
      unknown authored
      
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/mysql.server.sh:
        Auto merged
      e371d05b
  4. 17 Apr, 2005 5 commits
  5. 16 Apr, 2005 20 commits
    • unknown's avatar
      Post-merge fixes · be9b52bd
      unknown authored
      
      sql/opt_range.cc:
        Auto merged
      be9b52bd
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3c112262
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-look-range
      
      
      3c112262
    • unknown's avatar
      Fix for BUG#9348: when computing union of two intervals set lower bound to · 6b002314
      unknown authored
      minimum of lower bounds of two joined intervals.
      
      
      mysql-test/r/range.result:
        Testcase for BUG#9348
      mysql-test/t/range.test:
        Testcase for BUG#9348
      6b002314
    • unknown's avatar
      mysql.server script fixed to use mysqld_safe by default + lots of minor additions · b8f4f27e
      unknown authored
      
      scripts/make_binary_distribution.sh:
        add libexec expansion handling to make_binary_distribution
      support-files/mysql.server.sh:
        mysql.server init.d script fixed back to use mysqld_safe by default, as mysqlmanager does not handle all
        installation scenarious yet. + libexecdir template was added for mysqlmanager to deal nicely  with the
        source distribution
      b8f4f27e
    • unknown's avatar
      Fix for BUG#9439: · 9e5325ab
      unknown authored
      Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
      (this is the final cset with proper tests)
      
      
      mysql-test/r/show_check.result:
        Testcase for BUG#9439
      mysql-test/t/show_check.test:
        Testcase for BUG#9439
      sql/sql_show.cc:
        Fix for BUG#9439:
        Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
      9e5325ab
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-bug9188 · 1eb80661
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-bug9188
      
      
      myisam/myisampack.c:
        Auto merged
      1eb80661
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-bug9487 · ec280d6f
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug9188
      
      
      ec280d6f
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · f3feba87
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug9487
      
      
      f3feba87
    • unknown's avatar
      Merge · cef7e66e
      unknown authored
      
      myisam/mi_search.c:
        Auto merged
      myisam/mi_write.c:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/myisam.result:
        SCCS merged
      mysql-test/t/myisam.test:
        SCCS merged
      cef7e66e
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · dacff5a9
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-bug9188
      
      
      dacff5a9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 550fff6b
      unknown authored
      into mishka.local:/home/my/mysql-5.0
      
      
      550fff6b
    • unknown's avatar
      Set bindir, datadir & others if --basedir is given. This ensures that one only... · ca662711
      unknown authored
      Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
      Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
      Search first for defaults files in basedir and then in datadir (like mysqld_safe)
      
      
      support-files/mysql.server.sh:
        Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
        Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
        Search first for defaults files in basedir and then in datadir (like mysqld_safe)
        I removed the test for localstatedir as default.c doesn't anymore read defaults files from localstatedir
      ca662711
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4528fd15
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      4528fd15
    • unknown's avatar
      Added more rows to test to get predictable results · 48faa137
      unknown authored
      
      mysql-test/t/range.test:
        Added more rows to test to get predictable results
        (if it still fails, we need to add even more rows)
      scripts/make_binary_distribution.sh:
        Apply Jims patch for  mysql.server
      support-files/mysql.server.sh:
        Apply Jims patch to support mysqld_safe
      48faa137
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · e77860b7
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/item.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      e77860b7
    • unknown's avatar
      subselect.result, subselect.test: · d85fdc1b
      unknown authored
        Added a test case for bug #9516.
      item_subselect.h:
        Fixed bug #9516.
        The bug was due to that fact that the class Item_subselect
        inherited the generic implementation of the function
        not_null_tables that was not valid for the objects
        of this class. As a result evaluation of the
        not_null_tables attribute was not correct for subqueries.
        This caused invalid transformations of outer joins into
        inner joins.
      
      
      sql/item_subselect.h:
        Fixed bug #9516.
        The bug was due to that fact that the class Item_subselect
        inherited the generic implementation of the function
        not_null_tables that was not valid for the objects
        of this class. As a result evaluation of the
        not_null_tables attribute was not correct for subqueries.
        This caused invalid transformations of outer joins into
        inner joins.
      mysql-test/t/subselect.test:
        Added a test case for bug #9516.
      mysql-test/r/subselect.result:
        Added a test case for bug #9516.
      d85fdc1b
    • unknown's avatar
      subselect.result, subselect.test: · 2b92a78e
      unknown authored
        Added a test case for bug #9338.
      sql_select.cc:
        Fixed bug #9338.
        When an occurence of a field reference has to be replaced
        by another field reference the whole Item_field must be
        replaced.
      item.cc:
        Fixed bug #9338.
        The method Item_field::replace_equal_field_processor was
        replaced by Item_field::replace_equal_field. The new method
        is used to replace the occurences of Item_field objects.
      item.h:
        Fixed bug #9338.
        The virtual function replace_equal_field_processor was replaced
        by replace_equal_field. The latter is supposed to be used as a
        callback function in calls of the method transform.
      
      
      sql/item.h:
        Fixed bug #9338.
        The virtual function replace_equal_field_processor was replaced
        by replace_equal_field. The latter is supposed to be used as a
        callback function in calls of the method transform.
      sql/item.cc:
        The method Item_field::replace_equal_field_processor was
        replaced by Item_field::replace_equal_field The new method
        is used to replace the occurences of Item_field objects.
      sql/sql_select.cc:
        Fixed bug #9338.
        When an occurence of a field reference has to be replaced
        by another field reference the whole Item_field must be
        replaced.
      mysql-test/t/subselect.test:
        Added a test case for bug #9338.
      mysql-test/r/subselect.result:
        Added a test case for bug #9338.
      2b92a78e
    • unknown's avatar
      Merge with 4.1 · 2be63528
      unknown authored
      
      scripts/mysql_create_system_tables.sh:
        Auto merged
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      sql/set_var.cc:
        Auto merged
      support-files/mysql.server.sh:
        Auto merged
      sql/ha_ndbcluster.cc:
        Merge
      sql/handler.cc:
        Merge
      sql/handler.h:
        Merge
      sql/mysqld.cc:
        Merge
      2be63528
    • unknown's avatar
      9b224e91
    • unknown's avatar
      Fixed core dump with long timezone names · 0327d05c
      unknown authored
      Don't abort on bootstrap if a wrong --default-storage-engine is specified
      
      
      sql/handler.cc:
        Combined code
      sql/mysqld.cc:
        Fixed core dump with long timezone names
        Don't abort on bootstrap if a wrong --default-storage-engine is specified
        Don't print strange messages if one sends 'kill' to a mysqld --bootstrap
      sql/set_var.cc:
        Indentaion change
      0327d05c
  6. 15 Apr, 2005 8 commits