1. 18 Feb, 2011 5 commits
    • Vasil Dimov's avatar
      Merge mysql-5.5-innodb -> mysql-5.5 · 6a435e05
      Vasil Dimov authored
      6a435e05
    • Martin Hansson's avatar
      Merge of fix for Bug#11766675. · 4d7042ce
      Martin Hansson authored
      4d7042ce
    • Martin Hansson's avatar
      Bug#11766675 - 59839: Aggregation followed by subquery yields wrong result · 61b25617
      Martin Hansson authored
      The loop that was looping over subqueries' references to outer field used a
      local boolean variable to tell whether the field was grouped or not. But the
      implementor failed to reset the variable after each iteration. Thus a field
      that was not directly aggregated appeared to be.
      
      Fixed by resetting the variable upon each new iteration.
      61b25617
    • Alexander Barkov's avatar
      Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they crash server · f4beb929
      Alexander Barkov authored
      Problem: ucs2 was correctly disallowed in "SET NAMES" only,
      while mysql_real_connect() and mysql_change_user() still allowed
      to use ucs2, which made server crash.
      
      Fix: disallow ucs2 in mysql_real_connect() and mysql_change_user().
      
        @ sql/set_var.cc
          Using new function.
      
        @ sql/sql_acl.cc
          - Return error if character set initialization failed
          - Getting rid of pointer aliasing:
            Initialize user_name to NULL, to avoid double free().
      
        @ sql/sql_connect.cc
          - in case of unsupported client character set send error and return true
          - in case of success return false
      
        @ sql/sql_connect.h
          - changing return type for thd_init_client_charset() to bool,
            to return errors to the caller
      
        @ sql/sql_parse.h
          - introducing a new function, to reuse in all places where we need
          to check client character set.
      
        @ tests/mysql_client_test.c
          Adding test
      f4beb929
    • Alexander Barkov's avatar
      Bug#60101 COALESCE with cp1251 tables causes [Err] 1267 - Illegal mix of collations · 0db53b19
      Alexander Barkov authored
            
      Problem:
        IF() did not copy collation derivation and repertoire from
        an argument if the opposite argument was NULL:
          IF(cond, res1, NULL)
          IF(cond, NULL, res2)
        only CHARSET_INFO pointer was copied.
        This resulted in illegal mix of collations error.
      
      Fix:
        copy all collation parameters from the non-NULL argument:
        CHARSET_INFO pointer, derivation, repertoire.
      0db53b19
  2. 17 Feb, 2011 15 commits
  3. 16 Feb, 2011 15 commits
    • Jonathan Perkin's avatar
      Merge to mysql-5.5 · fe6c5c13
      Jonathan Perkin authored
      fe6c5c13
    • Jonathan Perkin's avatar
      Merge to mysql-5.1 · aa8ebbee
      Jonathan Perkin authored
      aa8ebbee
    • Jonathan Perkin's avatar
      Updated README file. · e53ffb8f
      Jonathan Perkin authored
      e53ffb8f
    • Bjorn Munch's avatar
      d260eded
    • Bjorn Munch's avatar
      ee2f9d86
    • Jon Olav Hauglid's avatar
      Merge from mysql-5.1 to mysql-5.5 · 16e8d182
      Jon Olav Hauglid authored
      No conflicts
      16e8d182
    • Jon Olav Hauglid's avatar
      Followup to Bug #11752069 (former bug 43152) · 0e28aa2f
      Jon Olav Hauglid authored
      Assertion `bitmap_is_set_all(&table->s->all_set)' failed in
      handler::ha_reset
      
      This followup fixes the compilation warning
        'test_bit' may be used uninitialized in this function
      introduced by the previous patch.
      0e28aa2f
    • Sven Sandberg's avatar
      WL#5670: Proposal: Remove SHOW NEW MASTER statement · 2f9198a0
      Sven Sandberg authored
      Removes SHOW NEW MASTER statement and all related code.
      Also removes the unused function update_slave_list from repl_failsafe.cc.
      
      
      mysql-test/r/signal_code.result:
        Updated result file.
        The output of SHOW PROCEDURE CODE has changed, because the numerical values
        of some SQLCOM_ commands have changes. This is not a problem, because
        SHOW PROCEDURE CODE only exists in debug builds and the numerical values of
        SQLCOM_ constants are not exposed elsewhere.
      mysql-test/r/sp-code.result:
        Updated result file.
        The output of SHOW PROCEDURE CODE has changed, because the numerical values
        of some SQLCOM_ commands have changes. This is not a problem, because
        SHOW PROCEDURE CODE only exists in debug builds and the numerical values of
        SQLCOM_ constants are not exposed elsewhere.
      sql/mysqld.cc:
        Remove SQLCOM_SHOW_NEW_MASTER.
      sql/repl_failsafe.cc:
        Remove show_new_master, which was only used by the removed SHOW NEW MASTER statement.
        Remove translate_master, which was only used by show_new_master.
        Remove find_slave_event, which was only used by translate_master.
        Remove find_target_pos, which was only used by translate_master.
        Remove cmp_master_pos, which was only used by translate_master.
        Remove update_slave_list, which was not used at all.
      sql/repl_failsafe.h:
        Remove declarations of functions removed by this patch:
          update_slave_list, show_new_master, translate_master, update_slave_list
        
        Remove declarations of functions that did not exist before this patch:
          handle_failsafe_rpl, load_master_data
        
        Remove declaration of function that is static in slave.cc:
          connect_to_master
      sql/sp_head.cc:
        Removed SQLCOM_SHOW_NEW_MASTER
      sql/sql_lex.h:
        Removed SQLCOM_SHOW_NEW_MASTER
      sql/sql_parse.cc:
        Removed SQLCOM_SHOW_NEW_MASTER
      sql/sql_repl.cc:
        Removed cmp_master_pos(char*,ulonglong,char*,ulonglong), which was
        only used by cmp_master_pos*Slave_log_event* sev, LEX_MASTER_INFO* mi) in repl_failsafe.cc,
        which has been removed.
      sql/sql_repl.h:
        removed cmp_master_pos
      sql/sql_yacc.yy:
        removed syntax SHOW NEW MASTER.
      2f9198a0
    • Jon Olav Hauglid's avatar
      Merge from mysql-5.1 to mysql-5.5 · f65f016a
      Jon Olav Hauglid authored
      Text conflict in include/my_bit.h
      Text conflict in include/my_bitmap.h
      Text conflict in mysys/my_bitmap.c
      f65f016a
    • Jon Olav Hauglid's avatar
      Bug #11752069 (former bug 43152) · 6ad0c9b1
      Jon Olav Hauglid authored
      Assertion `bitmap_is_set_all(&table->s->all_set)' failed in
      handler::ha_reset
      
      This assertion could be triggered if two connections simultaneously
      executed two bitmap test functions on the same bitmap. For example,
      the assertion could be triggered if one connection executed UPDATE
      while a second connection executed SELECT on the same table.
      
      Even if bitmap test functions have read-only semantics and have
      const bitmaps as parameter, several of them modified the internal
      state of the bitmap. With interleaved execution of two such functions
      it was possible for one function to modify the state of the same
      bitmap that the other function had just modified. This lead to an
      inconsistent state and could trigger the assert.
      
      Internally the bitmap uses 32 bit words for storage. Since bitmaps
      can contain any number of bits, the last word in the bitmap may
      not be fully used. A 32 bit mask is maintained where a bit is set
      if the corresponding bit in the last bitmap word is unused.
      The problem was that several test functions applied this mask to
      the last word. Sometimes the mask was negated and used to zero out
      the remainder of the last word and sometimes the mask was used as-is
      to fill the remainder of the last word with 1's. This meant that if
      a function first used the negated mask and another function then
      used the mask as-is (or vice-versa), the first function would then
      get the wrong result.
      
      This patch fixes the problem by changing the implementation of
      9 bitmap functions that modified the bitmap state even if the 
      bitmap was declared const. These functions now preserve the
      internal state of the bitmap. This makes it possible for
      two connections to concurrently execute two of these functions
      on the same bitmap without issues.
      
      The patch also removes dead testing code from my_bitmap.c.
      These tests have already been moved to unittest/mysys/bitmap-t.c.
      Existing test coverage of my_bitmap has been extended.
      
      No MTR test case added as this would require adding several sync
      points to the bitmap functions. The patch has been tested with
      a non-deterministic test case posted on the bug report.
      
      
      include/my_bit.h:
        Removed my_count_bits_ushort() which is not needed anymore.
        Added my_count_bits_uint32().
      unittest/mysys/bitmap-t.c:
        Extended test coverage of my_bitmap.
      6ad0c9b1
    • Tor Didriksen's avatar
      Bug #11766729 59906: 5.5 DEBUG BUILDS BROKEN BY EXTRA/COMP_ERR.C · e24f16a6
      Tor Didriksen authored
      
      extra/comp_err.c:
        Initialize er_last to zero (which is the correct value if we never enter the loop).
      e24f16a6
    • Marko Mäkelä's avatar
      c10b46df
    • Marko Mäkelä's avatar
    • Tor Didriksen's avatar
      Bug #11751935 42969: PLEASE ADD A MANIFEST TO EACH BUILD · e86d90e7
      Tor Didriksen authored
      post-push fix: make it work in out-of-source builds.
      
      mysql-test/mysql-test-run.pl:
        Set MYSQL_BINDIR, to be used by tests.
      mysql-test/t/file_contents.test:
        Use MYSQL_BINDIR, which is different from MYSQL_LIBDIR for out-of-source builds.
      e86d90e7
    • Bjorn Munch's avatar
      2d332d62
  4. 15 Feb, 2011 5 commits
    • Dmitry Lenev's avatar
      Merged recent changes from mysql-5.5 tree with · 093d94cc
      Dmitry Lenev authored
      fix for bug @59888.
      093d94cc
    • Dmitry Lenev's avatar
      Merged fix for bug #59888 "debug assertion when attempt to · 1cff3f95
      Dmitry Lenev authored
      create spatial index on char > 31 bytes". Did after-merge
      fixes.
      1cff3f95
    • Luis Soares's avatar
      BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284 · 44fac8ea
      Luis Soares authored
        
      Backporting the patch from BUG#11753506 into mysql-5.5 
      as it is already in mysql-trunk but not in mysql-5.5.
      44fac8ea
    • Luis Soares's avatar
      BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284 · 0d82c585
      Luis Soares authored
      Backporting the patch from BUG#11753489 into mysql-5.5 
      as it is already in mysql-trunk but not in mysql-5.5.
      0d82c585
    • Dmitry Lenev's avatar
      Fix for bug#11766714 (former bug @59888) "debug assertion when · 9c89cca5
      Dmitry Lenev authored
      attempt to create spatial index on char > 31 bytes".
      
      Attempt to create spatial index on char field with length
      greater than 31 byte led to assertion failure on server
      compiled with safemutex support.
      
      The problem occurred in mi_create() function which was called
      to create a new version of table being altered. This function
      failed since it detected an attempt to create a spatial key
      on non-binary column and tried to return an error.
      On its error path it tried to unlock THR_LOCK_myisam mutex
      which has not been not locked at this point. Indeed such an
      incorrect behavior was caught by safemutex wrapper and caused
      assertion failure.
      
      This patch fixes the problem by ensuring that mi_create()
      doesn't releases THR_LOCK_myisam mutex on error path if it was
      not acquired.
      
      mysql-test/r/gis.result:
        Added test for bug @59888 "debug assertion when attempt to
        create spatial index on char > 31 bytes".
      mysql-test/t/gis.test:
        Added test for bug @59888 "debug assertion when attempt to
        create spatial index on char > 31 bytes".
      storage/myisam/mi_create.c:
        Changed mi_create() not to release THR_LOCK_myisam mutex on
        error path if it was not acquired.
      9c89cca5