1. 06 Sep, 2005 3 commits
    • unknown's avatar
      item_cmpfunc.h: · 86b61e97
      unknown authored
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         The classes Item_func_between, Item_func_if, Item_func_in are modified.
         Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
         The class Item_func_opt_neg is added to factor out the functionality
         common for the modified classes Item_func_between and Item_func_in.
      item_cmpfunc.cc:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
         Item_func_in::fix_fields(). They correct generic calculation of
         the not_null_tables attribute when it is needed.
         Modified Item_func_between::val_int(), Item_func_in::val_int().
      opt_range.cc:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         The function get_mm_tree() is modified. There cannot be NOT before
         BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
         now [NOT]BETWEEN/IN expressions.
      sql_yacc.yy:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
      join_outer.result:
        Fixed some testcases results (bugs #12101, #12102)
      join_outer.test:
        Added testcases for bugs #12101, #12102
      
      
      mysql-test/t/join_outer.test:
        Added testcases for bugs #12101, #12102
      mysql-test/r/join_outer.result:
        Fixed some testcases results (bugs #12101, #12102)
      sql/sql_yacc.yy:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         Item_func_between/in objects can represent now [NOT]BETWEEN/IN expresions.
      sql/opt_range.cc:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         The function get_mm_tree() is modified. There cannot be NOT before
         BETWEEN/IN anymore. Rather Item_func_between/in objects can represent
         now [NOT]BETWEEN/IN expressions.
      sql/item_cmpfunc.cc:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         Added Item_func_between::fix_fields(), Item_func_if::fix_fields(),
         Item_func_in::fix_fields(). They correct generic calculation of
         the not_null_tables attribute when it is needed.
         Modified Item_func_between::val_int(), Item_func_in::val_int().
      sql/item_cmpfunc.h:
        Fixed bugs #12101, #12102: wrong calculation of not_null_tables()
         for some expressions.
         The classes Item_func_between, Item_func_if, Item_func_in are modified.
         Item_func_between/in objects can represent now [NOT]BETWEEN/IN expressions.
         The class Item_func_opt_neg is added to factor out the functionality
         common for the modified classes Item_func_between and Item_func_in.
      86b61e97
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 9c556b2b
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      9c556b2b
    • unknown's avatar
      BUG#12959 mysqltest crashes if testcase passed with -x option · 706a955b
      unknown authored
       - Update test cases
      
      
      mysql-test/t/mysqltest.test:
        Uncomment the mysqltest -x test. Can't get the output to end up in the result file.
      706a955b
  2. 05 Sep, 2005 16 commits
  3. 03 Sep, 2005 1 commit
  4. 02 Sep, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11280 · 76da91b5
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      76da91b5
    • unknown's avatar
      Compile error fix. · 114b4e9d
      unknown authored
      
      client/mysqltest.c:
        Have variable declarations before "DBUG_ENTER",
        the opposite order will fail to compile on some platforms.
      114b4e9d
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · 75cabf80
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      75cabf80
    • unknown's avatar
      ndb - fix printout related to bug#10987 · dfa2174a
      unknown authored
      
      ndb/src/common/debugger/EventLogger.cpp:
        Fix extended printout of LCP_FRAGMENT_COMPLETED
      dfa2174a
    • unknown's avatar
      ndb - bug#12608 · a4337300
      unknown authored
        Always abort if node failure occured between startTransaction and commit
        (can later be improved by wl#2610)
      
      
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Always abort if node failure occured between startTransaction and commit
      a4337300
    • unknown's avatar
      ndb - bug #10987 · d67ce2a9
      unknown authored
        make sure not to cut log to early 
        (specificly not use LCP with maxGciStarted that has not yet completed)
      
      
      ndb/include/kernel/signaldata/SignalData.hpp:
        Add signal data printer for START_FRAG_REQ
      ndb/include/kernel/signaldata/StartFragReq.hpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/common/debugger/signaldata/StartRec.cpp:
        Add signal data printer for START_FRAG_REQ
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Add maxGciStarted/Completed to event report
        bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed
      d67ce2a9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 71330b53
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      71330b53
    • unknown's avatar
      mysqltest.test: Remove output from shells in result file · 1da95439
      unknown authored
      
      mysql-test/r/mysqltest.result:
        Update test results
      mysql-test/t/mysqltest.test:
        Send output from failed command to /dev/null in order to avoid recording the output from different shells
      1da95439
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1f89b880
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12363
      
      1f89b880
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · abad8cfc
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12363
      
      
      mysql-test/t/variables.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        SCCS merged
      abad8cfc
  5. 01 Sep, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 02e88319
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
      
      
      sql/sql_parse.cc:
        Auto merged
      02e88319
    • unknown's avatar
      Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 · 5ce27ffe
      unknown authored
      
      scripts/Makefile.am:
        Auto merged
      5ce27ffe
    • unknown's avatar
      Manual merge. · 129c7ab7
      unknown authored
      
      Makefile.am:
        Manual merge: For "test", use Kent's new version using the Perl script with port variables,
        but also have the "test-force" target (used in the RPM spec!) (still using Shell).
      129c7ab7
    • unknown's avatar
      Fix missing command terminator · 887f24b1
      unknown authored
      
      mysql-test/t/rpl_slave_status.test:
        Missing command terminator for source command.
      887f24b1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 956e8343
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      956e8343
    • unknown's avatar
      Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. · 96e473e4
      unknown authored
      
      scripts/Makefile.am:
        Add "MYSQL_BASE_VERSION" to the list of substituted variables,
        for later (possible) use in "mysql_install_db" and "mysqld_safe".
      96e473e4
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · bd9381a1
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
      
      bd9381a1
    • unknown's avatar
      BUG#12542: Added comments · 9eb2af5d
      unknown authored
      
      sql/log_event.cc:
        Added comments
      sql/sql_parse.cc:
        Added comments
      9eb2af5d
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 3331e074
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      mysql-test/t/create_select_tmp.test:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/handler.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/innodb.test:
        Auto merged
      mysql-test/t/ndb_autodiscover2.test:
        Auto merged
      mysql-test/t/rpl000001.test:
        Auto merged
      mysql-test/t/rpl_EE_error.test:
        Auto merged
      mysql-test/t/rpl_change_master.test:
        Auto merged
      mysql-test/t/rpl_deadlock.test:
        Auto merged
      mysql-test/t/rpl_drop.test:
        Auto merged
      mysql-test/t/rpl_drop_temp.test:
        Auto merged
      mysql-test/t/rpl_error_ignored_table.test:
        Auto merged
      mysql-test/t/rpl_flush_log_loop.test:
        Auto merged
      mysql-test/t/rpl_insert_id.test:
        Auto merged
      mysql-test/t/rpl_loaddata.test:
        Auto merged
      mysql-test/t/rpl_rotate_logs.test:
        Auto merged
      mysql-test/t/rpl_until.test:
        Auto merged
      client/mysqltest.c:
        Manual merge
      mysql-test/t/mysqltest.test:
        Manual merge
      3331e074
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 831b9133
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/grant2.result:
        Manual merge.
      mysql-test/t/grant2.test:
        Manual merge.
      831b9133