1. 03 Mar, 2005 4 commits
  2. 02 Mar, 2005 15 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ad0bfc0
      unknown authored
      into mysql.com:/home/cps/mysql/devel/im-fix-review
      
      9ad0bfc0
    • unknown's avatar
      fix to avoid relinking on each "make" · a9d7cffe
      unknown authored
      
      server-tools/instance-manager/Makefile.am:
        "Makefile" target removed
      a9d7cffe
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 48ae880a
      unknown authored
      into krsna.patg.net:/home/patg/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      48ae880a
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 · ad357fb1
      unknown authored
      into mysql.com:/M50/mysql-5.0
      
      ad357fb1
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 6ff89861
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      6ff89861
    • unknown's avatar
      workaround for a bug removed · 1f8dc06a
      unknown authored
      
      mysys/my_mmap.c:
        cleanup
      sql/ha_innodb.cc:
        don's start a transaction in prepare().
        restore disabled code for ibbackup
      1f8dc06a
    • unknown's avatar
      InnoDB: Merge fix of Bug #8771 from the 4.1 tree · c8a43fae
      unknown authored
      
      innobase/row/row0sel.c:
        Manual merge (Bug #8771)
      c8a43fae
    • unknown's avatar
      Bug#8306 - TRUNCATE leads to index corruption · 1a505953
      unknown authored
      After merge fix.
      The bugfix results in a different error message in this situation.
      
      1a505953
    • unknown's avatar
      Variable 'k' declared at both loop and function level caused compiler failures - · 3a0e7903
      unknown authored
      use function-wide declaration also for loop body.
      
      
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Get rid of a duplicate declaration ('Uint32 k;' at function start) that caused 
        compiler failures on 'octane2' (both 32 and 64 bit) and a compiler crash on 'ds20'.
        It would be better not to use those variable declarations with a loop scope,
        they have caused compile problems again and again.
      3a0e7903
    • unknown's avatar
      Merge · 0e1f7368
      unknown authored
      
      innobase/include/srv0srv.h:
        Auto merged
      innobase/srv/srv0srv.c:
        Auto merged
      myisam/mi_create.c:
        Auto merged
      myisam/mi_open.c:
        Auto merged
      myisam/myisamdef.h:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      mysql-test/r/myisam.result:
        SCCS merged
      mysql-test/t/myisam.test:
        SCCS merged
      sql/ha_innodb.h:
        SCCS merged
      0e1f7368
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · f1821dbb
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      f1821dbb
    • unknown's avatar
      bug#8151 - truncate leaves a transaction open · b5f5cb7c
      unknown authored
      deadlock in MYSQL_LOG::new_file()
      style fixes
      
      
      mysql-test/r/innodb.result:
        one more test for truncate
      mysql-test/t/innodb.test:
        one more test for truncate
      sql/ha_innodb.cc:
        bug#8151 - truncate leaves a transaction open
      sql/handler.cc:
        bug#8151 - truncate leaves a transaction open
      sql/item.h:
        style fix
      sql/item_cmpfunc.cc:
        style fix
      sql/item_cmpfunc.h:
        style fix
      sql/item_func.cc:
        style fix
      sql/item_func.h:
        style fix
      sql/log.cc:
        let new_file() to lock LOCK_index,
        don't check for prepared_xids in rotate_and_purge()
        increase thread_safe_increment when LOCK_log is taken
      sql/log_event.cc:
        mysqlbinlog now prints a warning if binlog was not closed properly
      sql/sql_class.h:
        comments
      sql/sql_repl.cc:
        DBUG_ENTER tag corrected
      b5f5cb7c
    • unknown's avatar
      Bug#8306 - TRUNCATE leads to index corruption · 594a6a1e
      unknown authored
      Added a check, if the table, which we are going to create, is open.
      This can happen if a MERGE mapped table is TRUNCATEd.
      
      
      myisam/mi_open.c:
        Bug#8306 - TRUNCATE leads to index corruption
        Made test_if_reopen() globally available.
      myisam/myisamdef.h:
        Bug#8306 - TRUNCATE leads to index corruption
        Declared test_if_reopen() as globally available.
      mysql-test/r/myisam.result:
        Bug#8306 - TRUNCATE leads to index corruption
        The test result.
      mysql-test/t/myisam.test:
        Bug#8306 - TRUNCATE leads to index corruption
        The test case.
      594a6a1e
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 80be9a27
      unknown authored
      into krsna.patg.net:/home/patg/mysql-5.0
      
      
      sql/handler.cc:
        Auto merged
      80be9a27
    • unknown's avatar
      Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · c8d38b68
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      c8d38b68
  3. 01 Mar, 2005 21 commits
    • unknown's avatar
      ha_innodb.cc: · bfedc8b2
      unknown authored
        Correct indentation + some small style corrections
      
      
      sql/ha_innodb.cc:
        Correct indentation + some small style corrections
      bfedc8b2
    • unknown's avatar
      Makefile.am: · 2d73a0d1
      unknown authored
        updated ndb test makefile to make src dist complete
      
      
      ndb/test/ndbapi/Makefile.am:
        updated ndb test makefile to make src dist complete
      2d73a0d1
    • 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
      row0sel.c: · 8ee829e4
      unknown authored
        row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
      
      
      innobase/row/row0sel.c:
        row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
      8ee829e4
    • 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
      InnoDB: Commit inserts to the temporary tables created by · 98152e27
      unknown authored
      CREATE INDEX and DROP INDEX every 10,000 rows,
      similar to ALTER TABLE.
      
      
      sql/ha_innodb.cc:
        Commit inserts to the temporary tables created by
        CREATE INDEX and DROP INDEX every 10,000 rows, similar
        to ALTER TABLE.
      sql/ha_innodb.h:
        Remove duplicate declaration of srv_max_purge_lag.
      98152e27
    • 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 jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 96ff80eb
      unknown authored
      into hundin.mysql.fi:/home/jan/mysql-5.0
      
      96ff80eb
    • 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
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 93e2c3e0
      unknown authored
      into mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/run-test/daily-devel-tests.txt:
        Auto merged
      93e2c3e0
    • unknown's avatar
      merge · 34bd1e85
      unknown authored
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/test/run-test/daily-devel-tests.txt:
        Auto merged
      34bd1e85
    • unknown's avatar
      bug#8853 - ndb - commit after nodefailure on not TC node · a0ba1e9a
      unknown authored
        set exec_flag in execTC_COMMITREQ so that api will get rollbackrep
      
      
      ndb/include/ndbapi/NdbConnection.hpp:
        Make getConnectedNode public
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Fix TC_COMMITREQ in abort cases
      ndb/test/ndbapi/testNodeRestart.cpp:
        Testcase for bug#8853
      ndb/test/run-test/daily-devel-tests.txt:
        Testcase for bug#8853
      a0ba1e9a
    • unknown's avatar
      Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 · a5bc0929
      unknown authored
      into hundin.mysql.fi:/home/marko/mysql-4.1
      
      a5bc0929
    • 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