1. 14 Jun, 2006 3 commits
  2. 12 Jun, 2006 7 commits
  3. 09 Jun, 2006 2 commits
  4. 08 Jun, 2006 5 commits
    • unknown's avatar
      mysql-test/mysql-test-run.pl : Output the usage error if one is given.... · f32d05f5
      unknown authored
      mysql-test/mysql-test-run.pl  :  Output the usage error if one is given. (Found when fixing bug#20303)
      
      
      mysql-test/mysql-test-run.pl:
        Found when fixing bug#20303: The "usage()" function ignored the message it was given,
        so we got no real indication about the problem. Print it if one is given.
      f32d05f5
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 2bb4b344
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
      
      
      2bb4b344
    • unknown's avatar
      Bug #20336 CLUSTERLOG commands have no effect · 96fe14dd
      unknown authored
      
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - with signal sender the clock issuing the command and the revceiver of the events are not the same
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - make sure to actually send the update to ndb nodes, and wait for the reply
      ndb/src/mgmsrv/Services.cpp:
        Bug #20336 CLUSTERLOG commands have no effect
        - make sure to compute max every time for log level
      96fe14dd
    • unknown's avatar
      Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented... · 20e54ae6
      unknown authored
      Fix for Bug #18184  SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked
      
      
      
      20e54ae6
    • unknown's avatar
      mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl:... · d0d69b76
      unknown authored
      mysql-test/mysql-test-run.pl  :    A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument"
      
      
      mysql-test/mysql-test-run.pl:
        A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument":
        Due to the use of 'pass_through' in option processing this lone '--' will remain
        as an argument, it must be ignored explicitly.
      d0d69b76
  5. 07 Jun, 2006 2 commits
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3cbf2eaf
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b6880
      
      
      3cbf2eaf
    • unknown's avatar
      Fix for bug #6880: LAST_INSERT_ID() within a statement · febe7eb6
      unknown authored
      
      mysql-test/r/auto_increment.result:
        Fix for bug #6880: LAST_INSERT_ID() within a statement
          - test result
      mysql-test/r/rpl_log.result:
        Fix for bug #6880: LAST_INSERT_ID() within a statement
          - test result
      mysql-test/t/auto_increment.test:
        Fix for bug #6880: LAST_INSERT_ID() within a statement
          - test case
      mysql-test/t/rpl_log.test:
        Fix for bug #6880: LAST_INSERT_ID() within a statement
          - test case
      sql/item_func.cc:
        Fix for bug #6880: LAST_INSERT_ID() within a statement
          - return the first thd->last_insert_id set (within a query)
      febe7eb6
  6. 06 Jun, 2006 2 commits
    • unknown's avatar
      Fixed some problems for Windows build · 5efb70d7
      unknown authored
      
      VC++Files/client/mysql.dsp:
        Fixed omission of mysys\my_conio.c.
      VC++Files/client/mysql_ia64.dsp:
        Fixed omission of mysys\my_conio.c.
      client/mysqldump.c:
        VS compiler does not accept variable declarations within blocks.
        Such a behaviour complies with the Standard C.
      5efb70d7
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · f1b1c0eb
      unknown authored
      into  mysql.com:/usr/home/ram/work/4.1.b16546
      
      
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/func_time.result:
        merging
      mysql-test/t/func_time.test:
        merging
      f1b1c0eb
  7. 02 Jun, 2006 1 commit
  8. 01 Jun, 2006 4 commits
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 00ad00de
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      00ad00de
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · f71a55da
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      f71a55da
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 9ccf222b
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
      
      
      9ccf222b
    • 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
  9. 31 May, 2006 1 commit
  10. 30 May, 2006 3 commits
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · f982aa93
      unknown authored
      into  mysql.com:/home/marty/MySQL/mysql-4.1
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      f982aa93
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · f27a0eed
      unknown authored
      into  rurik.mysql.com:/home/igor/mysql-4.1
      
      
      f27a0eed
    • unknown's avatar
      Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX · a2993441
      unknown authored
      refers to a column name.
      
      
      mysql-test/r/select.result:
        Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
        refers to a column name.
        Added a new test case.
      mysql-test/t/select.test:
        Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
        refers to a column name.
        Added a new test case.
      sql/share/czech/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/danish/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/dutch/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/english/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/estonian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/french/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/german/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/greek/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.\
      sql/share/hungarian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/italian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/japanese-sjis/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.\
      sql/share/japanese/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/korean/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/norwegian-ny/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/norwegian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/polish/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/portuguese/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/romanian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/russian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/serbian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/slovak/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/spanish/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/swedish/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      sql/share/ukrainian/errmsg.txt:
        Removed error message ER_INDEX_DOES_NOT_EXIST,
        used ER_KEY_DOES_NOT_EXITS instead.
      a2993441
  11. 29 May, 2006 2 commits
  12. 28 May, 2006 3 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · b29e052d
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      b29e052d
    • unknown's avatar
      BUG#14157: utf8 encoding in binlog without set character_set_client · d50e3433
      unknown authored
      refining the test case to exclude problems with koi8r on some platforms.
      
      
      mysql-test/t/mysqlbinlog.test:
        replacing unavailble on some platforms koi8r with latin1 still to preserve the essence of the testcase:
        to generate utf8 names in binlog, despite client charset was different, and
        to digest this binlog.
      d50e3433
    • unknown's avatar
      Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX · 42104b2e
      unknown authored
      refers to a column name.
      Added a new error message ER_INDEX_DOES_NOT_EXIST.
      
      
      include/mysqld_error.h:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      include/sql_state.h:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      mysql-test/r/explain.result:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      mysql-test/r/key_cache.result:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      mysql-test/r/preload.result:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      mysql-test/r/select.result:
        Added a test case for bug #17873.
      mysql-test/t/explain.test:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      mysql-test/t/select.test:
        Added a test case for bug #17873.
      sql/share/czech/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/danish/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/dutch/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/english/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/estonian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/french/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/german/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/greek/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/hungarian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/italian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/japanese-sjis/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/japanese/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/korean/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/norwegian-ny/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/norwegian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/polish/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/portuguese/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/romanian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/russian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/serbian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/slovak/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/spanish/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/swedish/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      sql/share/ukrainian/errmsg.txt:
        Fixed bug #17873.
        Added a new error message ER_INDEX_DOES_NOT_EXIST.
      42104b2e
  13. 27 May, 2006 1 commit
  14. 26 May, 2006 1 commit
  15. 25 May, 2006 2 commits
  16. 24 May, 2006 1 commit