1. 29 Dec, 2005 1 commit
  2. 20 Dec, 2005 2 commits
  3. 13 Dec, 2005 8 commits
    • unknown's avatar
      Remove confusing printouts from expected to fail "system" commands · 1034d941
      unknown authored
      
      client/mysqltest.c:
        Add missing DBUG_VOID_RETURN
        Log failure to run "system" into result log 
        Add DBUG_PRINT for the sleep value used in do_sleep
      mysql-test/r/mysqltest.result:
        Update test results
      mysql-test/t/mysqltest.test:
        Mask outpu from failed system command
      1034d941
    • unknown's avatar
      Remove confusing printout · 04e0e92f
      unknown authored
      
      client/mysqltest.c:
        Remove printout to stderr about expected failure of a command, if we want it logged, it has already been logged to the result.
      04e0e92f
    • unknown's avatar
      Fix tests after merge · 3a9307fd
      unknown authored
      Straighten out and comment behaviour for --require and --result in run_query
      
      
      client/mysqltest.c:
         If --require or --result has been provided for a query command->record_file file be set.
        In that case it should either dump to file if recording or check with content in file if running.
      mysql-test/r/mysqltest.result:
        Fix up tests and results after merge
      mysql-test/t/mysqltest.test:
        Fix up tests and results after merge
      3a9307fd
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 70b07b1e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
      
      70b07b1e
    • unknown's avatar
      ndb - merge error · 74a95e0a
      unknown authored
      note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        merge error
      74a95e0a
    • unknown's avatar
      Update ndb version in configure.in · 3767d079
      unknown authored
      3767d079
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 0eb7bb07
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      0eb7bb07
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 43b61de0
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
      
      
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      ndb/test/ndbapi/testNodeRestart.cpp:
        Auto merged
      ndb/src/kernel/blocks/ERROR_codes.txt:
        merge
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        merge
      ndb/test/run-test/daily-basic-tests.txt:
        merge
      43b61de0
  4. 12 Dec, 2005 11 commits
    • unknown's avatar
      Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0 · 25fcc212
      unknown authored
      into  mysql.com:/home/novo/MySQL/mysql-5.0
      
      25fcc212
    • unknown's avatar
      mysql.spec.sh: · 45024109
      unknown authored
        * made the following changes for the generic 5.0 RPM spec file
        - Added zlib to the list of (static) libraries installed
        - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
        - Compile MySQL with bundled zlib
        - Fixed %packager name to "MySQL Production Engineering Team"
      
      
      support-files/mysql.spec.sh:
        * made the following changes for the generic 5.0 RPM spec file
        - Added zlib to the list of (static) libraries installed
        - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
        - Compile MySQL with bundled zlib
        - Fixed %packager name to "MySQL Production Engineering Team"
      45024109
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 56d46008
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      56d46008
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 079ab1ae
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/r/bdb.result:
        Resolve conflicts
      mysql-test/t/bdb.test:
        Resolve conflicts
      sql/sql_delete.cc:
        Resolve conflicts
      sql/sql_insert.cc:
        Resolve conflicts
      sql/sql_update.cc:
        Resolve conflicts
      079ab1ae
    • unknown's avatar
      0bb9d20c
    • unknown's avatar
      rpl_until.test + rpl_until.result Fix (completion) for bug#12429 · ea04b8b7
      unknown authored
      Manual merge from 4.1,
      extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      
      
      mysql-test/t/rpl_until.test:
        Auto merged
      mysql-test/r/rpl_until.result:
        Manual merge from 4.1,
        extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
      ea04b8b7
    • unknown's avatar
      rpl_until.test + rpl_until.result · 7428cf62
      unknown authored
      Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
      The value is not important, and it depends on timing. Mask it.
      
      Backport and extension of a fix made by Matthias in 5.0, originally it was
      1.1976 05/12/05 17:57:48 mleich@mysql.com
      
      
      mysql-test/r/rpl_until.result:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      mysql-test/t/rpl_until.test:
        Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
        The value is not important, and it depends on timing. Mask it.
        
        Backport and extension of a fix made by Matthias in 5.0, originally it was
        1.1976 05/12/05 17:57:48 mleich@mysql.com
      7428cf62
    • unknown's avatar
      ndb - bug#15685 · b00fbda2
      unknown authored
        Error in abort handling in TC when timeout during abort
        
      
      
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error codes
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        New error codes
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Dont release transaction record to early
      ndb/test/ndbapi/testNodeRestart.cpp:
        Test case
      ndb/test/run-test/daily-basic-tests.txt:
        Test case
      b00fbda2
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 4f9eca10
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      mysql-test/r/mysqltest.result:
        Manual merge
      mysql-test/t/mysqltest.test:
        Manual merge
      4f9eca10
    • unknown's avatar
      Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8f2deb59
      unknown authored
      into  mysql.com:/home/alexi/dev/mysql-5.0-14614
      
      8f2deb59
    • unknown's avatar
      item_sum.h, item.cc: · 992cc7fb
      unknown authored
        Post review corrections in comments.
      
      
      sql/item.cc:
        Post review corrections in comments.
      sql/item_sum.h:
        Post review corrections in comments.
      992cc7fb
  5. 11 Dec, 2005 2 commits
    • unknown's avatar
      Fixed BUG #14614: Replication of tables with trigger generates · 7ab151a7
      unknown authored
       error message if database is changed.
      
      
      mysql-test/r/rpl_trigger.result:
        Fixed results for the added test cases
      mysql-test/t/rpl_trigger.test:
        Added test cases for bug #14614
      sql/sql_db.cc:
        Fixed bug #14614.
         Modified mysql_change_db(): The memory where db name resides
         is freed by a slave thread.
      7ab151a7
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 544ae455
      unknown authored
      into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      544ae455
  6. 09 Dec, 2005 4 commits
    • unknown's avatar
      Fix warnings for running with --view_protocol · 8bdb7f90
      unknown authored
      
      client/mysqltest.c:
        Collect warnings from creating the "object" for the query and ouput those after the query has been executed
      8bdb7f90
    • unknown's avatar
      Made it easier to valgrind mysqltest · f083129f
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        Append mysqltest-time to mysqltest.log at the end of each test case, thus making it possibel to run the whole testsuite with --valgrind-mysqltest and then check the valgrind ouput in mysqltest.log
        Don't valgrind mysqld when only --valgrind-mysqltest is specified
        Fix usage --valgrind, will only valgrind mysqld(that's how it was, I didn't change)
      f083129f
    • unknown's avatar
      bug#15632 - ndb · f0622629
      unknown authored
        Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
      
      
      ndb/include/ndb_version.h.in:
        Handle upgrade of bug fix
      ndb/src/kernel/blocks/ERROR_codes.txt:
        New error code for delaying INCL_NODE_REQ
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
          by also waiting for starting nodes
      ndb/test/ndbapi/testNodeRestart.cpp:
        Add testcase for bug#15632
      f0622629
    • unknown's avatar
      Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 81c274d9
      unknown authored
      into  devsrv-b.mysql.com:/space/magnus/my50-bug9535
      
      81c274d9
  7. 08 Dec, 2005 5 commits
    • unknown's avatar
      A fix and a test case for Bug#15441 "Running SP causes Server · 48a6232a
      unknown authored
      to Crash": the bug was that due to non-standard name
      resolution precedence in stored procedures (See Bug#5967)
      a stored procedure variable took precedence over a table column
      when the arguments for VALUES() function were resolved.
      The implementation of VALUES() function was not designed to work
      with Item_splocal and crashed.
      VALUES() function is non-standard. It can refer to, and
      is meaningful for, table columns only. The patch disables SP 
      variables as possible arguments of VALUES() function.
      
      
      mysql-test/r/sp.result:
        Test results fixed (Bug#15441).
        Also make sure that the recently added test cases follow sp.test
        internal tests standard.
      mysql-test/t/sp.test:
        Add a test case for Bug#15441 "Running SP causes Server to Crash".
      sql/item.cc:
        Cleanup Item_insert_value::fix_fields().
      sql/item.h:
        Add a comment for Item_insert_value.
      sql/sql_yacc.yy:
        Actual fix for Bug#15441 "Running SP causes Server to Crash":
        we should not allow VALUES() function to reference SP variables.
      48a6232a
    • unknown's avatar
      Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE · 3b0c9e45
      unknown authored
      handling so that indexes are closed before trying to commit the
      transaction. (Bug #15536)
      
      
      mysql-test/r/bdb.result:
        Add new results
      mysql-test/t/bdb.test:
        Add new test
      sql/sql_delete.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      sql/sql_insert.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      sql/sql_update.cc:
        Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
      3b0c9e45
    • unknown's avatar
      WL#2930 mysqltest++ · f5e39a2b
      unknown authored
       - Updated after valgrinding
      
      
      client/mysqltest.c:
        Move initialisation of dynamic strings to top of function so that variables are always inited before free
        The workaround for 15518 moved to last in function
        Add check for "--" comments without any comment,. to avoid read of uninit memory
      mysql-test/mysql-test-run.sh:
        Add printout of valgrind errors from mysqltest when test with valgrind  has completed
      f5e39a2b
    • unknown's avatar
      bug#15587 - ndb · 24e9283b
      unknown authored
        Fix typo in autotest script
      
      
      ndb/test/run-test/daily-basic-tests.txt:
        Fix typo in autotest script
      24e9283b
    • unknown's avatar
      bug#15587 - ndb · 431c9d03
      unknown authored
        Fix error in NF during NR
      
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/ERROR_codes.txt:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Run updateNodeInfo if failed node is not in list of storedReplicas
      ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
        Add dump for ERROR 5002 with specified table
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Add dump for ERROR 5002 with specified table
      ndb/test/ndbapi/testNodeRestart.cpp:
        Add testcase for bug#15587
      ndb/test/run-test/daily-basic-tests.txt:
        Add testcase for bug#15587
      431c9d03
  8. 07 Dec, 2005 7 commits