1. 18 May, 2011 3 commits
    • Mayank Prasad's avatar
      merge from 5.1 for bug#11764633 · 47f7fc43
      Mayank Prasad authored
      47f7fc43
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · b7ed314f
      Sergey Glukhov authored
      b7ed314f
    • Sergey Glukhov's avatar
      Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0 · 3201f92c
      Sergey Glukhov authored
      There are two problems:
      1. There is a missing check for 'year' parameter(year can not be greater than 9999) in
         makedate function. fix: added check that year can not be greater than 9999.
      2. There is a missing check for zero date in from_days() function.
         fix: added zero date check into Item_func_from_days::get_date()
         function.
      
      
      mysql-test/r/func_time.result:
        test case
      mysql-test/t/func_time.test:
        test case
      sql/item_timefunc.cc:
        --added check that year can not be greater than 9999 for makedate() function
        --added zero date check into Item_func_from_days::get_date() function
      3201f92c
  2. 16 May, 2011 6 commits
  3. 14 May, 2011 2 commits
  4. 13 May, 2011 5 commits
    • Marc Alff's avatar
      Bug#12552516 LF_HASH REQUIRES MY_THREAD_INIT() · d343f5e3
      Marc Alff authored
      Before this fix, a thread instrumented for the performance schema,
      that would perform file io operations, could crash inside the LF_HASH
      implementation, in cases when my_thread_init is not called.
      
      The crash itself has not been reported in 5.5 but similar crashes have
      been found in 5.6-based development branches, using LF_HASH for
      more instrumentation.
      
      The possibility of a crash in 5.5 is confirmed by code analysis.
      
      The problem is that, when my_thread_init() is not called,
      which can happen for threads in storage engines or thirs party code,
      my_thread_var is NULL.
      
      Using my_thread_var->stacks_ends_here in mysys/lf_alloc-pin.c is unsafe.
      
      Given that my_thread_var is used:
      - only for stacks_ends_here
      - only on platform with HAVE_ALLOCA
      - only when there is enough room on the stack
      and given that the LF_HASH implementation has a fallback
      algorythm implemented already when using alloca is not possible,
      using my_thread_var->stacks_ends_here is in fact not a strict requirement,
      and can be relaxed.
      
      The fix is to:
      - test explicitly if my_thread_var is NULL, to account for cases
        when my_thread_init() is not used by the calling thread.
      - not use alloca in this case, and rely on the fall back code already in place.
        so that the LF_HASH can be supported even without my_thread_init().
      
      The implementation of mysys/lf_alloc-pin.c has been fixed to support this new usage.
      The units tests in unittest/mysys/lf-t.c have been adjusted accordingly.
      d343f5e3
    • Bjorn Munch's avatar
      null upmerge · 94d657bf
      Bjorn Munch authored
      94d657bf
    • Bjorn Munch's avatar
      merge from 5.1-mtr · 067fa4a5
      Bjorn Munch authored
      067fa4a5
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 0610c9a7
      Bjorn Munch authored
      0610c9a7
    • MySQL Build Team's avatar
      changed the VERSION tag to 14 · cb0f843e
      MySQL Build Team authored
      cb0f843e
  5. 12 May, 2011 14 commits
  6. 11 May, 2011 7 commits
    • Luis Soares's avatar
      BUG#12416700 · f38dff98
      Luis Soares authored
      Automerged bzr bundle from bug report into latest mysql-5.5.
      f38dff98
    • Magnus Blåudd's avatar
      Merge bug 12384993 · d4f1d04f
      Magnus Blåudd authored
      d4f1d04f
    • Alexander Nozdrin's avatar
      Ignore auto-generated files. · 40de2831
      Alexander Nozdrin authored
      40de2831
    • Georgi Kodinov's avatar
      merge from mysql-5.5 · ecfbdbd7
      Georgi Kodinov authored
      ecfbdbd7
    • MySQL Build Team's avatar
      Cloning of the 5.5.13 release from Mysql-5.5, · 9337a330
      MySQL Build Team authored
      increase the version number by two
      9337a330
    • Georgi Kodinov's avatar
      Bug #11744875: 4082: integer lengths cause truncation with distinct concat · 5a2ccea2
      Georgi Kodinov authored
      and innodb
      
      The 5.5 version of the patch.
      
      The server doesn't restrict the data that can be inserted into integer columns 
      with explicitly specified length that's smaller than what the type can handle,
      e.g. 1234 can be inserted into an INT(2) column just fine.
      Thus, when calcualting the maximum width of expressions involving such 
      restricted integer columns we need to use the implicit maximum width of 
      the field instead of the explicitly speficied one.
      Fixed the server to use the implicit maximum in such cases and made sure 
      the implicit maximum is addjusted the same way as the explicit one wrt
      signedness.
      
      Fixed several test case results (ctype_*.result, metadata.result and 
      type_ranges.result) to reflect the extended column widths.
      
      Added a regression test case in distinct.test.
      
      Note : this is the behavior preserving fix that makes 5.5 behave as 5.1 and 
      earlier. In the mysql trunk we'll add a insert time check for the explict 
      maximum size.
      5a2ccea2
    • Magnus Blåudd's avatar
      Bug#12384993 EXTRA/RPL_TEST/CHECK_TYPE.INC NEED SUPPORT FOR SPECIFIC ENGINE · 46c08b94
      Magnus Blåudd authored
       - add support for choosing the engine of test
          table(t1) with $engine_type
       - add primary key to the test table(t1) to support
         replication of BLOB/TEXT (also with ENGINE=ndb)
       - change the suppression since the warning printed to error log
        now says "Column 1"
      46c08b94
  7. 10 May, 2011 3 commits