1. 08 Jun, 2005 6 commits
  2. 07 Jun, 2005 34 commits
    • unknown's avatar
      A followup patch for Bug#7306 (limit in prepared statements): · 936688fe
      unknown authored
      don't evaluate subqueries during statement prepare, even if they
      are not correlated.
      With post-review fixes.
      
      
      sql/mysql_priv.h:
        Add UNCACHEABLE_PREPARE to mark subqueries as non-constant in 
        mysql_stmt_prepare
      sql/sql_lex.cc:
        Add a missing assert: noone can call unit::set_limit from 
        mysql_stmt_prepare.
      sql/sql_lex.h:
        Comment fixed.
      sql/sql_parse.cc:
        Mark new SELECT_LEXes as uncacheable if they created during 
        statement prepare.
      sql/sql_prepare.cc:
        Switch off the uncacheable flag when prepare is done.
      936688fe
    • unknown's avatar
      Enabling back part of sp.test which no longer fails in --ps-protocol mode · 0bc3c622
      unknown authored
      (Bug which caused its failure before was fixed in the beginning of March
       by the ChangeSet that introduced improved SP-locking).
      
      
      0bc3c622
    • unknown's avatar
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 12ef4ff5
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      12ef4ff5
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · ef8115d6
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      myisam/mi_key.c:
        Auto merged
      myisam/mi_rnext_same.c:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      ef8115d6
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 07ad3fc4
      unknown authored
      into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
      
      
      07ad3fc4
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3817ff00
      unknown authored
      into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
      
      
      sql/mysqld.cc:
        Auto merged
      3817ff00
    • unknown's avatar
      Typo in help message. · d9a0ab48
      unknown authored
      d9a0ab48
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 37e3dc83
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      37e3dc83
    • unknown's avatar
      sql_yacc.yy: · 9f938e89
      unknown authored
        Added missing ';'.
      
      
      sql/sql_yacc.yy:
        Added missing ';'.
      9f938e89
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fff8ff08
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      fff8ff08
    • unknown's avatar
      several fixes to the previous patch · 4e482bd3
      unknown authored
      
      server-tools/instance-manager/instance_options.cc:
        fix order of if branches
      server-tools/instance-manager/instance_options.h:
        portability fix
      server-tools/instance-manager/parse_output.cc:
        remove stupid comment
      server-tools/instance-manager/parse_output.h:
        portability fix
      4e482bd3
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · beb288f4
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      beb288f4
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 · 3145787d
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/etc/logging_ok:
        auto-union
      myisam/mi_key.c:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        Auto merged
      mysql-test/r/ps_1general.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      sql/item_buff.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      3145787d
    • unknown's avatar
      Many files: · d499ead6
      unknown authored
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      
      
      sql/sql_class.cc:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_1general.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_2myisam.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_3innodb.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_4heap.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      mysql-test/r/ps_5merge.result:
        Fixed bug #9899: erronious NOT_NULL flag for some attributes
        in the EXPLAIN table.
      d499ead6
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · e5a97df6
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      e5a97df6
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 03a85abe
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      sql/item.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      03a85abe
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f250f821
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      f250f821
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6083a262
      unknown authored
      into mysql.com:/space/my/mysql-5.0
      
      
      6083a262
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 01a5d650
      unknown authored
      into mysql.com:/home/my/mysql-4.1
      
      
      01a5d650
    • unknown's avatar
      - added the libndbclient static and shared libraries to the RPM (BUG 10676) · 31625bfa
      unknown authored
      
      support-files/mysql.spec.sh:
        - added the libndbclient static and shared libraries (BUG 10676)
      31625bfa
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · e7731457
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-7306-final
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      e7731457
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8d2cf738
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      8d2cf738
    • unknown's avatar
      Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites · 3dba83b9
      unknown authored
      Fix instead wrong call to ha_key_cmp
      This is related to bug #10741 Inserting double value into utf8 column crashes server
      
      
      myisam/mi_key.c:
        Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
      myisam/mi_rnext_same.c:
        Fixed wrong arguments to ha_key_cmp()
        This caused a compare to fail if we first found a key with end space and then same key without end space
      mysql-test/r/ctype_utf8.result:
        Additional test
      mysql-test/t/ctype_utf8.test:
        Additional test
      3dba83b9
    • unknown's avatar
      post-review fixes · 4a43ecca
      unknown authored
      
      server-tools/instance-manager/commands.cc:
        remove commented out code
      server-tools/instance-manager/instance.cc:
        use flag instead of int variable
      server-tools/instance-manager/instance.h:
        no more default values
      server-tools/instance-manager/instance_map.cc:
        use flag to be more verbose
      server-tools/instance-manager/instance_options.cc:
        don't read options when looking for an option, use strmake instead of strchr
      server-tools/instance-manager/instance_options.h:
        fix comment, use flag instead of int value
      server-tools/instance-manager/listener.cc:
        don't like c++ comments
      server-tools/instance-manager/log.cc:
        safety: strmake adds trailing zero to the string
      server-tools/instance-manager/parse_output.cc:
        use strmake instead of strncpy, renamed varianles to make code more readable
      server-tools/instance-manager/parse_output.h:
        get rid of default value
      4a43ecca
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-5.0 · 596d9fb4
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
      
      
      596d9fb4
    • unknown's avatar
      item_buff.cc: · 8b15aba8
      unknown authored
        Removed an extra space char.
      
      
      sql/item_buff.cc:
        Removed an extra space char.
      8b15aba8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 83af1d42
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-7306-final
      
      
      83af1d42
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 06a948c3
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
      
      
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      06a948c3
    • unknown's avatar
      Fix for bug #10015 "Crash in InnoDB if stored routines are used". · 49357ae8
      unknown authored
      We should not allow explicit or implicit transaction commits inside
      of stored functions or triggers (so in autocommit mode we should not
      do commits after execution of sub-statement).
      Also since we don't support nested statement transactions in 5.0,
      we shouldn't commit or rollback stmt transactions while we are inside
      stored functions or triggers. This should be fixed in later (>=5.1)
      releases.
      
      
      mysql-test/r/sp_trans.result:
        Added test for bug #10015 "Crash in InnoDB if stored routines are used"
        and for general transaction handling inside of functions.
      mysql-test/t/sp_trans.test:
        Added test for bug #10015 "Crash in InnoDB if stored routines are used"
        and for general transaction handling inside of functions.
      sql/handler.cc:
        ha_trans_commit()/ha_trans_rollback():
          Since we don't support nested statement transactions in 5.0,
          we can't commit or rollback stmt transactions while we are inside
          stored functions or triggers. So we simply do nothing now.
          This should be fixed in later ( >= 5.1) releases.
      sql/item_func.cc:
        Item_func_sp::execute():
          Set THD::transaction.in_sub_stmt flag to TRUE during stored function
          execution to prevent commits and rollbacks for statement level
          transactions, since doing them will ruin such transaction for
          stateemtn which calls this function.
      sql/share/errmsg.txt:
        Added error message which says that statements doing explicit or implicit
        commits are disallowed in triggers and stored functions.
      sql/sql_base.cc:
        close_thread_tables():
          Clarified comment about committing of statement transactions in
          prelocked mode.
      sql/sql_class.h:
        THD::transaction:
          Added in_sub_stmt method which indicates that we are executing
          statements from trigger or stored function now, and thus
          statement transaction belongs to statement which invoked this
          routine and we should not commit or rollback it while executing
          these sub-statements.
      sql/sql_parse.cc:
        end_active_trans()/begin_trans()/end_trans():
          We should not commit or rollback global (non-stmt) transaction
          if we are executing stored function or trigger. These checks will
          catch situation when we are trying to do commit or rollback in stored
          procedure which is called from function or trigger.
      sql/sql_trigger.h:
        Table_triggers_list::process_triggers():
          Set THD::transaction.in_sub_stmt flag to TRUE during trigger
          execution to prevent commits and rollbacks for statement level
          transactions, since doing them will ruin such transaction for
          stateemtn which invokes this trigger.
      sql/sql_yacc.yy:
        Prohibited usage of statements which do explicit or implicit commit or
        rollback inside of stored functions and triggers.
      49357ae8
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1531ab87
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-5.0
      
      
      1531ab87
    • unknown's avatar
      Manual merge. · edb38786
      unknown authored
      
      sql/item.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      edb38786
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · c7787f8a
      unknown authored
      into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      c7787f8a
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · e9e0cc80
      unknown authored
      into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
      
      
      e9e0cc80