1. 07 Jun, 2005 1 commit
    • unknown's avatar
      Patch two (the final one) for Bug#7306 "the server side preparedStatement · 59544040
      unknown authored
       error for LIMIT placeholder".
      The patch adds grammar support for LIMIT ?, ? and changes the
      type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
      so that it can point to Item_param.
      
      
      mysql-test/include/ps_modify.inc:
        Fix existing tests: now LIMIT can contain placeholders.
      mysql-test/include/ps_query.inc:
        Fix existing tests: now LIMIT can contain placeholders.
      mysql-test/r/ps.result:
        Add basic test coverage for LIMIT ?, ? and fix test results.
      mysql-test/r/ps_2myisam.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/r/ps_3innodb.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/r/ps_4heap.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/r/ps_5merge.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/r/ps_6bdb.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/r/ps_7ndb.result:
        Fix test results: now LIMIT can contain placeholders.
      mysql-test/t/ps.test:
        Add basic test coverage for LIMIT ?, ?.
      sql/item.h:
        Add a short-cut for (ulonglong) val_int() to Item.
        Add a constructor to Item_int() that accepts ulonglong.
        Simplify Item_uint constructor by using the c-tor above.
      sql/item_subselect.cc:
        Now select_limit has type Item *.
        We can safely create an Item in Item_exists_subselect::fix_length_and_dec():
        it will be allocated in runtime memory root and freed in the end of
        execution.
      sql/sp_head.cc:
        Add a special initalization state for stored procedures to 
        be able to easily distinguish the first execution of a stored procedure
        from prepared statement prepare.
      sql/sql_class.h:
        Introduce new state 'INITIALIZED_FOR_SP' to be able to easily distinguish
        the first execution of a stored procedure from prepared statement prepare.
      sql/sql_derived.cc:
        - use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
          evreryplace. Add a warning about use of set_limit in 
        mysql_derived_filling.
      sql/sql_error.cc:
        - use unit->set_limit() to set unit->select_limit_cnt, offset_limit_cnt
          evreryplace.
        - this change is also aware of bug#11095 "show warnings limit 0 returns 
        all rows instead of zero rows", so the one who merges the bugfix from
        4.1 can use local version of sql_error.cc.
      sql/sql_handler.cc:
        - use unit->set_limit() to initalize 
        unit->select_limit_cnt,offset_limit_cnt everyplace.
      sql/sql_lex.cc:
        Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
      sql/sql_lex.h:
        Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
      sql/sql_parse.cc:
        - use unit->set_limit() to initalize 
        unit->select_limit_cnt,offset_limit_cnt everyplace. 
        - we can create an Item_int to set global limit of a statement:
        it will be created in the runtime mem root and freed in the end of
        execution.
      sql/sql_repl.cc:
        Use unit->set_limit to initialize limits.
      sql/sql_select.cc:
        - select_limit is now Item* so the proper way to check for default value
        is to compare it with NULL.
      sql/sql_union.cc:
        Evaluate offset_limit_cnt using the new type of ST_SELECT_LEX::offset_limit
      sql/sql_view.cc:
        Now ST_SELECT_LEX::select_limit, offset_limit have type Item *
      sql/sql_yacc.yy:
        Add grammar support for LIMIT ?, ? clause.
      59544040
  2. 03 Jun, 2005 11 commits
  3. 02 Jun, 2005 28 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 7b7a9df7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      7b7a9df7
    • unknown's avatar
      assemble libmysqld.a 5-10 times faster! · 2c448106
      unknown authored
      2c448106
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 0cb9a2cb
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-root
      
      0cb9a2cb
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61abf882
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
      
      61abf882
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6d67d148
      unknown authored
      into mysql.com:/opt/local/work/mysql-5.0-root
      
      6d67d148
    • unknown's avatar
      Give Item_arena::is_stmt_prepare a more descriptive name (it marks · 2e900a41
      unknown authored
      the code that is active for SP as well in 5.0)
      
      
      sql/item.cc:
        Rename of an Item_arena method.
      sql/item_subselect.cc:
        Rename of an Item_arena method.
      sql/sql_class.h:
        Rename of an Item_arena method.
      sql/sql_parse.cc:
        Rename of an Item_arena method.
      sql/sql_union.cc:
        Rename of an Item_arena method.
      2e900a41
    • unknown's avatar
      Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1 · 94e72e51
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Auto merged
      94e72e51
    • unknown's avatar
      WL#2286 - Compile MySQL w/YASSL support · 20daba5c
      unknown authored
      Compilation errors fixes.
      
      
      config/ac-macros/yassl.m4:
        Switch to -l/-L instead of passing file name directly. (more portable for ".a" archives)
      extra/yassl/taocrypt/src/integer.cpp:
        Instantiate more templates (needed by some 64bit boxes).
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Instantiate more templates (needed by some 64bit boxes).
        Move tcArrayDelete to TaoCrypt namespace (more portable).
      20daba5c
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a370d165
      unknown authored
      into dl145b.mysql.com:/home/ndbdev/tomas/tmp
      
      a370d165
    • unknown's avatar
      CommandInterpreter.cpp: · 5eb57650
      unknown authored
        Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
      
      
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
      5eb57650
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7dadbb17
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      sql/sql_select.cc:
        Auto merged
      7dadbb17
    • unknown's avatar
      Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0 · a0b9df92
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      a0b9df92
    • unknown's avatar
      item_func.h: · cdf62601
      unknown authored
        Identation correction for the fix of bug #9939.
      
      
      sql/item_func.h:
        Identation correction for the fix of bug #9939.
      cdf62601
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9e2e4901
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      9e2e4901
    • unknown's avatar
      fixed compile problem by replacing W_OK with F_OK · 1887e42d
      unknown authored
      
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1887e42d
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · d3f8b328
      unknown authored
      into igor-inspiron.creware.com:/home/igor/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      d3f8b328
    • unknown's avatar
      ha_innodb.cc: · cab01125
      unknown authored
        Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure
      
      
      sql/ha_innodb.cc:
        Weaken InnoDB table locking at the start of a stored procedure call: this will make multi-transaction stored procedures less deterministic for binlogging, but since they are non-deterministic anyway, it is not that bad; this fix will remove the huge amount of InnoDB tranasctional deadlocks caused by table locking at the start of a stored procedure
      cab01125
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f5fd592
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      0f5fd592
    • unknown's avatar
    • unknown's avatar
      Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 · 65a90632
      unknown authored
      into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      65a90632
    • unknown's avatar
      item_func.h: · 1adfc2f2
      unknown authored
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        The str_op virtual method was added into Item_func_numhybrid.
      item_func.cc:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        The str_op virtual method was added into Item_func_numhybrid.
      item_cmpfunc.h, item_cmpfunc.cc:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        Item_func_coalesce and Item_func_ifnull now
        inherit from a modified Item_func_numhybrid.
      case.test, case.result:
        Added test cases for bug #9939.
      
      
      mysql-test/r/case.result:
        Added test cases for bug #9939.
      mysql-test/t/case.test:
        Added test cases for bug #9939.
      sql/item_cmpfunc.cc:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        Item_func_coalesce and Item_func_ifnull now
        inherit from a modified Item_func_numhybrid.
      sql/item_cmpfunc.h:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        Item_func_coalesce and Item_func_ifnull now
        inherit from a modified Item_func_numhybrid.
      sql/item_func.cc:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        The str_op virtual method was added into Item_func_numhybrid.
      sql/item_func.h:
        Fixed bug #9939: a wrong conversion of arguments
        for functions COALESCE and IFNULL.
        he str_op virtual method was added into Item_func_numhybrid.
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      1adfc2f2
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 84d200e3
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-5.0
      
      
      sql/item_func.cc:
        Auto merged
      84d200e3
    • unknown's avatar
      cleanup · be2324dc
      unknown authored
      
      extra/yassl/src/ssl.cpp:
        unresolved __cxa_pure_virtual
      sql/item_func.cc:
        don't call arg[0]->val_xxx() twice
      be2324dc
    • unknown's avatar
      Merge · e74c23e5
      unknown authored
      e74c23e5
    • unknown's avatar
      misc. fixes for windoze builds · 3f245beb
      unknown authored
      
      VC++Files/client/mysql.dsp:
        added missing mysys.lib
      VC++Files/client/mysqladmin.dsp:
        added missing mysys.lib
      VC++Files/client/mysqlimport.dsp:
        added missing mysys.lib
      VC++Files/client/mysqlshow.dsp:
        added missing mysys.lib
      VC++Files/libmysql/libmysql.dsp:
        added missing mysys.lib
      VC++Files/mysql.dsw:
        added dependencies on mysys
      include/config-win.h:
        added missing constant
      sql/sql_base.cc:
        pulled declaration of table_list out of for-scope
      3f245beb
    • unknown's avatar
      Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails · 1005e0a6
      unknown authored
        Integer overflow results in wrong field sortlength.
      
      
      sql/item_cmpfunc.cc:
        Fix bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
      mysql-test/t/func_if.test:
        Test for bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
      mysql-test/r/func_if.result:
        Test for bug #9669 Ordering on IF function with FROM_UNIXTIME function fails.
      1005e0a6
    • unknown's avatar
      Modified handling of guarded predicates at condition pushdown to storage... · a8eb457a
      unknown authored
      Modified handling of guarded predicates at condition pushdown to storage engine, to make valgrind happy
      
      
      a8eb457a
    • unknown's avatar