1. 04 Jun, 2006 1 commit
  2. 03 Jun, 2006 4 commits
  3. 02 Jun, 2006 8 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · b9d7249d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      b9d7249d
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 78e288b4
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.1-new-WL3146-handler
      
      
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_berkeley.h:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_innodb.h:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      storage/archive/ha_archive.cc:
        Auto merged
      storage/archive/ha_archive.h:
        Auto merged
      78e288b4
    • unknown's avatar
      First push for WL#3146 "less locking in auto_increment". It is a 0-real-change patch. · e63f3779
      unknown authored
      New prototype for get_auto_increment() (but new arguments not yet used), to be able
      to reserve a finite interval of auto_increment values from cooperating engines.
      A hint on how many values to reserve is found in handler::estimation_rows_to_insert,
      filled by ha_start_bulk_insert(), new wrapper around start_bulk_insert().
      NOTE: this patch changes nothing, for all engines. But it makes the API ready for those
      engines which will want to do reservation.
      More csets will come to complete WL#3146.
      
      
      sql/ha_berkeley.cc:
        update to new prototype of get_auto_increment
      sql/ha_berkeley.h:
        update to new prototype of get_auto_increment
      sql/ha_heap.cc:
        update to new prototype of get_auto_increment
      sql/ha_heap.h:
        update to new prototype of get_auto_increment
      sql/ha_innodb.cc:
        update to new prototype of get_auto_increment
      sql/ha_innodb.h:
        update to new prototype of get_auto_increment
      sql/ha_myisam.cc:
        update to new prototype of get_auto_increment
      sql/ha_myisam.h:
        update to new prototype of get_auto_increment
      sql/ha_ndbcluster.cc:
        update to new prototype of get_auto_increment
      sql/ha_ndbcluster.h:
        update to new prototype of get_auto_increment
      sql/ha_partition.cc:
        update to new prototype of get_auto_increment
      sql/ha_partition.h:
        update to new prototype of get_auto_increment
      sql/handler.cc:
        new prototype of get_auto_increment, comments, preparation for when the MySQL layer is capable
        of getting finite auto_increment intervals from cooperating engines.
      sql/handler.h:
        a wrapper around start_bulk_insert(): ha_bulk_insert(), which stores the argument (number
        of rows expected for insertion) into a member of handler: estimation_rows_to_insert.
        This member will soon be used to decide how much auto_increment values we want to reserve
        from cooperating engines.
        New prototype for get_auto_increment, preparing for cooperating engines to reserve finite auto_increment
        intervals.
        release_auto_increment() will be used by the MySQL layer to inform the engine that it has
        not used all of the interval (engine can reclaim it).
      sql/log.cc:
        note for the future
      sql/log_event.cc:
        name of wrapper
      sql/sql_insert.cc:
        name of wrapper. When done with inserting, return unused auto_inc values to engine.
      sql/sql_load.cc:
        name of wrapper. When done with inserting, return unused auto_inc values to engine.
      sql/sql_select.cc:
        name of wrapper
      sql/sql_table.cc:
        name of wrapper
      storage/archive/ha_archive.cc:
        update to new prototype of get_auto_increment.
        Archive reserves only one value (Archive's god - Brian - told me that's the truth).
      storage/archive/ha_archive.h:
        update to new prototype of get_auto_increment()
      e63f3779
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 202c3fae
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      sql/ha_innodb.cc:
        Auto merged
      202c3fae
    • unknown's avatar
      faea23dc
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0c68b710
      unknown authored
      into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      0c68b710
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 616cf453
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      616cf453
    • unknown's avatar
      Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 71dcc27f
      unknown authored
      into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
      
      
      71dcc27f
  4. 01 Jun, 2006 26 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · e9e24d3a
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      e9e24d3a
    • unknown's avatar
      second patch for make distcheck · a82d5e01
      unknown authored
      a82d5e01
    • unknown's avatar
      Merge dl145h.mysql.com:/tmp/andrei/MERGE/5.0_my · e195d46f
      unknown authored
      into  dl145h.mysql.com:/tmp/andrei/MERGE/5.1
      
      
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      e195d46f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 60123968
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      sql/handler.h:
        Auto merged
      sql/ha_berkeley.cc:
        merge
      sql/ha_federated.cc:
        merge
      sql/ha_heap.cc:
        merge
      sql/ha_innodb.cc:
        merge
      sql/ha_myisam.cc:
        merge
      sql/ha_myisammrg.cc:
        merge
      sql/ha_ndbcluster.cc:
        merge
      sql/ha_partition.cc:
        merge
      sql/handler.cc:
        merge
      sql/log.cc:
        merge
      storage/archive/ha_archive.cc:
        merge
      storage/blackhole/ha_blackhole.cc:
        merge
      storage/csv/ha_tina.cc:
        merge
      storage/example/ha_example.cc:
        merge
      60123968
    • unknown's avatar
      interface for transaction log management added to handlerton · 1101cda3
      unknown authored
      iterators creation interface added to handlerton
      
      
      sql/ha_berkeley.cc:
        added new methods
      sql/ha_federated.cc:
        added new methods
      sql/ha_heap.cc:
        added new methods
      sql/ha_innodb.cc:
        added new methods
      sql/ha_myisam.cc:
        added new methods
      sql/ha_myisammrg.cc:
        added new methods
      sql/ha_ndbcluster.cc:
        added new methods
      sql/ha_partition.cc:
        added new methods
      sql/handler.cc:
        added new methods
        spelling fixed
        examples of functions for new interface added
      sql/handler.h:
        transaction logs management interface added
        general iterator creatioin interface added
      sql/log.cc:
        added new methods
      storage/archive/ha_archive.cc:
        added new methods
      storage/blackhole/ha_blackhole.cc:
        added new methods
      storage/csv/ha_tina.cc:
        added new methods
      storage/example/ha_example.cc:
        added new methods
      1101cda3
    • unknown's avatar
      Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c0b0c822
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
      
      
      sql/mysqld.cc:
        Auto merged
      c0b0c822
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 33b00ea5
      unknown authored
      into  a193-229-222-105.elisa-laajakaista.fi:/home/jani/mysql-5.1-new-marvel
      
      
      33b00ea5
    • unknown's avatar
      fixing make distcheck again. fix 1. · 600b9f1d
      unknown authored
      600b9f1d
    • unknown's avatar
      Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fbdf35e9
      unknown authored
      into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
      
      
      sql/mysqld.cc:
        Auto merged
      fbdf35e9
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ef3c6e84
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
      
      
      configure.in:
        Auto merged
      ef3c6e84
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5b21d72f
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      5b21d72f
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ae0f26c8
      unknown authored
      into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      ae0f26c8
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 1f5e0486
      unknown authored
      into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
      
      
      1f5e0486
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · cd96c8d9
      unknown authored
      into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
      
      
      cd96c8d9
    • unknown's avatar
      In prepare_view_securety_context() the sql_command came in wrong. · cdd3536d
      unknown authored
      If the first part was SHOW and second part SELECT, it would have
      thought that the command was SELECT, although the first part of
      it was SHOW. It would then fail later.
      
      Thus we need to set thd->lex to old_lex (first part) here before going
      in to prepare_security().
      
      
      cdd3536d
    • unknown's avatar
      Bug #18483 Cannot create table with FK constraint · 73977d11
      unknown authored
      - remove error set for auto partitioned tables
      
      
      73977d11
    • unknown's avatar
      Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 958229bc
      unknown authored
      into  c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
      
      
      958229bc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · eeeaa19b
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.1
      
      
      eeeaa19b
    • unknown's avatar
    • unknown's avatar
      unittest: · 740077bd
      unknown authored
        rename *.t* to *-t* to be automake-friendly
        simplify Makefiles
      test_atomic.c:
        move to unittest, add GPL comment, fix warnings, convert to tap framework.
      configure:
        remove custom tests for available types, use AC_CHECK_TYPE instead
      x86-gcc.h:
        fix gcc -ansi errors while maintaining readability
      ignore:
        added *-t
      
      
      unittest/mysys/base64-t.c:
        Rename: unittest/mysys/base64.t.c -> unittest/mysys/base64-t.c
      unittest/mysys/bitmap-t.c:
        Rename: unittest/mysys/bitmap.t.c -> unittest/mysys/bitmap-t.c
      unittest/mytap/t/basic-t.c:
        Rename: unittest/mytap/t/basic.t.c -> unittest/mytap/t/basic-t.c
      unittest/examples/no_plan-t.c:
        Rename: unittest/examples/no_plan.t.c -> unittest/examples/no_plan-t.c
      unittest/examples/simple-t.c:
        Rename: unittest/examples/simple.t.c -> unittest/examples/simple-t.c
      unittest/examples/skip-t.c:
        Rename: unittest/examples/skip.t.c -> unittest/examples/skip-t.c
      unittest/examples/skip_all-t.c:
        Rename: unittest/examples/skip_all.t.c -> unittest/examples/skip_all-t.c
      unittest/examples/todo-t.c:
        Rename: unittest/examples/todo.t.c -> unittest/examples/todo-t.c
      BitKeeper/etc/ignore:
        added *-t
      config/ac-macros/misc.m4:
        remove custom AC_TRY_RUN tests for available types, use AC_CHECK_TYPE instead
      configure.in:
        remove custom tests for available types, use AC_CHECK_TYPE instead
      include/atomic/x86-gcc.h:
        fix gcc -ansi errors while maintaining readability
      include/my_global.h:
        remove custom tests for available types, use AC_CHECK_TYPE instead
      include/my_sys.h:
        add missing declaration
      mysys/Makefile.am:
        move test_atomic to unittest
      unittest/Makefile.am:
        simplifications, correct permissions in chmod
      unittest/README.txt:
        rename *.t* to *-t* to be automake-friendly
      unittest/examples/Makefile.am:
        rename *.t* to *-t* to be automake-friendly
        simplify Makefile
      unittest/mysys/Makefile.am:
        rename *.t* to *-t* to be automake-friendly
        simplify Makefile
      unittest/mysys/my_atomic-t.c:
        move mysys/test_atomic.c to unittest, add GPL comment, fix warnings,
        convert to tap framework.
      unittest/mytap/t/Makefile.am:
        rename *.t* to *-t* to be automake-friendly
        simplify Makefile
      unittest/unit.pl:
        rename *.t* to *-t* to be automake-friendly
      740077bd
    • unknown's avatar
      Merge jonas@perch:src/mysql-5.1-new-ndb · f7915a26
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      f7915a26
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 4862b2cd
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      4862b2cd
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6a158bfb
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      storage/ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      storage/ndb/test/run-test/daily-basic-tests.txt:
        merge
      6a158bfb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d895024
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster_binlog.cc:
        Auto merged
      7d895024
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · dd47289b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/50-work
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/test/run-test/daily-basic-tests.txt:
        Auto merged
      dd47289b
    • unknown's avatar
      ndb - bug#20185 · 49a4c85b
      unknown authored
        Dont be too aggressive in Dbtc::nodeFailCheckTransaction
        let it timeout by 1, so that it does not assert that it has waited too long
        old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        error codes
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        2 new error inserts
        7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
        7031 - delay in GCP_PREPARE and die
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
      ndb/test/ndbapi/testNodeRestart.cpp:
        testcase
      ndb/test/run-test/daily-basic-tests.txt:
        autotest
      49a4c85b
  5. 31 May, 2006 1 commit