1. 03 Mar, 2005 1 commit
  2. 01 Mar, 2005 20 commits
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 891d1fcb
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      891d1fcb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 59c09682
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
      
      
      ndb/src/ndbapi/NdbDictionaryImpl.cpp:
        Auto merged
      59c09682
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · 138c0333
      unknown authored
      into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
      
      138c0333
    • unknown's avatar
      Fix for Bug#5615 and merge from 4.1 · da3cf29b
      unknown authored
      
      
      mysql-test/r/func_group.result:
        Added some tests and fix for Bug#5615.
      mysql-test/r/show_check.result:
        Fix for Bug#5615.
      mysql-test/t/func_group.test:
        Added some tests.
      sql/item_sum.cc:
        Fix for Bug#5615.
      sql/item_sum.h:
        Fix for Bug#5615.
      sql/sql_select.cc:
        Fix for Bug#5615.
      sql/sql_select.h:
        Fix for Bug#5615.
      da3cf29b
    • unknown's avatar
      ha_innodb.cc: · ce9ee259
      unknown authored
        delete_all_rows(): Revert previous change.
        The transaction has been marked started already
        in external_lock().
      
      
      sql/ha_innodb.cc:
        delete_all_rows(): Revert previous change.
        The transaction has been marked started already
        in external_lock().
      ce9ee259
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · 717358a2
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      717358a2
    • unknown's avatar
      ha_innodb.cc: · 8ebd0c3a
      unknown authored
        In TRUNCATE TABLE, MySQL may call innobase_xa_prepare() even though there is no active transaction because it was committed in ha_innobase::delete_all_rows(); in innobase_xa_prepare() InnoDB starts then a new transaction; let us adjust the trx->active_trans flag accordingly
      
      
      sql/ha_innodb.cc:
        In TRUNCATE TABLE, MySQL may call innobase_xa_prepare() even though there is no active transaction because it was committed in ha_innobase::delete_all_rows(); in innobase_xa_prepare() InnoDB starts then a new transaction; let us adjust the trx->active_trans flag accordingly
      8ebd0c3a
    • unknown's avatar
      After review fixes. Fix bugs in TRUNCATE. · 9b9db434
      unknown authored
      
      innobase/dict/dict0crea.c:
        dict_truncate_index_tree(): Commit the mtr after deleting the
        index tree. Add diagnostics for error cases. Let the caller update
        SYS_INDEXES.PAGE_NO to the new root page number. Return the new
        root page number, or FIL_NULL on error.
      innobase/include/dict0crea.h:
        dict_truncate_index_tree(): Commit the mtr after deleting the
        index tree. Add diagnostics for error cases. Let the caller update
        SYS_INDEXES.PAGE_NO to the new root page number. Return the new
        root page number, or FIL_NULL on error.
      innobase/include/page0page.ic:
        page_mem_free(): Disable the memset() call, to make it possible to
        recover some data if someone accidentally deletes a large number
        of records from a table.
      innobase/log/log0recv.c:
        Do not disable InnoDB Hot Backup specific code in MySQL builds.
      innobase/row/row0mysql.c:
        row_truncate_table_for_mysql(): Remove an infinite loop in case
        a SYS_INDEXES record has been deleted. Avoid deadlocks by committing
        and restarting the mini-transaction.
      sql/ha_innodb.cc:
        ha_innobase::delete_all_rows(): set trx->active_trans = 1
      9b9db434
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6fc758a3
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-5.0
      
      6fc758a3
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · e3a27f0c
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
      
      e3a27f0c
    • unknown's avatar
      Merge · 6b591f8f
      unknown authored
      
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/select_found.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      strings/ctype-bin.c:
        Auto merged
      sql/sql_select.cc:
        SCCS merged
      6b591f8f
    • unknown's avatar
    • unknown's avatar
      my_mmap.c: · 57db0578
      unknown authored
        Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
      
      
      mysys/my_mmap.c:
        Changed #warning pragma at the bottom to only occur when being used on non-Windows OS
      57db0578
    • unknown's avatar
      InnoDB: Zero fill newly created pages and deleted records to · 45c942a5
      unknown authored
      remove old junk and to improve compression ratio.
      InnoDB: Make implicit type conversions explicit. (Bug #8826)
      
      
      innobase/btr/btr0cur.c:
        Add "offsets" parameter to page_cur_delete_rec() calls
        btr_cur_optimistic_delete(): Simplify the logic with a flag variable
        btr_cur_pessimistic_delete(): Compute "offsets" earlier
      innobase/include/page0cur.h:
        page_cur_delete_rec(): Add parameter "offsets"
      innobase/include/page0page.h:
        page_mem_free(): Replace parameter "index" with "offsets"
      innobase/include/page0page.ic:
        page_mem_free(): Replace parameter "index" with "offsets".
        Clear the data bytes of the freed record.
        (The "extra" bytes will be needed by free space management.)
      innobase/include/rem0rec.h:
        Remove unnecessary function rec_get_size()
      innobase/log/log0recv.c:
        Remove function rec_apply_log_recs_for_backup()
        unless #ifdef UNIV_HOTBACKUP.
      innobase/page/page0cur.c:
        Add parameter "offsets" to page_cur_delete_rec().
      innobase/page/page0page.c:
        page_create(): Zero fill the data area.
        page_delete_rec_list_start(): Add parameter "offsets"
        to page_cur_delete_rec().
      innobase/rem/rem0rec.c:
        Remove unnecessary function rec_get_size().
        Fix compiler warnings about implicit type conversions.  (Bug #8826)
      innobase/srv/srv0srv.c:
        Fix compiler warnings about implicit type conversions. (Bug #8826)
      innobase/sync/sync0sync.c:
        Fix compiler warnings about implicit type conversions. (Bug #8826)
      45c942a5
    • unknown's avatar
      Fix for Bug#8801: the bug was in co-operation of Item_ref · 10c65140
      unknown authored
      with view-merge algorithm and prepared statements: in case when some
      Item_ref pointing to a view column was substituted with a reference 
      pointing to the view expression for that column
      Item_ref::ref member of the original Item_ref was left pointing to 
      not_found_item (0x1).
      As we currently perform expression substition part of the view-merge 
      algorithm per each execution of a prepared statement or stored procedure, 
      we need to preserve original Item_ref objects usable.
      
      
      sql/item.cc:
        Set member Item_ref::ref to null whenever the item itself is substituted 
        with another item.
        This is necessary if we want to re-execute a prepared statement next time.
        
        Additionally Item_ref::fix_fields() implementation was cleaned up
        (by Monty and myself) to reduce the number of if branches. This
        doesn't change the logic of this function.
      10c65140
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1292904b
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b6089
      
      
      sql/sql_select.cc:
        Auto merged
      1292904b
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb · fbee57cf
      unknown authored
      into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports
      
      fbee57cf
    • unknown's avatar
      Fixes from Tomas's review of 'use configuration mgm handle as a transporter'. · 8b873819
      unknown authored
      This should help with the  PURGE STALE SESSIONS problem.
      
      
      ndb/src/common/transporter/TransporterRegistry.cpp:
        No longer need to do funny connecting and port reporting in start_service as we
        convert the configuration mgm after we have bound to the ports we have to report.
        
        use a BaseString for constructing the connect string.
      ndb/src/kernel/main.cpp:
        Reuse the mgm handle used to fetch configuration as a transporter connection.
      ndb/src/kernel/vm/Configuration.cpp:
        m_mgmd_host is now a BaseString.
      ndb/src/kernel/vm/Configuration.hpp:
        use BaseString for m_mgmd_host
      8b873819
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b413b0a5
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b6089
      
      
      sql/sql_select.cc:
        Auto merged
      b413b0a5
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1348c587
      unknown authored
      into mysql.com:/usr/home/ram/work/4.1.b5615
      
      
      mysql-test/r/show_check.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      1348c587
  3. 28 Feb, 2005 19 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 017c86a3
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      
      mysys/default.c:
        Auto merged
      017c86a3
    • unknown's avatar
      fix compilation failure on sunfire280 · 6d39fc66
      unknown authored
      6d39fc66
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d6aab37
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      sql/sql_repl.cc:
        Auto merged
      8d6aab37
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 95d0f913
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      95d0f913
    • unknown's avatar
      Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause · 749a27c5
      unknown authored
      the error to be sent to the client.
      
      
      mysql-test/r/select_safe.result:
        Testcase for BUG#8726
      mysql-test/t/select_safe.test:
        Testcase for BUG#8726
      sql/sql_select.cc:
        Fix for BUG#8726: On ER_TOO_BIG_SELECT set JOIN::error to -1 to cause the error to be sent to the client.
      749a27c5
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · c0db710a
      unknown authored
      into mysql.com:/home/timka/mysql/src/5.0-bug-8532
      
      c0db710a
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 5cc7962f
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      5cc7962f
    • unknown's avatar
      Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in · 5021a94d
      unknown authored
                      a DECLARE ? HANDLER FOR stmt.
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#8776 (check format of sqlstates in handler declarations).
      mysql-test/t/sp-error.test:
        New test case for BUG#8776 (check format of sqlstates in handler declarations).
      sql/share/errmsg.txt:
        New error message for malformed SQLSTATEs.
      sql/sp_pcontext.cc:
        Added function for checking SQLSTATE format.
      sql/sp_pcontext.h:
        Added function for checking SQLSTATE format.
      sql/sql_yacc.yy:
        Check format of SQLSTATE in handler declaration.
      5021a94d
    • unknown's avatar
      merging · 02a55ffe
      unknown authored
      
      mysql-test/r/ps.result:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      02a55ffe
    • unknown's avatar
    • unknown's avatar
      Fixed BUG#7646: Stored procedure hang if show binlog events · f93a08ee
      unknown authored
        Return false from show_binlog_events() if successful, otherwise stored
        procedures will think it failed.
      
      
      sql/sql_repl.cc:
        Return false from show_binlog_events() if successful, otherwise stored
        procedures will think it failed.
      f93a08ee
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b2bd80f1
      unknown authored
      into mysql.com:/home/my/mysql-5.0
      
      
      BitKeeper/etc/logging_ok:
        auto-union
      include/mysql_com.h:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      b2bd80f1
    • unknown's avatar
      Fix for BUG#8532. · b4c7217d
      unknown authored
      The problem was in that the code that analyses the applicability of the
      QUICK_GROUP_MIN_MAX access method for DISTINC queries assumed that there
      are no duplicate column references in the DISTINCT clause, and it added
      non-exiting key parts for the duplicate column references. 
      
      The solution adds a test to check whether the select list already contained
      a field with the same name. If such field was already present, then it was
      already decided to use its key part for index access. In this such case we
      must skip the duplicate field instead of counting it as a new field.
      
      
      mysql-test/r/group_min_max.result:
        Added test results for BUG#8532.
      mysql-test/t/group_min_max.test:
        Added tests for BUG#8532.
      sql/opt_range.cc:
        The problem was in that the code that analyses the applicability of the
        QUICK_GROUP_MIN_MAX access method for DISTINC queries assumed that there
        are no duplicate column references in the DISTINCT clause, and it added
        non-exiting key parts for the duplicate column references. 
        
        The solution adds a test to check whether the select list already contained
        a field with the same name. If such field was already present, then it was
        already decided to use its key part for index access. In this such case we
        must skip the duplicate field instead of counting it as a new field.
      b4c7217d
    • unknown's avatar
      merging · ab542c9d
      unknown authored
      
      mysql-test/r/show_check.result:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      ab542c9d
    • unknown's avatar
      portability fix · 2d08761b
      unknown authored
      2d08761b
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 · f32ff06f
      unknown authored
      into mysql.com:/home/psergey/mysql-4.0-look
      
      f32ff06f
    • unknown's avatar
      Merge · 28e5e596
      unknown authored
      28e5e596
    • unknown's avatar
      merge with 4.1 · f11b934a
      unknown authored
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      client/mysql.cc:
        Auto merged
      client/mysqldump.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/row/row0sel.c:
        Auto merged
      mysql-test/r/select_found.result:
        Auto merged
      mysql-test/r/type_set.result:
        Auto merged
      mysys/default.c:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      include/mysql_com.h:
        Merge
      sql/filesort.cc:
        merge
      f11b934a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3feab771
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      BitKeeper/etc/ignore:
        added support-files/ndb-config-2-node.ini
      3feab771