1. 14 Nov, 2005 8 commits
    • unknown's avatar
      Fix bug #14816 test_if_order_by_key() expected only Item_fields. · 0a9badec
      unknown authored
      test_if_order_by_key() expected only Item_fields to be in order->item, thus
      failing to find available index on view's field, which results in reported
      error.
      
      Now test_if_order_by_key() calls order->item->real_item() to get field for
      choosing index.
      
      
      sql/sql_select.cc:
        Fix bug #14816 test_if_order_by_key() expected only Item_fields.
        Make test_if_order_by_key() use real_item() to get field.
      mysql-test/r/view.result:
        Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
      mysql-test/t/view.test:
        Test case for bug#14816 test_if_order_by_key() expected only Item_fields.
      0a9badec
    • unknown's avatar
    • unknown's avatar
    • unknown's avatar
      Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel · 57a752f4
      unknown authored
      into  selena.:H:/MYSQL/bkt/mysql-5.0
      
      
      57a752f4
    • unknown's avatar
      Fixes bug #13377. my_open() & my_create() functions changed to use · 303cae4c
      unknown authored
      my_sopen() on win32 which allows to use FILE_SHARE_DELETE flag to 
      allow deleting opened files. my_sopen() implementation is added to
      support this functionality.
      
      
      include/my_global.h:
        Fixes bug #13377. Added number of constants for share delete file
        open option.
      include/my_sys.h:
        Fixes bug #13377. Added my_sopen function.
      mysys/my_create.c:
        Fixes bug #13377. my_create() function changed to use my_sopen() and which allows
        to use FILE_SHARE_DELETE flag on win32, which helps in deleting opened files.
      mysys/my_open.c:
        Fixes bug #13377. my_open() function changed to use my_sopen() on win32
        which allows to use FILE_SHARE_DELETE flag to allow deleting opened files.
      sql/log.cc:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      sql/sql_class.h:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      sql/sql_repl.cc:
        Fixes bug #13377. Additional patch - remove reference counting for
        opened binlog files, introduced in initial patch of #13377.
      303cae4c
    • unknown's avatar
      Fixed number of compiler errors on win32. · 67df0e19
      unknown authored
      
      VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
        Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
      sql/ha_innodb.cc:
        Fixed compiler error for Win32 build.
      sql/spatial.cc:
        Fixed compiler error for Win32 build. float8get should be enclosed
        in {} since it is macro on win32 and might cause unmatching blocks.
      67df0e19
    • unknown's avatar
      config-win.h: · 63bbb151
      unknown authored
        Disabled yaSSL support for now
      
      
      include/config-win.h:
        Disabled yaSSL support for now
      63bbb151
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca · 0deb1f55
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      0deb1f55
  2. 13 Nov, 2005 1 commit
    • unknown's avatar
      mysql-test-run.pl: · c2826d72
      unknown authored
        Corrected search for 'mysqlimport' executable
      
      
      mysql-test/mysql-test-run.pl:
        Corrected search for 'mysqlimport' executable
      c2826d72
  3. 11 Nov, 2005 7 commits
  4. 10 Nov, 2005 24 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 986bc3fb
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
      
      
      986bc3fb
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 15763e1f
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      15763e1f
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · cadfe999
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      cadfe999
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2ee2747b
      unknown authored
      into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
      
      
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/t/mysqldump.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Manual merge.
      2ee2747b
    • unknown's avatar
      WL#2818 (Add creator to the trigger definition for privilege · 7dbea7df
      unknown authored
      checks on trigger activation)
      
      
      mysql-test/r/information_schema.result:
        Update result file: a new column DEFINER has been added to
        INFORMATION_SCHEMA.TRIGGERS.
      mysql-test/r/mysqldump.result:
        Update result file: a new column DEFINER has been added to
        INFORMATION_SCHEMA.TRIGGERS.
      mysql-test/r/rpl_ddl.result:
        Update result file: a new column DEFINER has been added to
        INFORMATION_SCHEMA.TRIGGERS.
      mysql-test/r/rpl_sp.result:
        Update result file: a new clause DEFINER has been added to
        CREATE TRIGGER statement.
      mysql-test/r/rpl_trigger.result:
        Results for new test cases were added.
      mysql-test/r/skip_grants.result:
        Error message has been changed.
      mysql-test/r/trigger.result:
        Added DEFINER column.
      mysql-test/r/view.result:
        Error messages have been changed.
      mysql-test/r/view_grant.result:
        Error messages have been changed.
      mysql-test/t/mysqldump.test:
        Drop created procedure to not affect further tests.
      mysql-test/t/rpl_trigger.test:
        Add tests for new column in information schema.
      mysql-test/t/skip_grants.test:
        Error tag has been renamed.
      mysql-test/t/view.test:
        Error tag has been renamed.
      mysql-test/t/view_grant.test:
        Error tag has been changed.
      sql/item_func.cc:
        Fix typo in comments.
      sql/mysql_priv.h:
        A try to minimize copy&paste:
          - introduce operations to be used from sql_yacc.yy;
          - introduce an operation to be used from trigger and
            view processing code.
      sql/share/errmsg.txt:
        - Rename ER_NO_VIEW_USER to ER_MALFORMED_DEFINER in order to
          be shared for view and trigger implementations;
        - Fix a typo;
        - Add a new error code for trigger warning.
      sql/sp.cc:
        set_info() was split into set_info() and set_definer().
      sql/sp_head.cc:
        set_info() was split into set_info() and set_definer().
      sql/sp_head.h:
        set_info() was split into set_info() and set_definer().
      sql/sql_acl.cc:
        Add a new check: exit from the cycle if the table is NULL.
      sql/sql_lex.h:
        - Rename create_view_definer to definer, since it is used for views
          and triggers;
        - Change st_lex_user to LEX_USER, since st_lex_user is a structure.
          So, formally, it should be "struct st_lex_user", which is longer
          than just LEX_USER;
        - Add trigger_definition_begin.
      sql/sql_parse.cc:
        - Add a new check: exit from the cycle if the table is NULL;
        - Implement definer-related functions.
      sql/sql_show.cc:
        Add DEFINER column.
      sql/sql_trigger.cc:
        Add DEFINER support for triggers.
      sql/sql_trigger.h:
        Add DEFINER support for triggers.
      sql/sql_view.cc:
        Rename create_view_definer to definer.
      sql/sql_yacc.yy:
        Add support for DEFINER-clause in CREATE TRIGGER statement.
        
        Since CREATE TRIGGER and CREATE VIEW can be similar at the start,
        yacc is unable to distinguish between them. So, had to modify both
        statements in order to make it parsable by yacc.
      mysql-test/r/trigger-compat.result:
        Result file for triggers backward compatibility test.
      mysql-test/r/trigger-grant.result:
        Result file of the test for WL#2818.
      mysql-test/t/trigger-compat.test:
        Triggers backward compatibility test: check that the server
        still can load triggers w/o definer attribute and modify
        tables with such triggers (add a new trigger, etc).
      mysql-test/t/trigger-grant.test:
        Test for WL#2818 -- check that DEFINER support in triggers
        works properly
      7dbea7df
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-clean · db813bde
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      scripts/mysql_fix_privilege_tables.sql:
        Auto merged
      db813bde
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-14469 · cde1be69
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      cde1be69
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-12570 · 60ebe499
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/mysqld.cc:
        Auto merged
      60ebe499
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 1c30627b
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      1c30627b
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3d42cd8d
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0
      
      
      3d42cd8d
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · b861f198
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      b861f198
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-5.0-release · 74914637
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0
      
      
      74914637
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 3bb367f2
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0-release
      
      
      3bb367f2
    • unknown's avatar
      WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions". · 5d9c8e95
      unknown authored
      Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
      the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
      They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
      We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
      
      
      mysql-test/mysql-test-run.pl:
        update to new option name
      mysql-test/mysql-test-run.sh:
        update to new option name
      mysql-test/mysql_test_run_new.c:
        update to new option name
      mysql-test/r/rpl_sp.result:
        result update
      mysql-test/t/rpl_sp-slave.opt:
        we need to skip this error to not hit BUG#14769
      mysql-test/t/rpl_sp.test:
        Test update:
        1) as log-bin-trust-routine-creators now affects only functions, the testing of this option, which was
        mainly done on procedures, is moved to functions
        2) cleanup is simplified; and instead of many SHOW BINLOG EVENTS we do a big one in the end, which is more
        maintainable.
        3) we test a few more function and procedures cases to see how they replicate.
        4) removing out-of-date comments
      sql/item_func.cc:
        This warning is wrong since binlogging of functions was changed in August. If a function fails
        in the middle, it will be binlogged with its error code (i.e. properly).
      sql/mysql_priv.h:
        variable name changed
      sql/mysqld.cc:
        option name changes. A precision about --read-only.
      sql/set_var.cc:
        a new class sys_var_trust_routine_creators to be able to issue a "this is a deprecated variable" warning if used.
      sql/set_var.h:
        new class to be able to issue a "this is a deprecated variable" warning if used.
      sql/share/errmsg.txt:
        routine -> function
      sql/sp.cc:
        log-bin-trust-routine-creators now applies only to functions.
      sql/sql_parse.cc:
        1) sending ER_FAILED_ROUTINE_BREAK_BINLOG is wrong since August as we don't binlog CALL anymore but instead binlog the substatements;
        the clear_error() goes away too as it was necessary only when we created a binlog event from the "CALL" statement.
        2) log-bin-trust-routine-creators now applies only to functions.
      sql/sql_trigger.cc:
        comments.
      5d9c8e95
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 76fb6d69
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      76fb6d69
    • unknown's avatar
      Added handlerton flag to make storage engines invisable via flag. · fca8f01a
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Remove binlog from visable engine list.
      sql/handler.h:
        Added documentation to HTON's
      sql/log.cc:
        binlog now has hidden flag show that it does now show up in show storage engine list.
      sql/sql_show.cc:
        Flag removes engines from view in show storage engines
      fca8f01a
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 33956088
      unknown authored
      into mysql.com:/home/hf/work/mysql-5.0.14268
      
      
      33956088
    • unknown's avatar
      Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong. · 0c97fbef
      unknown authored
      
      mysql-test/t/mysqldump.test:
        Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong.
        2>&1 added to be able to see error messages.
      0c97fbef
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 083d321e
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
      
      
      083d321e
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-4.1-gca · 599a6f1f
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-4.1
      
      
      599a6f1f
    • unknown's avatar
      Merge mysql.com:/home/mysql_src/mysql-4.1-gca · 93607e35
      unknown authored
      into  mysql.com:/home/mysql_src/mysql-5.0-release
      
      
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      93607e35
    • unknown's avatar
      Declaring some class members public for BUG#12377: · 6e56f7e0
      unknown authored
      "Item_date_add_interval needs to have the int_type member as Public".
      As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
      So please keep those members public.
      
      
      sql/item_func.h:
        declaring some class members public for BUG#12377
      sql/item_strfunc.h:
        declaring some class members public for BUG#12377
      sql/item_timefunc.h:
        declaring some class members public for BUG#12377
      6e56f7e0
    • unknown's avatar
      Fix a comment. · 96ae0b92
      unknown authored
      
      sql/sql_cursor.cc:
        A post-review fix for Bug#13488
      96ae0b92
    • unknown's avatar
      Provide a default "minimum thread stack size" PTHREAD_STACK_MIN where it is missing. · d295807e
      unknown authored
      (Currently, affects only BSD with Linuxthreads)
      
      
      d295807e