1. 27 Aug, 2007 5 commits
  2. 25 Aug, 2007 3 commits
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel · 36553dfd
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      36553dfd
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main · fe471aed
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
      
      
      client/mysqldump.c:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/status.result:
        Auto merged
      sql/event_db_repository.cc:
        Auto merged
      sql/event_queue.cc:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/ha_partition.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.h:
        Auto merged
      sql/log_event_old.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.h:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/status.test:
        Manual resolve with 5.1.
      sql/log_event.cc:
        Manual resolve with 5.1.
      sql/sql_yacc.yy:
        Manual resolve with 5.1.
      fe471aed
    • unknown's avatar
      Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main · 863a4301
      unknown authored
      into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
      
      
      863a4301
  3. 24 Aug, 2007 24 commits
  4. 23 Aug, 2007 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · 9723a936
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      9723a936
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 30f5bb9e
      unknown authored
      into  bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt
      
      
      sql/item.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      30f5bb9e
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · 294a43ec
      unknown authored
      into  bk-internal.mysql.com:/users/gshchepa/mysql-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      294a43ec
    • unknown's avatar
      Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format. · f0d1ac25
      unknown authored
      In the ha_partition::position() we didn't calculate the number
      of the partition of the record. We used m_last_part value instead,
      relying on that it is set in other place like previous call of a method
      like ::write_row(). In replication we don't call any of these befor
      position(). Delete_rows_log_event::do_exec_row calls find_and_fetch_row.
      In case of InnoDB-based PARTITION table, we have HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
      enabled, so use position() / rnd_pos() calls to fetch the record.
      
      Fixed by adding partition_id calculation to the ha_partition::position()
      
      
      sql/ha_partition.h:
         Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
        column_bitmaps_signal interface added
      sql/ha_partition.cc:
        Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
        Calculate the number of the partition in ha_partition::position().
        ha_partition::column_bitmaps_signal() implemented
      mysql-test/r/partition_pruning.result:
        Bug #28430 Failure in replication of innodb partitioned tables on row/mixed format.
        test result fixed
      f0d1ac25
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · aa52d6d7
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      aa52d6d7
    • unknown's avatar
      Merge trift2.:/MySQL/M50/netware-5.0 · 48f72746
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      48f72746
    • unknown's avatar
      Merge trift2.:/MySQL/M51/netware-5.1 · 82b2ad46
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      netware/Makefile.am:
        Auto merged
      82b2ad46
    • unknown's avatar
      Merge trift2.:/MySQL/M50/netware-5.0 · 189af515
      unknown authored
      into  trift2.:/MySQL/M51/netware-5.1
      
      
      BitKeeper/deleted/.del-isamchk.def:
        Auto merged
      BitKeeper/deleted/.del-isamlog.def:
        Auto merged
      BitKeeper/deleted/.del-pack_isam.def:
        Auto merged
      netware/Makefile.am:
        Auto merged
      189af515