1. 05 Sep, 2005 14 commits
  2. 03 Sep, 2005 1 commit
  3. 02 Sep, 2005 10 commits
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-11280 · cbb1da77
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      cbb1da77
    • unknown's avatar
      Compile error fix. · 5d99ed0e
      unknown authored
      
      client/mysqltest.c:
        Have variable declarations before "DBUG_ENTER",
        the opposite order will fail to compile on some platforms.
      5d99ed0e
    • unknown's avatar
      Merge eel.(none):/home/jonas/src/mysql-4.1 · 5fafed14
      unknown authored
      into  eel.(none):/home/jonas/src/mysql-4.1-push
      
      
      5fafed14
    • unknown's avatar
      ndb - fix printout related to bug#10987 · f9d29cfe
      unknown authored
      
      ndb/src/common/debugger/EventLogger.cpp:
        Fix extended printout of LCP_FRAGMENT_COMPLETED
      f9d29cfe
    • unknown's avatar
      ndb - bug#12608 · 21ce9ede
      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
      21ce9ede
    • unknown's avatar
      ndb - bug #10987 · 7056f0b3
      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
      7056f0b3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · d026dd0e
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      d026dd0e
    • unknown's avatar
      mysqltest.test: Remove output from shells in result file · 7f98b2a0
      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
      7f98b2a0
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · c99b50f1
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b12363
      
      
      c99b50f1
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3b077226
      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
      3b077226
  4. 01 Sep, 2005 15 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · ee436f7c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
      
      
      sql/sql_parse.cc:
        Auto merged
      ee436f7c
    • unknown's avatar
      Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 · b5131036
      unknown authored
      
      scripts/Makefile.am:
        Auto merged
      b5131036
    • unknown's avatar
      Manual merge. · 9d996ad6
      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).
      9d996ad6
    • unknown's avatar
      Fix missing command terminator · cc75310b
      unknown authored
      
      mysql-test/t/rpl_slave_status.test:
        Missing command terminator for source command.
      cc75310b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 3223cd93
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      3223cd93
    • unknown's avatar
      Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory. · dedb5b79
      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".
      dedb5b79
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 · 2f979b28
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-4.1-bug12542
      
      
      2f979b28
    • unknown's avatar
      BUG#12542: Added comments · f8aadb60
      unknown authored
      
      sql/log_event.cc:
        Added comments
      sql/sql_parse.cc:
        Added comments
      f8aadb60
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 6ee54d73
      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
      6ee54d73
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 84ddd543
      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.
      84ddd543
    • unknown's avatar
      Fix for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in · 2a64e9a2
      unknown authored
      multi-threaded environment".
      
      To avoid deadlocks between several simultaneously run account management 
      commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
      commands) we should always take table and internal locks during their
      execution in the same order. In other words we should first open and lock
      privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
      
      
      mysql-test/r/grant2.result:
        Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
        multi-threaded environment".
      mysql-test/t/grant2.test:
        Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in 
        multi-threaded environment".
      sql/mysqld.cc:
        acl_init/grant_init() are now used only at server start up so they always
        allocate temporary THD object and don't need argument for passing pointer
        to it.
      sql/sql_acl.cc:
        To avoid deadlocks between several simultaneously run account management 
        commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
        commands) we should always take table and internal locks during their
        execution in the same order. In other words we should first open and lock
        privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
        
        Changed acl_reload()/grant_reload() and change_password()/update_user_table()
        in such way that they obey this principle. Now in acl_reload()/grant_reload()/
        change_password() we open and lock privilege tables, then obtain internal
        locks and then call acl_load()/grant_load()/update_user_table() functions to
        do actual loading or updating.
      sql/sql_acl.h:
        acl_init/grant_init() are now used only at server start up so they always
        allocate temporary THD object and don't need argument for passing pointer
        to it. acl_reload()/grant_reload() now are able to report about their
        success or failure through return value.
      sql/sql_parse.cc:
        If reload_acl_and_cache() is called from SIGHUP handler we have to
        allocate temporary THD for execution of acl_reload()/grant_reload().
      2a64e9a2
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3aa2467e
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      3aa2467e
    • unknown's avatar
      mtr_process.pl: · b63869bd
      unknown authored
        Make sure mtr_kill_processes() is called with an array ref
        Corrected error string for STDERR redirect
      
      
      mysql-test/lib/mtr_process.pl:
        Make sure mtr_kill_processes() is called with an array ref
      b63869bd
    • unknown's avatar
      Fix compiler warnings for mysqltest.c · 126e351c
      unknown authored
      
      client/mysqltest.c:
        Fix warnings
        Remove unused vars
      126e351c
    • unknown's avatar
      Bug #3131 mysqltest fails on $2=$1 assignment in test · 772843ba
      unknown authored
      
      client/mysqltest.c:
        Fix function var_copy to make it possible to assign one variable to another. 
        ex: let $1=$2
      mysql-test/r/mysqltest.result:
        Update test result
      mysql-test/t/mysqltest.test:
        Add test cases for variable to variable assignment
      772843ba