1. 04 Jul, 2008 1 commit
    • Sven Sandberg's avatar
      BUG#37858: loaddata,rpl_slave_skip,rpl_innodb_mixed_dml fail if datafile not world-readable · 761b1b29
      Sven Sandberg authored
      Problem 1: main.loaddata tried to trigger an error caused by
      reading files outside the vardir, by reading itself. However,
      if loaddata.test is not world-readable (e.g., umask=0077),
      then another error is triggered.
      Fix 1: allow the other error too.
      Problem 2: rpl_slave_skip and rpl_innodb_mixed_dml tried to
      copy a file from mysql-test/suite/rpl/data to mysql-test/var
      and then read it. That failed too if umask=0077, since the
      file would not become world-readable.
      Fix 2: move the files from mysql-test/suite/rpl/data to
      mysql-test/std_data and update tests accordingly. Remove
      the directory mysql-test/suite/rpl/data.
      
      
      mysql-test/r/loaddata.result:
        Updated result file.
      mysql-test/std_data/rpl_bug28618.dat:
        Moved this file to std_data.
      mysql-test/std_data/rpl_mixed.dat:
        Moved this file to std_data.
      mysql-test/suite/rpl/data:
        Removed directory that is now unused.
      mysql-test/suite/rpl/include/rpl_mixed_dml.inc:
        The rpl_mixed.dat file has been moved. Updated the test to
        use the new location.
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result:
        Updated result file.
      mysql-test/suite/rpl/r/rpl_slave_skip.result:
        Updated result file.
      mysql-test/suite/rpl/t/rpl_slave_skip.test:
        The rpl_bug28618.dat file has been moved. Updated the test
        to use the new location.
      mysql-test/t/loaddata.test:
        Allow more error messages. ER_TEXTFILE_NOT_READABLE may
        happen if the file is not world-readable (which may happen,
        e.g., if the user has umask=0077).
      761b1b29
  2. 19 Jun, 2008 3 commits
  3. 18 Jun, 2008 5 commits
    • Magnus Svensson's avatar
      Fix paths · 61d2265e
      Magnus Svensson authored
      61d2265e
    • Magnus Svensson's avatar
      Merge · 4e14738d
      Magnus Svensson authored
      mysql-test/lib/mtr_cases.pm:
        Merge in the new code for enabling federated for federated tests
      4e14738d
    • Timothy Smith's avatar
    • Timothy Smith's avatar
      fix typo · c182ef4d
      Timothy Smith authored
      This change was committed to the 5.1.25 release clone, but never
      made it to the mysql-5.1 BK tree.  I'm committing it to mysql-5.1
      bzr now.
      c182ef4d
    • Timothy Smith's avatar
      Bug #37024: Wrong location of messagefiles · cc3543e0
      Timothy Smith authored
      make_binary_distribution.sh got clobbered by the 5.0 version during a merge.
      This caused a few packaging problems, including message files put in the wrong
      place and some missing files.  Fix is just to revert back to the 5.1 version
      from before the merge.
      
      Problem introduced in
      ChangeSet 1.2606.2.1 2008/05/13 15:56:07 kent@kent-amd64.(none)
      
      This change was made in the 5.1.25 release clone in BK, but never made it to the main mysql-5.1 BK tree.  I am adding it to mysql-5.1 bzr.
      cc3543e0
  4. 16 Jun, 2008 2 commits
    • Magnus Svensson's avatar
      WL#4189 · 8964ee12
      Magnus Svensson authored
       - Increase start timeout to 180 seconds, old version had 400 that is too much
      8964ee12
    • Magnus Svensson's avatar
      WL#4189 · a5aecd0d
      Magnus Svensson authored
       - Fix make_binary_distribution.sh after removing mysql-test/ndb dir
      a5aecd0d
  5. 03 Jun, 2008 2 commits
  6. 30 May, 2008 2 commits
    • Georgi Kodinov's avatar
      Bug#37069: Make federated disabled by default · 38c4b615
      Georgi Kodinov authored
      The federated storage engine is now disabled by default.
      mysql-test-run.pl is updated to enable it whenever it's required and available.
      
      mysql-test/lib/mtr_cases.pl:
        Bug#37069: mysql-test-run.pl automatically enables federated 
        for federated related tests
      sql/sql_plugin.cc:
        Bug#37069: federated is disabled by default
      38c4b615
    • Magnus Svensson's avatar
      Merge 5.1->5.1-rpl · a78afaac
      Magnus Svensson authored
      Fix paths and name of a few files to make it work with new mtr.pl
      a78afaac
  7. 22 May, 2008 2 commits
  8. 21 May, 2008 2 commits
  9. 20 May, 2008 8 commits
    • unknown's avatar
      Update test coverage for Bug#27430 "Crash in subquery code when in PS · 26cd7c85
      unknown authored
      and table DDL changed after PREPARE" to pass in embedded mode.
      
      
      mysql-test/r/ps.result:
        Update results (Bug#27430)
      mysql-test/r/ps_ddl.result:
        Update results (Bug#27430)
      mysql-test/t/ps.test:
        Add a test case for Bug#27430. ps.test is not run in --embedded-server,
        thus it now contains the part of the test for Bug#27430 that
        doesn't work in embedded server.
      mysql-test/t/ps_ddl.test:
        Move a part of the test for Bug#27430 that doesn't work
        in embedded server to ps.test, that includes not_embedded.inc.
      26cd7c85
    • unknown's avatar
      A number of fixes after a merge from the main 5.1 tree: · d98c5afc
      unknown authored
      the local tree contains a fix for 
      Bug#32748 "Inconsistent handling of assignments to 
      general_log_file/slow_query_log_file",
      which changes output of a number of tests.
      
      
      mysql-test/r/general_log_file_basic.result:
        Update results (Bug#32748)
      mysql-test/r/log_output_basic.result:
        Update the test with results of the fix for Bug#32748
      mysql-test/r/slow_query_log_file_basic.result:
        Update the test with results of the fix for Bug#32748
      mysql-test/t/general_log_file_basic.test:
        Adjust to take into account the fix for Bug#32748 
        (a port from 6.0-bugteam)
      mysql-test/t/log_output_basic.test:
        Adjust to take into account the fix for Bug#32748 
        (a port from 6.0-bugteam)
      mysql-test/t/slow_query_log_file_basic.test:
        Adjust to take into account the fix for Bug#32748 
        (a port from 6.0-bugteam)
      tests/mysql_client_test.c:
        Fix a compilation warning.
      d98c5afc
    • unknown's avatar
      Bug#27430 "Crash in subquery code when in PS and table DDL changed · 24310a7b
      unknown authored
      after PREPARE"
      Update test results after a merge with the main tree: the new minimum for 
      the table definition cache is 256.
      
      
      mysql-test/r/table_definition_cache_basic.result:
        Update test results: the new minimum for table definition cache is 256
      24310a7b
    • unknown's avatar
      Bug#27430 "Crash in subquery code when in PS and table DDL changed after · 2c75d8b5
      unknown authored
       PREPARE", review fixes:
      - make the patch follow the specification of WL#4166 and remove  
      the new error that was originally introduced.
      Now the client never gets an error from reprepare, unless it failed.
      I.e. even if the statement at hand returns a completely different
      result set, this is not considered a server error.
      The C API library, that can not handle this situation, was modified to
      return a client error.
      Added additional test coverage.
      
      
      include/errmsg.h:
        Add a new client side error: now when we automatically
        reprepare a statement, the new result set may contain a different
        number of columns.
      include/mysql_com.h:
        Add a new server status to be sent to the client if the 
        number of columns in the result set is different.
      libmysql/errmsg.c:
        Add a new error message.
      libmysql/libmysql.c:
        Make the client library robust against a result set that
        contains a different number of columns from prepare time.
        Previously that could never happen, and we simply had an assert.
        That means in particular that all clients are advised to upgrade
        with transition to 5.1, if they are using prepared statements C API.
        Make mysql_stmt_store_result() and mysql_stmt_execute() robust against 
        "broken" statement handles (those that have an error).
      sql/sql_parse.cc:
        Clear transient server status flags at start of statement more 
        systematically.
      sql/share/errmsg.txt:
        Remove an error that is unused and is not part of any public release.
      sql/sql_prepare.cc:
        Instead of returning an error in case the number of result set columns
        has changed, simply update the client in server status.
        That will allow modern clients automatically recover from an error.
      tests/mysql_client_test.c:
        Add additional coverage to the cases when the number of result
        set columns changed as a result of reprepare.
        Cover conversion and truncation of result set columns.
      2c75d8b5
    • unknown's avatar
      (temporarily)Turn on timestamp by default · 0194e68a
      unknown authored
      0194e68a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d96807ba
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-27430
      
      
      Makefile.am:
        Auto merged
      include/my_global.h:
        Auto merged
      mysql-test/include/mix1.inc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      libmysqld/CMakeLists.txt:
        Manual merge.
      libmysqld/lib_sql.cc:
        Manual merge.
      mysql-test/t/disabled.def:
        Manual merge.
      d96807ba
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-27430 · a4bcc240
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-27430
      
      
      sql/sql_base.cc:
        Manual merge.
      a4bcc240
    • unknown's avatar
      Bug#27430 "Crash in subquery code when in PS and table DDL changed after · b018aa9d
      unknown authored
      PREPARE": rename members, methods, classes to follow the spec 
      (a code review request)
      
      
      sql/mysql_priv.h:
        enum_metadata_type -> enum_table_ref_type
      sql/sp_head.cc:
        Metadata_version_observer -> Reprepare_observer
      sql/sql_base.cc:
        metadata -> table_ref
      sql/sql_class.cc:
        Replace an abstract interface with a concrete implementation.
      sql/sql_class.h:
        enum_metadata_type -> enum_table_ref_type
      sql/sql_prepare.cc:
        Move implementation of Execute_observer to sql_class.cc and
        rename the class to Reprepare_observer.
        Use getters instead of direct access to the members.
      sql/table.h:
        metadata -> table_ref
      b018aa9d
  10. 19 May, 2008 3 commits
  11. 18 May, 2008 5 commits
    • unknown's avatar
      Merge host.loc:/work/bk/5.0-bugteam · 41a0a2d7
      unknown authored
      into  host.loc:/work/bk/5.1-bugteam
      
      
      sql/sql_update.cc:
        Auto merged
      41a0a2d7
    • unknown's avatar
      Merge host.loc:/work/bugs/5.0-bugteam-36676 · fed90a01
      unknown authored
      into  host.loc:/work/bk/5.0-bugteam
      
      fed90a01
    • unknown's avatar
      Fixed bug#36676: multiupdate using LEFT JOIN updates only · 2a1015fe
      unknown authored
                       first row or fails with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      The server uses intermediate temporary table to store updated
      row data.  The first column of this table contains rowid.
      Current server implementation doesn't reset NULL flag of that
      column even if the server fills a column with rowid.
      To keep each rowid unique, there is an unique index.
      An insertion into an unique index takes into account NULL
      flag of key value and ignores real data if NULL flag is set.
      So, insertion of actually different rowids may lead to two
      kind of problems.  Visible effect of each of these problems
      depends on an initial engine type of temporary table:
      
      1. If multiupdate initially creates temporary table as
      a MyISAM table (a table contains blob columns, and the
      create_tmp_table function assumes, that this table is
      large), it inserts only one single row and updates
      only rows with one corresponding rowid. Other rows are
      silently ignored. 
      
      2. If multiupdate initially creates MEMORY temporary
      table, fills it with data and reaches size limit for
      MEMORY tables (max_heap_table_size), multiupdate
      converts MEMORY table into MyISAM table and fails
      with an error:
        ERROR 1022 (23000): Can't write; duplicate key in table ''
      
      
      Multiupdate has been fixed to update the NULL flag of
      temporary table rowid columns.
      
      
      
      mysql-test/r/multi_update_tiny_hash.result:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash-master.opt:
        Added test case for bug#36676.
      mysql-test/t/multi_update_tiny_hash.test:
        Added test case for bug#36676.
      sql/sql_update.cc:
        Fixed bug#36676: multiupdate using LEFT JOIN updates only
                         first row or fails with an error:
          ERROR 1022 (23000): Can't write; duplicate key in table ''
        
        The multi_update::send_data method has been modified to reset null bits of
        fields containing rowids.
      2a1015fe
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-bugteam · 3f7da38d
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
      
      
      sql/handler.cc:
        Auto merged
      configure.in:
        merge 5.0-bugteam to 5.1-bugteam
      3f7da38d
    • unknown's avatar
      Fix mysql_client_test failure in pushbuild 5.1-27430 · 154ea8dd
      unknown authored
      (Bug#27430)
      
      
      sql/sql_prepare.cc:
        Fix a simple coding mistake.
      154ea8dd
  12. 17 May, 2008 2 commits
    • unknown's avatar
      Implement some code review fixes for the fix for Bug#27430 · 724f1d9c
      unknown authored
      "Crash in subquery code when in PS and table DDL changed after PREPARE"
      
      
      include/my_sys.h:
        Add two new flags for my_error(). These flags help parameterize
        behavoiur of my_message_sql()
      sql/item.cc:
        Update comments.
        Fix a typo in Item_param::set_param_type_and_swap_value()
      sql/mysqld.cc:
        Implement two additional flags for my_error():
         - if ME_NO_SP_HANDLER is specified, ignore stored procedure continue/
            exit handlers
         - if ME_NO_WARNING_FOR_ERROR is specified, do not push warning
      sql/sql_base.cc:
        Update comments.
        Rename a few methods.
      sql/sql_class.h:
        Update and improve comments.
      sql/sql_prepare.cc:
        Update comments.
        Style changes.
      sql/table.h:
        Update comments.
        Style changes.
        Rename a few methods.
      tests/mysql_client_test.c:
        Zero the bind array, to follow C API requirements.
      724f1d9c
    • unknown's avatar
      Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo. · 54027801
      unknown authored
      temporary variables of 'long' types were used to store ulong values,
      that causes init_key_cache to receive distorted parameters
      
      
      sql/handler.cc:
        Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit wondo.
        
        types of temporary variables changed to match init_key_cache() parameters
      54027801
  13. 16 May, 2008 3 commits