1. 02 Dec, 2006 3 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 7043524c
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-maint-24736
      
      
      7043524c
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · e0a4801a
      unknown authored
      into  example.com:/work/bug24395-v2/my51
      
      
      e0a4801a
    • unknown's avatar
      Bug#24736: UDF functions parsed as Stored Functions · b92081cd
      unknown authored
      Before this fix, a call to a User Defined Function (UDF) could,
      under some circumstances, be interpreted as a call to a Stored function
      instead. This occurred if a native function was invoked in the parameters
      for the UDF, as in "select my_udf(abs(x))".
      
      The root cause of this defect is the introduction, by the fix for Bug 21809,
      of st_select_lex::udf_list, and it's usage in the parser in sql_yacc.yy
      in the rule function_call_generic (in 5.1).
      
      While the fix itself for Bug 21809 is correct in 5.0, the code change
      merged into the 5.1 release created the issue, because the calls in 5.1 to :
      - lex->current_select->udf_list.push_front(udf)
      - lex->current_select->udf_list.pop()
      are not balanced in case of native functions, causing the udf_list,
      which is really a stack, to be out of sync with the internal stack
      maintained by the bison parser.
      
      Instead of moving the call to udf_list.pop(), which would have fixed the
      symptom, this patch goes further and removes the need for udf_list.
      
      This is motivated by two reasons:
      
      a) Maintaining a stack in the MySQL code in sync with the stack maintained
      internally in sql_yacc.cc (not .yy) is extremely dependent of the
      implementation of yacc/bison, and extremely difficult to maintain.
      It's also totally dependent of the structure of the grammar, and has a risk
      to break with regression defects each time the grammar itself is changed.
      
      b) The previous code did report construct like "foo(expr AS name)" as
      syntax errors (ER_PARSER_ERROR), which is incorrect, and misleading.
      The syntax is perfectly valid, as this expression is valid when "foo" is
      a UDF. Whether this syntax is legal or not depends of the semantic of "foo".
      
      With this change:
      
      a) There is only one stack (in bison), and no List<udf_func> to maintain.
      
      b) "foo(expr AS name)", when used incorrectly, is reported as semantic error:
      - ER_WRONG_PARAMETERS_TO_NATIVE_FCT (for native functions)
      - ER_WRONG_PARAMETERS_TO_STORED_FCT (for stored functions)
      This is achieved by the changes implemented in item_create.cc
      
      
      mysql-test/r/parser.result:
        New tests
      mysql-test/r/udf.result:
        New tests
      mysql-test/t/parser.test:
        New tests
      mysql-test/t/udf.test:
        New tests
      sql/item_create.cc:
        Semantic checks for named parameters, as in "foo(expr AS name)".
      sql/share/errmsg.txt:
        New error message
      sql/sql_lex.cc:
        Remove usage of udf_list.
      sql/sql_lex.h:
        Remove usage of udf_list.
      sql/sql_yacc.yy:
        Remove usage of udf_list.
      b92081cd
  2. 01 Dec, 2006 6 commits
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043 · 497f6049
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      mysql-test/t/rpl_sp.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      497f6049
    • unknown's avatar
      Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" · 108107f1
      unknown authored
      - Merged; updated test case.
      
      
      mysql-test/r/rpl_sp.result:
        - Merged; updated test case for 5.1
      mysql-test/t/rpl_sp.test:
        - Merged; updated result set for 5.1
      108107f1
    • unknown's avatar
      Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 · a3774e00
      unknown authored
      into  kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        null merge
      mysql-test/t/rpl_sp.test:
        null merge
      a3774e00
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 934aa981
      unknown authored
      into  example.com:/work/bug24395-v2/my51
      
      
      mysql-test/t/alter_table.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      934aa981
    • unknown's avatar
      Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" · 2f0b1d65
      unknown authored
      - Refactoring of duplicate code
      - Modified bad test cases
      - Changed expected error when operating on information_schema.
      
      
      mysql-test/r/information_schema.result:
        - updated result file with new error code.
      mysql-test/r/rpl_sp.result:
        - Modified test case
      mysql-test/t/information_schema.test:
        - Changed error code for operations on information_schema
      mysql-test/t/rpl_sp.test:
        - Modified test case
      sql/sql_parse.cc:
        - Cleaned up code:
          * replace tab with space
          * simplified if/switch statements
          * refactored duplicated code
      2f0b1d65
    • unknown's avatar
      Merge example.com:/work/bug24395-v2/my50 · 36a983b8
      unknown authored
      into  example.com:/work/bug24395-v2/my51
      
      
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      storage/myisam/mi_open.c:
        Auto merged
      sql/sql_table.cc:
        manual merge
      36a983b8
  3. 30 Nov, 2006 11 commits
  4. 29 Nov, 2006 20 commits
    • unknown's avatar
      Merge 192.168.0.5:mysql/mysql-5.1-maint · 49e3024c
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      49e3024c
    • unknown's avatar
      Update result to 5.1 version format · cadef275
      unknown authored
      cadef275
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731 · 2b58a8ec
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
      
      
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      client/mysqltest.c:
        Manual merge
      2b58a8ec
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 · 30278aed
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/handler.cc:
        Auto merged
      client/mysqltest.c:
        Manual merge
      30278aed
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 · e5bfeab3
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/mysqltest.result:
        Auto merged
      mysql-test/r/varbinary.result:
        Auto merged
      mysql-test/t/mysqltest.test:
        Auto merged
      sql/field_conv.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      e5bfeab3
    • unknown's avatar
      Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 · 8e0614c8
      unknown authored
       - chmod the saved files from 4.1 to make sure they are writable
      
      
      mysql-test/t/varbinary.test:
        As the files saved from 4.1 has been in bk they muight be readonly
        Use "chmod" to make sure they are writable
      8e0614c8
    • unknown's avatar
      Add command "chmod" to mysqltest · 0e8ed1b5
      unknown authored
      
      client/mysqltest.c:
        Add "chmod" command
      mysql-test/r/mysqltest.result:
        Update result file
      mysql-test/t/mysqltest.test:
        Add tests for chmod
      0e8ed1b5
    • unknown's avatar
      Merge 192.168.0.10:mysql/work/my51-work · 4b13e338
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
      
      
      BitKeeper/etc/ignore:
        auto-union
      client/mysql.cc:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/func_misc.result:
        Auto merged
      mysql-test/r/mysql.result:
        Auto merged
      mysql-test/r/rpl_000015.result:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/rpl_000015.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      4b13e338
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · 66466ddf
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      66466ddf
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my50-work · a763eeff
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/work/my51-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      a763eeff
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · acce5337
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      acce5337
    • unknown's avatar
      Merge neptunus.(none):/home/msvensson/mysql/work/my41-work · 2aac04f9
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/work/my50-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      2aac04f9
    • unknown's avatar
    • unknown's avatar
      Change mode of the checked in 4.1 version files so they are writable · 6f1c3848
      unknown authored
      
      mysql-test/std_data/bug19371.frm:
        Change mode to -rw-rw--w-
      mysql-test/std_data/bug19371.MYD:
        Change mode to -rw-rw--w-
      mysql-test/std_data/bug19371.MYI:
        Change mode to -rw-rw--w-
      6f1c3848
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint · babdd153
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
      
      
      BitKeeper/etc/collapsed:
        auto-union
      BitKeeper/etc/ignore:
        auto-union
      Docs/Makefile.am:
        Auto merged
      Makefile.am:
        Auto merged
      client/mysqltest.c:
        Auto merged
      extra/yassl/src/ssl.cpp:
        Auto merged
      include/my_sys.h:
        Auto merged
      mysql-test/Makefile.am:
        Auto merged
      mysql-test/mysql-test-run-shell.sh:
        Auto merged
      mysql-test/extra/rpl_tests/rpl_deadlock.test:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/rpl_000015.result:
        Auto merged
      mysql-test/r/rpl_deadlock_innodb.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/limit.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/rpl_000015.test:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      mysql-test/t/view_grant.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      babdd153
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 · dbe85caf
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
      
      
      client/mysql_upgrade.c:
        Auto merged
      configure.in:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      support-files/mysql.spec.sh:
        Auto merged
      include/my_sys.h:
        Manual merge - my_getpagesize defined further down separate from HAVE_SYS_MMAN_H
      dbe85caf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 6981993e
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
      
      
      mysql-test/r/func_misc.result:
        Auto merged
      6981993e
    • unknown's avatar
      Fix merges. · 724e06e7
      unknown authored
      
      mysql-test/r/func_misc.result:
        case change in SHOW CREATE keywords.
      mysql-test/r/mysql.result:
        Revert clobber of charset special chars.
      mysql-test/t/mysql.test:
        Revert clobber of charset special chars.
      724e06e7
    • unknown's avatar
      Many files: · 8f71610f
      unknown authored
        Changed paths to ndb include directory to include "storage"
      Makefile.am:
        Adjusted path to yaSSL libtool libraries
      ssl.m4:
        Use libtool way of specifying yaSSL libraries
      
      
      config/ac-macros/ssl.m4:
        Use libtool way of specifying yaSSL libraries
      libmysqld/Makefile.am:
        Adjusted path to yaSSL libtool libraries
      storage/ndb/config/type_kernel.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapi.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitest.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_ndbapitools.mk.am:
        Changed paths to ndb include directory to include "storage"
      storage/ndb/config/type_util.mk.am:
        Changed paths to ndb include directory to include "storage"
      8f71610f
    • unknown's avatar
      Merge fixes for new test cases · 74ff94ec
      unknown authored
      74ff94ec