1. 19 May, 2011 1 commit
    • Tatjana Azundris Nuernberg's avatar
      Bug#11745920/Bug#21287: "SSL connection error" is not helpful!... · 639b5202
      Tatjana Azundris Nuernberg authored
      Bug#11745920/Bug#21287: "SSL connection error" is not helpful! (ssl-verify-server-cert=true vs localhos)
      
      SSL errors on client and now more specific to aid end-user
      with debugging. Also restructures error handling for
      compliance with SSL docs.
      
      include/violite.h:
        new_VioSSLConnectorFd/sslaccept/sslconnect return more elaborate status
      libmysql/errmsg.c:
        SSL errors now extended, more specific
      mysql-test/r/openssl_1.result:
        SSL errors now extended, more specific
      sql-common/client.c:
        Do more detailed error reporting for setup, connect, and
        server cert verifying phases.
      sql/sql_acl.cc:
        sslaccept() signature has changed
      vio/viossl.c:
        Save the error code and return it to callers of sslaccept
        and sslconnect.
      vio/viosslfactories.c:
        new_VioSSLConnectorFd(): return error code to caller
      639b5202
  2. 18 May, 2011 3 commits
    • Mayank Prasad's avatar
      merge from 5.1 for bug#11764633 · 5b56de08
      Mayank Prasad authored
      5b56de08
    • Sergey Glukhov's avatar
      5.1 -> 5.5 merge · 20a79478
      Sergey Glukhov authored
      20a79478
    • Sergey Glukhov's avatar
      Bug#12403504 AFTER FIX FOR #11889186 : ASSERTION FAILED: DELSUM+(INT) Y/4-TEMP > 0 · b4f510ba
      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
      b4f510ba
  3. 16 May, 2011 6 commits
  4. 14 May, 2011 2 commits
  5. 13 May, 2011 5 commits
    • Marc Alff's avatar
      Bug#12552516 LF_HASH REQUIRES MY_THREAD_INIT() · 7ed4bbba
      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.
      7ed4bbba
    • Bjorn Munch's avatar
      null upmerge · f70f32c1
      Bjorn Munch authored
      f70f32c1
    • Bjorn Munch's avatar
      merge from 5.1-mtr · 632d7e63
      Bjorn Munch authored
      632d7e63
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 3c32bf93
      Bjorn Munch authored
      3c32bf93
    • MySQL Build Team's avatar
      changed the VERSION tag to 14 · 7a7b4898
      MySQL Build Team authored
      7a7b4898
  6. 12 May, 2011 14 commits
  7. 11 May, 2011 7 commits
    • Luis Soares's avatar
      BUG#12416700 · e2a135b0
      Luis Soares authored
      Automerged bzr bundle from bug report into latest mysql-5.5.
      e2a135b0
    • Magnus Blåudd's avatar
      Merge bug 12384993 · afdc90f4
      Magnus Blåudd authored
      afdc90f4
    • Alexander Nozdrin's avatar
      Ignore auto-generated files. · 95158d99
      Alexander Nozdrin authored
      95158d99
    • Georgi Kodinov's avatar
      merge from mysql-5.5 · c2606c8a
      Georgi Kodinov authored
      c2606c8a
    • MySQL Build Team's avatar
      Cloning of the 5.5.13 release from Mysql-5.5, · 1b413e45
      MySQL Build Team authored
      increase the version number by two
      1b413e45
    • Georgi Kodinov's avatar
      Bug #11744875: 4082: integer lengths cause truncation with distinct concat · b5ef16eb
      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.
      b5ef16eb
    • Magnus Blåudd's avatar
      Bug#12384993 EXTRA/RPL_TEST/CHECK_TYPE.INC NEED SUPPORT FOR SPECIFIC ENGINE · b3bb31c9
      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"
      b3bb31c9
  8. 10 May, 2011 2 commits