1. 01 Jul, 2009 4 commits
    • Staale Smedseng's avatar
      Merge from 5.0 · 6c567dc5
      Staale Smedseng authored
      6c567dc5
    • Staale Smedseng's avatar
      Bug #45790 Potential DoS vector: Writing of user input to log · b3cedc24
      Staale Smedseng authored
      without proper formatting
            
      The problem is that a suitably crafted database identifier
      supplied to COM_CREATE_DB or COM_DROP_DB can cause a SIGSEGV,
      and thereby a denial of service. The database name is printed
      to the log without using a format string, so potential
      attackers can control the behavior of my_b_vprintf() by
      supplying their own format string. A CREATE or DROP privilege
      would be required.
            
      This patch supplies a format string to the printing of the
      database name. A test case is added to mysql_client_test.
      
      
      sql/sql_parse.cc:
        Added format strings.
      tests/mysql_client_test.c:
        Added new test case.
      b3cedc24
    • Satya B's avatar
      merge to 5.1-bugteam · 8357dad7
      Satya B authored
      8357dad7
    • Satya B's avatar
      Fix build failure after applying Innodb snapshot 5.1-ss5282 · 53708a18
      Satya B authored
      After applying Innodb snapshot 5.1-ss5282, build was broken
      because of missing header file. 
      
      Adding the header file to Makefile.am after informing the 
      innodb developers.
      53708a18
  2. 30 Jun, 2009 2 commits
  3. 29 Jun, 2009 10 commits
    • Staale Smedseng's avatar
      Merge from 5.0 · c3e49122
      Staale Smedseng authored
      c3e49122
    • Staale Smedseng's avatar
      Merge from 5.0-bt · 720906ee
      Staale Smedseng authored
      720906ee
    • Satya B's avatar
      merge to mysql-5.1-bugteam branch · 79c189c8
      Satya B authored
      79c189c8
    • Satya B's avatar
      merge to mysql-5.1-bugteam · d2d4875f
      Satya B authored
      d2d4875f
    • Christoffer Hall's avatar
      Merge from team tree · 768f8594
      Christoffer Hall authored
      768f8594
    • Christoffer Hall's avatar
      Merge from main branch · 878186e1
      Christoffer Hall authored
      878186e1
    • Satya B's avatar
      5ce30243
    • Satya B's avatar
      Additional Fix for BUG#40565 - Update Query Results in "1 Row Affected" · 5bc9b3d2
      Satya B authored
                                     But Should Be "Zero Rows"
      
      
      After applying the innodb snapshot 5.0-ss5406 for bug#40565, the windows push build
      tests failed because of the missing cast of void * pointer in row0sel.c file
      
      Informed the innodb developers and received patch by email.
      
      innobase/row/row0sel.c:
        Cast the default_rec which is a void * pointer
      5bc9b3d2
    • Luis Soares's avatar
      merge: 5.1-bt bug branch --> 5.1-bt latest · 1093a683
      Luis Soares authored
      1093a683
    • V Narayanan's avatar
      Bug#45196 Some collations do not sort correctly with IBMDB2I · 3ad7e45a
      V Narayanan authored
      Some collations--including cp1250_czech_cs,latin2_czech_cs,
      ucs2/utf8_czech_ci, ucs2/utf8_danish_ci--are not being
      sorted correctly by the IBMDB2I storage engine. This
      was being caused because the sort order used by DB2 is
      incompatible with the order expected by MySQL.
      
      This patch removes support for the cp1250_czech_cs and
      latin2_czech_cs collations because it has been determined
      that the sort order used by DB2 is incompatible with the
      order expected by MySQL. Users needing a czech collation
      with IBMDB2I are encouraged to use a Unicode-based collation 
      instead of these single-byte collations. This patch also
      modifies the DB2 sort sequence used for ucs2/utf8_czech_ci
      and ucs2/utf8_danish_ci collations to better match the
      sorting expected by MySQL. This will only affect indexes
      or tables that are newly created through the IBMDB2I storage
      engine. Existing IBMDB2I tables will retain the old sort
      sequence until recreated.
      
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result:
        Bug#45196  Some collations do not sort correctly with IBMDB2I
        
        Result file for the test case.
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test:
        Bug#45196  Some collations do not sort correctly with IBMDB2I
        
        Adding tests for testing the sort order with the modified collations.
      storage/ibmdb2i/db2i_collationSupport.cc:
        Bug#45196  Some collations do not sort correctly with IBMDB2I
        
        Remove the support for the cp1250_czech_cs and latin2_czech_cs 
        collations because it has been determined that the sort order
        used by DB2 is incompatible with the order expected by MySQL.
        Users needing a czech collation with IBMDB2I are encouraged to
        use a Unicode-based collation instead of these single-byte
        collations. This patch also modifies the DB2 sort sequence
        used for ucs2/utf8_czech_ci and ucs2/utf8_danish_ci collations
        to better match the sorting expected by MySQL. This will only 
        affect indexes or tables that are newly created through the
        IBMDB2I storage engine. Existing IBMDB2I tables will retain
        the old sort sequence until recreated.
      3ad7e45a
  4. 27 Jun, 2009 1 commit
    • Luis Soares's avatar
      BUG#42851: Spurious "Statement is not safe to log in statement · 99111c6d
      Luis Soares authored
                 format." warnings
            
      Despite the fact that a statement would be filtered out from binlog, a
      warning would still be thrown if it was issued with the LIMIT.
            
      This patch addresses this issue by checking the filtering rules before
      printing out the warning.
      
      
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt:
        Parameter to filter out database: "b42851".
      mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test:
        Added a new test case.
      sql/sql_class.cc:
        Added filtering rules check to condition used to decide whether to
        printout warning or not.
      99111c6d
  5. 26 Jun, 2009 5 commits
    • Evgeny Potemkin's avatar
      Merged bug#45266. · d0b85a4d
      Evgeny Potemkin authored
      d0b85a4d
    • Evgeny Potemkin's avatar
      Bug#45266: Uninitialized variable lead to an empty result. · 72d020a2
      Evgeny Potemkin authored
      The TABLE::reginfo.impossible_range is used by the optimizer to indicate
      that the condition applied to the table is impossible. It wasn't initialized
      at table opening and this might lead to an empty result on complex queries:
      a query might set the impossible_range flag on a table and when the query finishes,
      all tables are returned back to the table cache. The next query that uses the table
      with the impossible_range flag set and an index over the table will see the flag
      and thus return an empty result.
      
      The open_table function now initializes the TABLE::reginfo.impossible_range
      variable.
      
      mysql-test/r/select.result:
        A test case for the bug#45266: Uninitialized variable lead to an empty result.
      mysql-test/t/select.test:
        A test case for the bug#45266: Uninitialized variable lead to an empty result.
      sql/sql_base.cc:
        Bug#45266: Uninitialized variable lead to an empty result.
        The open_table function now initializes the TABLE::reginfo.impossible_range
        variable.
      sql/sql_select.cc:
        Bug#45266: Uninitialized variable lead to an empty result.
        The open_table function now initializes the TABLE::reginfo.impossible_range
        variable.
      sql/structs.h:
        Bug#45266: Uninitialized variable lead to an empty result.
        A comment is added.
      72d020a2
    • Alexey Kopytov's avatar
      Automerge. · 359bfc13
      Alexey Kopytov authored
      359bfc13
    • Alexey Kopytov's avatar
      Automerge. · 7616893b
      Alexey Kopytov authored
      7616893b
    • Staale Smedseng's avatar
      Merge from 5.1-bugteam · 690a117d
      Staale Smedseng authored
      690a117d
  6. 25 Jun, 2009 3 commits
    • Luis Soares's avatar
      3c117ca3
    • Staale Smedseng's avatar
      Bug #34002 uninitialized Rows_examined for some admin queries · 6afd14e5
      Staale Smedseng authored
      such as quit and shutdown
      
      Logging to slow log can produce an undetermined value for
      Rows_examined in special cases. In debug mode this manifests
      itself as any of the various marker values used to mark
      uninitialized memory on various platforms.
      
      If logging happens on a THD object that hasn't performed any
      row reads (on this or any previous connections), the
      THD::examined_row_count may be uninitialized. This patch adds
      initialization for this attribute.
      
      No automated test cases are added, as for this to be
      meaningful, we need to ensure that we're using a THD
      fulfilling the above conditions. This is hard to do in the
      mysql-test-run framework. The patch has been verified
      manually, however, by restarting mysqld and running the test
      included with the bug report.
      6afd14e5
    • Davi Arnaut's avatar
      Bug#45548: XA transaction without access to InnoDB tables crashes the server · 55b83d71
      Davi Arnaut authored
      The problem is that the one phase commit function failed to
      properly end a empty transaction. The solution is to ensure
      that the transaction cleanup procedure is invoked even for
      empty transactions.
      
      mysql-test/r/xa.result:
        Add test case result for Bug#45548
      mysql-test/t/xa.test:
        Add test case for Bug#45548
      sql/handler.cc:
        Invoke transaction cleanup function whenever a transaction is ended.
      55b83d71
  7. 26 Jun, 2009 5 commits
    • Alexey Kopytov's avatar
      Automerge. · a921a99a
      Alexey Kopytov authored
      a921a99a
    • Alexey Kopytov's avatar
      Automerge. · 390f1885
      Alexey Kopytov authored
      390f1885
    • Alexey Kopytov's avatar
      Automerge. · 307bcfd3
      Alexey Kopytov authored
      307bcfd3
    • Luis Soares's avatar
      9af0240a
    • Luis Soares's avatar
      BUG#44270: Post-push fix · 7121a341
      Luis Soares authored
      The test case added failed sporadically on PB. This is due to the
      fact that the user thread in some cases is waiting for slave IO
      to stop and then check the error number. Thence, sometimes the
      user thread would race for the error number with IO thread.
      
      This post push fix addresses this by replacing the wait for slave
      io to stop with a wait for slave io error (as it seems it was
      added in 6.0 also after patch on which this is based was
      pushed). This implied backporting wait_for_slave_io_error.inc
      from 6.0 also.
      7121a341
  8. 25 Jun, 2009 9 commits
    • Kristofer Pettersson's avatar
      Automerge · cf4af9aa
      Kristofer Pettersson authored
      cf4af9aa
    • Kristofer Pettersson's avatar
      Bug#45336 --enable-foobar doesn't work for any plugin foobar. · 0c7e8fdd
      Kristofer Pettersson authored
      Because of a regression introduced by bug#19027 the option --enable-foobar
      doesn't work anymore for any plugin 'foobar'. The reason is that plugin
      names are tristate options variables with optional parameters and integer
      values are not accepted. Since the 'enable' prefix attempts to assign '1'
      to the option the operation fails.
      
      This patch translates any number n assigned to a plugin variable of type ENUM
      to be the corresponding enumerated item. As a side effect --enable-foobar and
      --disable-foobar will also start working again.
      
      mysys/my_getopt.c:
        * setval now accepts integer values for option variables of type ENUM.
      0c7e8fdd
    • Sergey Glukhov's avatar
      Bug#45412 SHOW CREATE TRIGGER does not require privileges to disclose trigger data · 667338df
      Sergey Glukhov authored
      Added privilege checking to SHOW CREATE TRIGGER code.
      
      
      
      mysql-test/r/trigger_notembedded.result:
        test result
      mysql-test/t/trigger_notembedded.test:
        test case
      sql/sql_show.cc:
        Added privilege checking to SHOW CREATE TRIGGER code.
      667338df
    • Satya B's avatar
      Applying InnoDB snashot 5.0-ss5406, part 2. Fixes BUG#40565 · e621fd77
      Satya B authored
      BUG#40565 - Update Query Results in "1 Row Affected" But Should Be "Zero Rows"
      
      Detailed revision comments:
      
      r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines
      branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565
      (Update Query Results in "1 Row Affected" But Should Be "Zero Rows").
      
      Also, add a test case for Bug #40565.
      
      rb://128 approved by Heikki Tuuri
        ------------------------------------------------------------------------
        r3590 | marko | 2008-12-18 15:33:36 +0200 (Thu, 18 Dec 2008) | 11 lines
      
        branches/5.1: When converting a record to MySQL format, copy the default
        column values for columns that are SQL NULL.  This addresses failures in
        row-based replication (Bug #39648).
      
        row_prebuilt_t: Add default_rec, for the default values of the columns in
        MySQL format.
      
        row_sel_store_mysql_rec(): Use prebuilt->default_rec instead of
        padding columns.
      
        rb://64 approved by Heikki Tuuri
        ------------------------------------------------------------------------
      e621fd77
    • Satya B's avatar
      Applying InnoDB snashot 5.0-ss5406, part 1. Fixes BUG#38479 · 0ed00852
      Satya B authored
      BUG#38479 - valgrind warnings in show table status for innodb tables
      
      Detailed revision comments:
      
      r5080 | vasil | 2009-05-22 14:45:34 +0300 (Fri, 22 May 2009) | 6 lines
      branches/5.0:
      
      Fix Bug#38479 valgrind warnings in show table status for innodb tables
      
      by initializing prebuilt->hint_need_to_fetch_extra_cols.
      
      0ed00852
    • Sergey Glukhov's avatar
      automerge · 37eaff3f
      Sergey Glukhov authored
      37eaff3f
    • Satya B's avatar
      e42c1a9e
    • Sergey Glukhov's avatar
      test case fix · 2a35f7c1
      Sergey Glukhov authored
      mysql-test/r/ctype_cp932_binlog_stm.result:
        result fix
      mysql-test/t/ctype_gbk_binlog.test:
        test fix
      2a35f7c1
    • Sergey Glukhov's avatar
      Bug#45485 replication different between master/slaver using procedure with gbk · 5994db46
      Sergey Glukhov authored
      In Item_param::set_from_user_var
      value.cs_info.character_set_client is set
      to 'fromcs' value. It's wrong, it should be set to
      thd->variables.character_set_client.
      
      
      
      mysql-test/r/ctype_gbk_binlog.result:
        test result
      mysql-test/t/ctype_gbk_binlog.test:
        test case
      sql/item.cc:
        In Item_param::set_from_user_var
        value.cs_info.character_set_client is set
        to 'fromcs' value. It's wrong, it should be set to
        thd->variables.character_set_client.
      5994db46
  9. 24 Jun, 2009 1 commit