1. 20 Apr, 2011 1 commit
    • Mattias Jonsson's avatar
      Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK · 9ddfb809
      Mattias Jonsson authored
      Update for previous patch according to reviewers comments.
      
      Updated the constructors for ha_partitions to use the common
      init_handler_variables functions
      
      Added use of defines for size and offset to get better readability for the code that reads
      and writes the .par file. Also refactored the get_from_handler_file function.
      9ddfb809
  2. 25 Mar, 2011 1 commit
    • Mattias Jonsson's avatar
      Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAK · 5d1ada70
      Mattias Jonsson authored
      When executing row-ordered-retrieval index merge,
      the handler was cloned, but it used the wrong
      memory root, so instead of allocating memory
      on the thread/query's mem_root, it used the table's
      mem_root, resulting in non released memory in the
      table object, and was not freed until the table was
      closed.
      
      Solution was to ensure that memory used during cloning
      of a handler was allocated from the correct memory root.
      
      This was implemented by fixing handler::clone() to also
      take a name argument, so it can be used with partitioning.
      And in ha_partition only allocate the ha_partition's ref, and
      call the original ha_partition partitions clone() and set at cloned
      partitions.
      
      Fix of .bzrignore on Windows with VS 2010
      5d1ada70
  3. 03 Mar, 2011 4 commits
    • unknown's avatar
      Merge from mysql-5.1.56-release · 09e0c0e1
      unknown authored
      09e0c0e1
    • Alexander Barkov's avatar
      Bug 11766519 - 59648: MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FAILED. · 24ce7000
      Alexander Barkov authored
      Part 2. Function QUOTE() was not multi-byte safe.
      
        @ mysql-test/r/ctype_ucs.result
        @ mysql-test/t/ctype_ucs.test
        Adding tests
      
        @ sql/item_strfunc.cc
        Fixing Item_func_quote::val_str to be multi-byte safe.
      
        @ sql/item_strfunc.h
        Multiple size needed for quote characters to mbmaxlen
      24ce7000
    • Alexander Barkov's avatar
      BUG#11766519 (bug#59648): MY_STRTOLL10_MB2: ASSERTION `(*ENDPTR - S) % 2 == 0' FAILED · 1c16fd3d
      Alexander Barkov authored
            
      Problem: wrong character set pointer was passed to my_strtoll10_mb2,
      which led to DBUG_ASSERT failure in some cases.
      
        @ mysql-test/r/func_encrypt_ucs2.result
        @ mysql-test/t/func_encrypt_ucs2.test
        @ mysql-test/r/ctype_ucs.result
        @ mysql-test/t/ctype_ucs.test
        Adding tests
      
        @ sql/item_func.cc
        "cs" initialization was wrong (res does not necessarily point to &str_value)
      
        @ sql/item_strfunc.cc
        Item_func_dec_encrypt::val_str() and Item_func_des_descrypt::val_str()
        did not set character set for tmp_value (the returned value),
        so the old value, which was previously copied from args[1]->val_str(),
        was incorrectly returned with tmp_value.
      1c16fd3d
    • Alexander Barkov's avatar
      An after-fix for · 96f3561a
      Alexander Barkov authored
      Bug#11765108 - Bug#58036: CLIENT UTF32, UTF16, UCS2 SHOULD BE DISALLOWED, THEY CRASH SERVER 
      
      Fixing wrong usage of DBUG_ASSERT.
      In non-debug version thd_init_client_charset
      was not executed at all.
      96f3561a
  4. 01 Mar, 2011 2 commits
  5. 22 Feb, 2011 2 commits
  6. 21 Feb, 2011 1 commit
    • Nirbhay Choubey's avatar
      Bug#11766310 : 59398: MYSQLDUMP 5.1 CAN'T HANDLE A DASH · bc048093
      Nirbhay Choubey authored
                     ("-") IN DATABASE NAMES IN ALTER DATABASE.
      
      mysqldump did not quote database name in 'ALTER DATABASE'
      statements in its output. This can further cause a failure
      while loading if database name contains a hyphen '-'.
      
      This happened as, while printing the 'ALTER DATABASE'
      statements, the database name was not quoted.
      
      Fixed by quoting the database name.
      
      
      client/mysqldump.c:
        Bug#11766310 : 59398: MYSQLDUMP 5.1 CAN'T HANDLE A DASH
                       ("-") IN DATABASE NAMES IN ALTER DATABASE.
        
        Modified the print statement in order to print the quoted
        database name for 'ALTER DATABASE' statements.
      mysql-test/r/mysqldump.result:
        Added a test case for bug#11766310.
      mysql-test/t/mysqldump.test:
        Added a test case for bug#11766310.
      bc048093
  7. 18 Feb, 2011 4 commits
    • Alexander Barkov's avatar
      A post-fix for b58036. · 9204b7ff
      Alexander Barkov authored
      9204b7ff
    • Alexander Barkov's avatar
      Bug#11765108 (Bug#58036) client utf32, utf16, ucs2 should be disallowed, they crash server · e4090f81
      Alexander Barkov authored
      A separate fix for 5.1 (as 5.1 and 5.5 have seriously
      differged in the related pieces of the code).
      A patch for 5.5 was approved earlier.
      
      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/sql_priv.h
          - changing return type for thd_init_client_charset() to bool,
            to return errors to the caller
      
        @ sql/sql_var.cc
          - using new function
      
        @ sql/sql_connect.cc
          - thd_client_charset_init:
            in case of unsupported client character set send error and return true;
            in case of success return false
          - check_connection:
            Return error if character set initialization failed
      
        @ sql/sql_parse.cc
          - check charset in the very beginnig of the CMD_CHANGE_USER handling code
      
        @ tests/mysql_client_test.c
          - adding tests
      e4090f81
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1 · 064e5371
      Vasil Dimov authored
      064e5371
    • Martin Hansson's avatar
      Bug#11766675 - 59839: Aggregation followed by subquery yields wrong result · 9d6b82a6
      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.
      9d6b82a6
  8. 17 Feb, 2011 6 commits
  9. 16 Feb, 2011 6 commits
    • Jonathan Perkin's avatar
      Merge to mysql-5.1 · 76b9b687
      Jonathan Perkin authored
      76b9b687
    • Jonathan Perkin's avatar
      Updated README file. · 99207874
      Jonathan Perkin authored
      99207874
    • Bjorn Munch's avatar
      48825330
    • Jon Olav Hauglid's avatar
      Followup to Bug #11752069 (former bug 43152) · 2c2e4846
      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.
      2c2e4846
    • Jon Olav Hauglid's avatar
      Bug #11752069 (former bug 43152) · 5595b201
      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.
      5595b201
    • Marko Mäkelä's avatar
  10. 15 Feb, 2011 3 commits
    • Dmitry Lenev's avatar
      Fix for bug#11766714 (former bug @59888) "debug assertion when · 6d866919
      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.
      6d866919
    • Marko Mäkelä's avatar
      Add a test for suspected Bug#60049. · 1a0b9247
      Marko Mäkelä authored
      1a0b9247
    • Marko Mäkelä's avatar
      Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recursion_flag() · cf86257e
      Marko Mäkelä authored
      rw_lock_create_func(): Initialize lock->writer_thread, so that Valgrind
      will not complain even when Valgrind instrumentation is not enabled.
      Flag lock->writer_thread uninitialized, so that Valgrind can complain
      when it is used uninitialized.
      
      rw_lock_set_writer_id_and_recursion_flag(): Revert the bogus Valgrind
      instrumentation that was pushed in the first attempt to fix this bug.
      cf86257e
  11. 14 Feb, 2011 1 commit
  12. 11 Feb, 2011 1 commit
  13. 10 Feb, 2011 5 commits
    • Vasil Dimov's avatar
      Fix Bug#59307 Valgrind: uninitialized value in rw_lock_set_writer_id_and_recursion_flag() · 3ed4b640
      Vasil Dimov authored
      by silencing a bogus Valgrind warning:
      
      ==4392== Conditional jump or move depends on uninitialised value(s)
      ==4392==    at 0x5A18416: rw_lock_set_writer_id_and_recursion_flag (sync0rw.ic:283)
      ==4392==    by 0x5A1865C: rw_lock_x_lock_low (sync0rw.c:558)
      ==4392==    by 0x5A18481: rw_lock_x_lock_func (sync0rw.c:617)
      ==4392==    by 0x597EEE6: mtr_x_lock_func (mtr0mtr.ic:271)
      ==4392==    by 0x597EBBD: fsp_header_init (fsp0fsp.c:970)
      ==4392==    by 0x5A15E78: innobase_start_or_create_for_mysql (srv0start.c:1508)
      ==4392==    by 0x598B789: innobase_init(void*) (ha_innodb.cc:2282)
      
      os_compare_and_swap_thread_id() is defined as
      __sync_bool_compare_and_swap(). From the GCC doc:
      
      `bool __sync_bool_compare_and_swap (TYPE *ptr, TYPE oldval TYPE newval, ...)'
        ...
        The "bool" version returns true if the comparison is successful and
        NEWVAL was written.
      
      So it is not possible that the return value is uninitialized, no matter what
      the arguments to os_compare_and_swap_thread_id() are. Probably Valgrind gets
      confused by the implementation of the GCC internal function
      __sync_bool_compare_and_swap().
      3ed4b640
    • Vasil Dimov's avatar
      Increment InnoDB Plugin version from 1.0.15 to 1.0.16. · 7fe25798
      Vasil Dimov authored
      InnoDB Plugin 1.0.15 has been released with MySQL 5.1.55.
      7fe25798
    • Georgi Kodinov's avatar
      530fcdf8
    • Georgi Kodinov's avatar
      merge 5.1->5.1-security · 1ebbb669
      Georgi Kodinov authored
      1ebbb669
    • Georgi Kodinov's avatar
      merge 5.0->5.0-security · 96fc1b11
      Georgi Kodinov authored
      96fc1b11
  14. 09 Feb, 2011 3 commits
    • MySQL Build Team's avatar
      97fb5845
    • MySQL Build Team's avatar
      removing EXCEPTIONS-CLIENT · 6c348965
      MySQL Build Team authored
      6c348965
    • MySQL Build Team's avatar
      Backport into build-201102032246-5.1.52sp1 · b18c22e7
      MySQL Build Team authored
      > ------------------------------------------------------------
      > revno: 3545
      > revision-id: holyfoot@mysql.com-20110112130241-50lwmhq562otxw31
      > parent: dmitry.lenev@oracle.com-20110112130830-csanweanbny2ua3n
      > committer: Alexey Botchkov <holyfoot@mysql.com>
      > branch nick: 51mrg
      > timestamp: Wed 2011-01-12 17:02:41 +0400
      > message:
      >   Bug #57321 crashes and valgrind errors from spatial types 
      >           Item_func_spatial_collection::fix_length_and_dec didn't call parent's method, so
      >           the maybe_null was set to '0' after it. But in this case the result was
      >           just NULL, that caused wrong behaviour.
      >   
      >   per-file comments:
      >     mysql-test/r/gis.result
      >   Bug #57321 crashes and valgrind errors from spatial types 
      >           test result updated.
      >   
      >     mysql-test/t/gis.test
      >   Bug #57321 crashes and valgrind errors from spatial types 
      >           test case added.
      >     sql/item_geofunc.h
      >   Bug #57321 crashes and valgrind errors from spatial types 
      >           Item_func_geometry::fix_length_and_dec() called in
      >           Item_func_spatial_collection::fix_length_and_dec().
      b18c22e7