An error occurred fetching the project authors.
  1. 09 Aug, 2005 7 commits
    • 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
      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
  2. 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
  3. 07 Aug, 2005 17 commits
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · cfb8abd6
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-5.0
      
      
      cfb8abd6
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1-4100 · 9de04d2e
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      mysql-test/r/flush.result:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      9de04d2e
    • unknown's avatar
      subselect.result: · a217d5c5
      unknown authored
        Correction after manual merge.
      
      
      mysql-test/r/subselect.result:
        Correction after manual merge.
      a217d5c5
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 84051f2a
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.0-5000
      
      
      84051f2a
    • unknown's avatar
      Manual merge · 89e421cd
      unknown authored
      89e421cd
    • unknown's avatar
      Post-merge fixes · 44b76f17
      unknown authored
      44b76f17
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ca7da41
      unknown authored
      into mysql.com:/home/psergey/mysql-5.0-bug11869-part3
      
      
      BitKeeper/deleted/.del-not_windows.inc:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      7ca7da41
    • unknown's avatar
      Manual merge · f34d542c
      unknown authored
      BitKeeper/deleted/.del-not_windows.inc:
        Delete: mysql-test/include/not_windows.inc
      mysql-test/r/fulltext_order_by.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rpl_flush_tables.test:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      f34d542c
    • unknown's avatar
      BUG#11869:part 2: post-review fixes: merging into 5.0 · d7086c4a
      unknown authored
      We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
      OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
      
      
      mysql-test/r/create.result:
        Updated the test result
      mysql-test/r/fulltext_order_by.result:
        Drop all tables this test uses
      mysql-test/t/fulltext_order_by.test:
        Drop all tables this test uses
      d7086c4a
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 · 23095e27
      unknown authored
      into rurik.mysql.com:/home/igor/mysql-4.1
      
      
      23095e27
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 25201f23
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      25201f23
    • unknown's avatar
      subselect.result: · 84d34d9d
      unknown authored
        Added test case for bug #11867.
        Fixed results for two existing test cases.
      subselect.test:
        Added test case for bug #11867.
      item_subselect.cc:
        Fixed bug #11867.
        Added missing code in Item_in_subselect::row_value_transformer
        that caused problems for queries with
        ROW(elems) IN (SELECT DISTINCT cols FROM ...).
      
      
      sql/item_subselect.cc:
        Fixed bug #11867.
        Added missing code in Item_in_subselect::row_value_transformer
        that caused problems for queries with
        ROW(elems) IN (SELECT DISTINCT cols FROM ...).
      mysql-test/t/subselect.test:
        Added test case for bug #11867.
      mysql-test/r/subselect.result:
        Added test case for bug #11867.
        Fixed results for two existing test cases.
      84d34d9d
    • unknown's avatar
      BUG#11869: part2: post-review fixes: · b9e04cf1
      unknown authored
      In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
      contain MATCH(...), for which fix_index() should be called.
      
      
      mysql-test/r/fulltext_order_by.result:
        BUG#11869 part2 : added another test case
      mysql-test/t/fulltext_order_by.test:
        BUG#11869 part2 : added another test case
      b9e04cf1
    • unknown's avatar
      Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO · 9e5c20f3
      unknown authored
      Give the user a warning if he tries to destroy the default key cache.
      
      
      mysql-test/r/key_cache.result:
        Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
        The test result.
      mysql-test/t/key_cache.test:
        Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
        The test case.
      sql/share/errmsg.txt:
        Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
        The new message string.
      9e5c20f3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 1ab80cf4
      unknown authored
      into  mysql.com:/home/mydev/mysql-4.1-4100
      
      
      1ab80cf4
    • unknown's avatar
      Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1b431c42
      unknown authored
      into mysql.com:/home/psergey/mysql-4.1-bug11869-part2
      
      
      1b431c42
    • unknown's avatar
      Manual merge · f3ce475d
      unknown authored
      mysql-test/t/fulltext_order_by.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_union.cc:
        Auto merged
      f3ce475d
  4. 06 Aug, 2005 3 commits
    • unknown's avatar
      BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error): · 852dcb75
      unknown authored
      When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
      create_tmp_table if we will be using fulltext function(s) when reading from the 
      temp. table.
      
      
      mysql-test/r/fulltext_order_by.result:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      mysql-test/t/fulltext_order_by.test:
        Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
      sql/mysql_priv.h:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        Added TMP_TABLE_FORCE_MYISAM flag
      sql/sql_select.cc:
        BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
        In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag
      852dcb75
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 9cd28273
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      9cd28273
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 88b0061e
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      88b0061e