1. 09 Oct, 2004 7 commits
    • konstantin@mysql.com's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e08febea
      konstantin@mysql.com authored
      into mysql.com:/media/sda1/mysql/mysql-4.1-hook
      e08febea
    • konstantin@mysql.com's avatar
      A fix and test case for Bug#5987 "subselect in bool function · daa4c249
      konstantin@mysql.com authored
      crashes server (prepared statements)": the bug was that all boolean
      items always recovered its original arguments at statement cleanup 
      stage.
      This collided with Item_subselect::select_transformer, which tries to 
      permanently change the item tree to use a transformed subselect instead of
      original one.
      So we had this call sequence for prepare:
      mysql_stmt_prepare -> JOIN::prepare -> 
      Item_subselect::fix_fields -> the item tree gets transformed ->
      Item_bool_rowready_func2::cleanup, item tree is recovered to original
      state, while it shouldn't have been;
      mysql_stmt_execute -> attempts to execute a broken tree -> crash.
      Now instead of bluntly recovering all arguments of bool functions in 
      Item_bool_rowready_func2::cleanup, we recover only those
      which were changed, and do it in one place.
      There still would exist a possibility for a collision with subselect
      tranformation, if permanent and temporary changes were performed at the 
      same stage.
      But fortunately subselect transformation is always done first, so it 
      doesn't conflict with the optimization done by propogate_cond_constants.
      Now we have: 
      mysql_stmt_prepare -> JOIN::prepare -> subselect transformation 
      permanently changes the tree -> cleanup doesn't recover anything, 
      because nothing was registered for recovery.
      mysql_stmt_execute -> JOIN::prepare (the tree is already transformed, 
      so it doesn't change), JOIN::optimize -> 
      propogate_cond_constants -> temporary changes the item tree 
      with constants -> JOIN::execute -> cleanup -> 
      the changes done by propogate_cond_constants are recovered, as
      they were registered for recovery.
      daa4c249
    • jani@a193-229-222-2.elisa-laajakaista.fi's avatar
      Added possibility to use [GNR...] optional argument for · 49aac4ba
      mysqld_multi via mysqld_multi.server.sh
      49aac4ba
    • jani@a193-229-222-2.elisa-laajakaista.fi's avatar
    • jani@a193-229-222-2.elisa-laajakaista.fi's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · aa294cbd
      into a193-229-222-2.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
      aa294cbd
    • jani@a193-229-222-2.elisa-laajakaista.fi's avatar
      - Added --verbose · 2450f4af
      - Made some of the warnings under --verbose only
      - Added possibility to add mysqladmin= under groups [mysqldN]
        mysqladmin=... is no longer mandatory under [mysqld_multi]
      - Made 'start', 'stop' and 'report' commands truly case-insensitive
      - Some other common places code merge and cleanup
      2450f4af
    • bell@sanja.is.com.ua's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · fbe05a03
      bell@sanja.is.com.ua authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
      fbe05a03
  2. 08 Oct, 2004 10 commits
  3. 07 Oct, 2004 23 commits