An error occurred fetching the project authors.
  1. 10 Aug, 2005 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cf1a9d3b
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-12243
      
      
      cf1a9d3b
    • unknown's avatar
      Fix coding style. · ad729777
      unknown authored
      ad729777
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · 259da9d1
      unknown authored
      into  linux.site:/home/reggie/bk/mysql-5.0-new
      
      
      server-tools/instance-manager/IMService.cpp:
        Auto merged
      259da9d1
    • unknown's avatar
      error message fixed · 2bd3255e
      unknown authored
      2bd3255e
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · ffbe897a
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      ffbe897a
    • unknown's avatar
      A fix for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY join in · 8e9f6b19
      unknown authored
      subqry order by server crash": failing DBUG_ASSERT(curr_join == this)
      when opening a cursor.
      Ensure that for top-level join curr_join == join (always), 
      and thus fix the failing assert.
      curr_join is a hack to ensure that uncacheable subqueries can be
      re-evaluated safely, and should be never different from main join
      in case of top-level join.
      
      
      sql/sql_select.cc:
        - utilize tmp_join only if we evaluate an uncacheable subquery.
      sql/sql_select.h:
        - implement JOIN::is_top_level_join()
      tests/mysql_client_test.c:
        A test case for Bug#11901 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY
         join in subqry order by server crash"
      8e9f6b19
    • unknown's avatar
      Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 · 1900c79f
      unknown authored
      into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
      
      
      sql/ha_ndbcluster.cc:
        SCCS merged
      1900c79f
    • unknown's avatar
      0ba4be2b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8559ef62
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-bg12280
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      8559ef62
    • unknown's avatar
      Fix for bug #12280 "Triggers: crash if flush tables". · f6fff55e
      unknown authored
      We should not allow FLUSH statement to be executed inside both triggers
      and stored functions.
      
      
      mysql-test/r/sp-error.result:
        Updated test after replacing error, which is thrown when one uses FLUSH
        statement inside of stored function, with more specific.
        Also now we issue more general error when we barking about USE command
        in stored routines.
      mysql-test/r/trigger.result:
        Added test for bug #12280 "Triggers: crash if flush tables"
      mysql-test/t/sp-error.test:
        Updated test after replacing error, which is thrown when one uses FLUSH
        statement inside of stored function, with more specific.
        Also now we issue more general error when we barking about USE command
        in stored routines.
      mysql-test/t/trigger.test:
        Added test for bug #12280 "Triggers: crash if flush tables"
      sql/share/errmsg.txt:
        Removed ER_SP_NO_USE error. Now we use more general ER_SP_BADSTATEMENT in this
        case. Instead added error message for barking about statements which should not
        be allowed inside of stored functions or triggers.
        It is safe to do this since it is highly unprobable that someone will upgrade
        first to the new 5.0 release and then downgrade back to the old one.
      sql/sql_parse.cc:
        reload_acl_and_cache():
          FLUSH TABLES and FLUSH PRIVILEGES should not be allowed if we are inside
          of stored function or trigger.
      sql/sql_yacc.yy:
        We should not allow FLUSH statement inside both triggers and stored
        functions. Replaced error which is thrown in this case with more
        specific.
        Also now we issue more general ER_SP_BADSTATEMENT error when one tries
        to use USE command inside of stored routine.
      f6fff55e
  2. 09 Aug, 2005 15 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 03198127
      unknown authored
      into moonbone.local:/work/mysql-5.0-bug-12340
      
      
      03198127
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · d3614012
      unknown authored
      into  monster.:D:/Work/mysql/mysql-5.0
      
      
      d3614012
    • unknown's avatar
      Some changes to project files · 741d3ae1
      unknown authored
      str_alloc had been added but was not added to mysqlclient and strings
      libmysql should have had strings as a dependent.
      
      
      VC++Files/client/mysqlclient.vcproj:
        Added missing file
      VC++Files/mysql.sln:
        Make libmysql dependendent on strings
      VC++Files/strings/strings.vcproj:
        Added missing file
      741d3ae1
    • unknown's avatar
      Fix bug #12340 Wrong comparison in ha_innobase::cmp_ref() · 71a8b11f
      unknown authored
      When PRIMARY KEY is present ha_innobase::cmp_ref() uses it to compare refs.
      After comparing part of key it moves pointers to compare next part.
      For varchar parts pointers were moved only by length of parts, not including
      bytes containig part length itself. This results in wrong comparision and
      wrong number of deleted records.
      
      
      
      sql/ha_innodb.cc:
        Fix bug #12340  ha_innobase::cmp_ref() moves pointers by wrong length.
      mysql-test/t/innodb.test:
        Test case for bug #12340 ha_innobase::cmp_ref() moves pointers by wrong length.
      mysql-test/r/innodb.result:
        Test case for bug #12340 ha_innobase::cmp_ref() moves pointers by wrong length.
      71a8b11f
    • unknown's avatar
      changes to IM code that came from Petr's review · f766a1dc
      unknown authored
      server-tools/instance-manager/IMService.cpp:
        syntax change requested by Petr
      server-tools/instance-manager/options.cc:
        return 1 instead of -1
      server-tools/instance-manager/options.h:
        changed return value of setup_windows_defaults to int from void
      f766a1dc
    • unknown's avatar
      removing trailing spaces · 81a24473
      unknown authored
      81a24473
    • unknown's avatar
      7a42570f
    • unknown's avatar
      changes to IM that came from Petr and JimW's review. · 5d8222cd
      unknown authored
      server-tools/instance-manager/IMService.cpp:
        make sure HandleServiceOptions returns 0 on success and 1 on failure
      server-tools/instance-manager/mysqlmanager.cc:
        default return value is 1.
        simplify some code bits by just jumping to err on error.
        move options.cleanup inside the err block.  In this case, the err block
        is more than just an error block.  It is the terminating block
        for both error and success.  You set return_value to 0 for success
        or leave it as 1 for failure.  This simplies this function a bit.
      server-tools/instance-manager/options.cc:
        remove the malloc for default password filename on Windows and replace
        with statically allocated memory.
        
        default Options:saved_argv to NULL so that we will know if we need
        to free it in cleanup()
        
        setup the default config file location for Windows inside the
        setup_windows_defaults function and remove this code from load()
        
        rework setup_windows_defaults so that it properly returns 0 on success
        and 1 on error and so it fills in the default location for the
        log file, password file, and config file.
      5d8222cd
    • unknown's avatar
      small corrections to the IM. · 530abb5c
      unknown authored
      server-tools/instance-manager/IMService.cpp:
        removed \n from log_info calls as these will be added automatically
      server-tools/instance-manager/user_map.cc:
        added back in support for password files using \r\n, this time
        without breaking the const contract.
      530abb5c
    • unknown's avatar
      Added missing cast. · 88c4ad24
      unknown authored
      88c4ad24
    • unknown's avatar
      Merged code. · 776713f4
      unknown authored
      776713f4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8e062962
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-is
      
      
      8e062962
    • unknown's avatar
      Fix after merging patch solving bug #10055 "Using stored function with · 48c12564
      unknown authored
      information_schema causes empty result set" with main tree.
      
      
      sql/sp_head.cc:
        Now close_thread_tables() does not have 4th 'stopper' argument.
      48c12564
    • unknown's avatar
      Fixed test that failed on 32 bit systems · c4228519
      unknown authored
      sql/ha_innodb.cc:
        Don't print not critical warning if log_warnings is not set
        Use sql_print_warning() instead of fprintf().
        (We should not use fprintf() as this causes problems on windows and with the embedded server)
      c4228519
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8103db27
      unknown authored
      into  mysql.com:/home/dlenev/src/mysql-5.0-is
      
      
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      mysql-test/r/sp.result:
        Manual merge
      mysql-test/t/sp.test:
        Manual merge
      sql/sql_class.h:
        Manual merge
      8103db27
  3. 08 Aug, 2005 13 commits
    • unknown's avatar
      ha_innodb.cc: · 807a9c8d
      unknown authored
        Add a forgotten newline to a print
      
      
      sql/ha_innodb.cc:
        Add a forgotten newline to a print
      807a9c8d
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-11570 · c4187de6
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      mysql-test/t/sp.test:
        Auto merged
      c4187de6
    • unknown's avatar
      Fix error code in some tests because of merge · 05071ff4
      unknown authored
      mysql-test/t/errors.test:
        Fix error code
      mysql-test/t/type_bit.test:
        Fix error code
      mysql-test/t/type_bit_innodb.test:
        Fix error code
      05071ff4
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-6080 · 1f01817e
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      sql/sql_parse.cc:
        Auto merged
      sql/share/errmsg.txt:
        SCCS merged
      1f01817e
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-3094 · 279846b4
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      279846b4
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9e3e0c87
      unknown authored
      into  mysql.com:/home/kostja/mysql/mysql-5.0-11909
      
      
      sql/sql_select.cc:
        Auto merged
      9e3e0c87
    • unknown's avatar
      A fix and a test case for Bug#11909 "mysql_stmt_attr_set · 76a280f1
      unknown authored
      CURSOR_TYPE_READ_ONLY nested queries corrupt result"
      
      
      sql/sql_prepare.cc:
        If there is a cursor, use its protocol for fetch: 
        Protocol instances have a state and thd->protocol_prep can't
        be used for multiple cursors.
      sql/sql_select.cc:
        - init Cursor::protocol
      sql/sql_select.h:
        - add Cursor::protocol
      tests/mysql_client_test.c:
        A test case for Bug#11909 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY
         nested queries corrupt result"
      76a280f1
    • unknown's avatar
      grant.result: · f4e06591
      unknown authored
        After merge fix
      
      
      mysql-test/r/grant.result:
        After merge fix
        ,
      f4e06591
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1.b10892 · 3f70f804
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysql-test/t/grant.test:
        Auto merged
      sql/item.cc:
        Auto merged
      mysql-test/r/grant.result:
        using local copy
      3f70f804
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 630a23ba
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug12082
      
      
      sql/sql_select.cc:
        Auto merged
      630a23ba
    • unknown's avatar
      Fix for bug #10055 "Using stored function with information_schema causes empty · 39fda600
      unknown authored
      result set".
      
      To enable full access to contents of I_S tables from stored functions
      or statements that use them, we manipulate with thread's open tables
      state and ensure that we won't cause deadlock when we open tables by
      ignoring flushes and name-locks.
      Building of contents of I_S.TABLES no longer requires locking of tables
      since we use use handler::info() method with HA_STATUS_AUTO flag instead
      of handler::update_auto_increment() for obtaining information about
      auto-increment values. But this also means that handlers have to implement
      support for HA_STATUS_AUTO flag (particularly InnoDB needs it).
      
      
      mysql-test/r/alter_table.result:
        Updated test results. This change was caused by the fact that now when
        we build contents of I_S tables (and thus output of SHOW INDEX) we
        don't use instances of tables which may be already opened and locked
        by thread (we always use new instance).
      mysql-test/r/information_schema.result:
        Added test which checks how information about current auto-increment value for
        table is reported in INFORMATION_SCHEMA.TABLES view.
      mysql-test/r/sp.result:
        Added test for bug #10055 "Using stored function with information_schema causes
        empty result set".
      mysql-test/t/information_schema.test:
        Added test which checks how information about current auto-increment value for
        table is reported in INFORMATION_SCHEMA.TABLES view.
      mysql-test/t/sp.test:
        Added test for bug #10055 "Using stored function with information_schema causes
        empty result set".
      sql/mysql_priv.h:
        close_thread_tables():
          Get rid of 'stopper' argument which is no longer used. Now when we need
          to open and then close some table without touching tables which are already
          opened we use THD::reset_n/restore_backup_open_tables_state() methods.
        open_tables()/open_normal_and_derived_tables():
          Added 'flags' argument to be able open tables even if some has done
          a flush or hold namelock on them.
      sql/sp.cc:
        close_proc_table/open_proc_table_for_read/db_find_routine():
          Replaced push_open_tables_state/pop_open_tables_state() methods which
          were saving/restoring current open tables state in/from THD::open_state_list
          with reset_n_backup_open_tables_state/restore_backup_open_tables_state()
          methods which assume that backup storage for this state is allocated on
          stack (or elsewhere) by their caller.
        open_proc_table_for_read():
          Since now we can have several open tables states stacked up we can't rely
          rely on checking whether we have some tables open in previous state.
          Instead we always assume that some tables are open and we need to ignore
          flush while locking mysql.proc. We don't really need 
          MYSQL_LOCK_IGNORE_GLOBAL_READ_LOCK in this case since we open mysql.proc table
          only for reading.
      sql/sp.h:
        Added declarations of open_proc_table_for_read()/close_proc_table() to be
        able to use them in sql_show.cc.
      sql/sql_base.cc:
        close_thread_tables():
          Get rid of 'stopper' argument which is no longer used. Now when we need
          to open and then close some table without touching tables which are already
          opened we use THD::reset_n/restore_backup_open_tables_state() methods.
        open_tables()/open_normal_and_derived_tables():
          Added 'flags' argument to be able open tables even if some has done
          a flush or hold namelock on them.
      sql/sql_class.cc:
        Open_tables_state, THD:
          Replaced push_open_tables_state/pop_open_tables_state() methods which
          were saving/restoring current open tables state in/from THD::open_state_list
          with reset_n_backup_open_tables_state/restore_backup_open_tables_state()
          methods which assume that backup storage for this state is allocated on
          stack (or elsewhere) by their caller.
      sql/sql_class.h:
        Open_tables_state, THD:
          Replaced push_open_tables_state/pop_open_tables_state() methods which
          were saving/restoring current open tables state in/from THD::open_state_list
          with reset_n_backup_open_tables_state/restore_backup_open_tables_state()
          methods which assume that backup storage for this state is allocated on
          stack (or elsewhere) by their caller.
      sql/sql_handler.cc:
        open_tables()/open_normal_and_derived_tables():
          Added 'flags' argument to be able open tables even if some has done
          a flush or hold namelock on them.
      sql/sql_prepare.cc:
        open_tables()/open_normal_and_derived_tables():
          Added 'flags' argument to be able open tables even if some has done
          a flush or hold namelock on them.
      sql/sql_show.cc:
        get_all_tables():
          Now we use THD::reset_n_/restore_backup_open_tables_state() for 
          saving/restoring open tables state instead of working with it directly
          (This also allows us to have proper content of I_S system tables in
          statements with stored functions and in stored functions). We also
          ignore possible flushes when opening tables (we may create deadlock
          otherwise). Also we do all needed manipulations with LEX in this function
          and not in get_schema_tables_result() now.
        get_schema_tables_record():
          Let us use handler::info() method with HA_STATUS_AUTO flag for obtaining
          information about table's auto-increment value. This allows to avoid locking
          of tables which is needed when we use handler::update_auto_increment() method.
        fill_schema_proc():
          Now we use open_proc_table_for_read/close_proc_table() for access to
          mysql.proc table (so we won't cause deadlock if we already have some
          tables open and locked, this also allows us to have proper content in
          ROUTINES system table in statements using stored functions/in stored
          functions).
        get_schema_tables_result():
          Moved all manipulations with Open_tables_state and LEX needed for
          safe opening of tables to ST_SCHEMA_TABLE::fill_table functions
          (i.e. get_all_tables() and fill_schema_proc()).
      sql/sql_update.cc:
        open_tables()/open_normal_and_derived_tables():
          Added 'flags' argument to be able open tables even if some has done
          a flush or hold namelock on them.
      39fda600
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · 00267b9f
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-4.1.b10892
      
      
      00267b9f
    • unknown's avatar
      item.cc: · b9ffa4db
      unknown authored
        After review fix
      
      
      sql/item.cc:
        After review fix
      b9ffa4db
  4. 07 Aug, 2005 2 commits