1. 15 Apr, 2010 5 commits
  2. 14 Apr, 2010 1 commit
  3. 13 Apr, 2010 8 commits
    • Konstantin Osipov's avatar
      A fix for Bug#11918 "SP does not accept variables in LIMIT clause" · b8d014b8
      Konstantin Osipov authored
      Allow stored procedure variables in LIMIT clause.
      Only allow variables of INTEGER types. 
      Handle negative values by means of an implicit cast to UNSIGNED 
      (similarly to prepared statement placeholders).
      Add tests.
      Make sure replication works by not doing NAME_CONST substitution
      for variables in LIMIT clause.
      Add replication tests.
      b8d014b8
    • Vladislav Vaintroub's avatar
      merge · 03b1cdd0
      Vladislav Vaintroub authored
      03b1cdd0
    • Alexander Nozdrin's avatar
      Post-fix for Bug#13174. · fad9478e
      Alexander Nozdrin authored
      fad9478e
    • Vladislav Vaintroub's avatar
      merge · babfd0e7
      Vladislav Vaintroub authored
      babfd0e7
    • Konstantin Osipov's avatar
      Backport of: · 53fecff1
      Konstantin Osipov authored
      ChangeSet@1.2703, 2007-12-07 09:35:28-05:00, cmiller@zippy.cornsilk.net +40 -0
      Bug#13174: SHA2 function
      Patch contributed from Bill Karwin, paper unnumbered CLA in Seattle
      
      Implement SHA2 functions.
      
      Chad added code to make it work with YaSSL.  Also, he removed the 
      (probable) bug of embedded server never using SSL-dependent 
      functions.  (libmysqld/Makefile.am didn't read ANY autoconf defs.)
      
      Function specification:
        SHA2( string cleartext, integer hash_length ) 
          -> string hash, or NULL
      where hash_length is one of 224, 256, 384, or 512.  If either is 
      NULL or a length is unsupported, then the result is NULL.  The 
      resulting string is always the length of the hash_length parameter
      or is NULL.
      
      Include the canonical hash examples from the NIST in the test
      results.
      ---
      Polish and address concerns of reviewers.
      53fecff1
    • Vladislav Vaintroub's avatar
      merge · 23359f7f
      Vladislav Vaintroub authored
      23359f7f
    • Vladislav Vaintroub's avatar
      Fix perfschema unittests build on Windows · 04b601a7
      Vladislav Vaintroub authored
      pthread_t is not defined unless my_pthread.h is included.
      04b601a7
    • oystein.grovlen@sun.com's avatar
      Bug#51980 mysqld service crashes with a simple COUNT(DISTINCT) query over a view · 5af5bb2d
      oystein.grovlen@sun.com authored
      Problem: Segmentation fault in add_group_and_distinct_keys() when accessing
      field of what is assumed to be an Item_field object.
      
      Cause: In case of views, the item added to list by is_indexed_agg_distinct() 
      was not of type Item_field, but Item_ref.
      
      Resolution:  Add the real Item_field object, the one referred to by 
      Item_ref object, to the list, instead.
      5af5bb2d
  4. 12 Apr, 2010 4 commits
  5. 10 Apr, 2010 3 commits
  6. 07 Apr, 2010 1 commit
    • Mats Kindahl's avatar
      WL#5030: Splitting mysql_priv.h · 0768deeb
      Mats Kindahl authored
      Adding my_global.h first in all files using
      NO_EMBEDDED_ACCESS_CHECKS.
      
      Correcting a merge problem resulting from a changed definition
      of check_some_access compared to the original patches.
      0768deeb
  7. 06 Apr, 2010 4 commits
  8. 05 Apr, 2010 1 commit
  9. 01 Apr, 2010 1 commit
  10. 31 Mar, 2010 1 commit
    • Mats Kindahl's avatar
      WL#5030: Split and remove mysql_priv.h · e409d6f6
      Mats Kindahl authored
      This patch:
      
      - Moves all definitions from the mysql_priv.h file into
        header files for the component where the variable is
        defined
      - Creates header files if the component lacks one
      - Eliminates all include directives from mysql_priv.h
      - Eliminates all circular include cycles
      - Rename time.cc to sql_time.cc
      - Rename mysql_priv.h to sql_priv.h
      e409d6f6
  11. 26 Mar, 2010 1 commit
  12. 25 Mar, 2010 1 commit
    • Luis Soares's avatar
      BUG#52202: mysqlbinlog_row* fail in daily-trunk on Sol10 x86_64 · c340c3aa
      Luis Soares authored
                 debug_max
      
      There was a buffer overrun when unpacking the date
      field. Incidentaly, this seems to affect only solaris x86_64
      debug builds, but others platforms may be vulnerable as well.
      
      In particular, the buffer size used was not taking into
      consideration that the '\0' character would be written into
      it.
      
      We fix this by increasing the size of the buffer used to
      accommodate one extra byte (the one for the '\0').
      c340c3aa
  13. 24 Mar, 2010 4 commits
    • Alexey Kopytov's avatar
    • Alexey Kopytov's avatar
      Manual merge of mysql-trunk into mysql-trunk-merge. · f1088567
      Alexey Kopytov authored
      Conflicts:
      
      Text conflict in client/mysqlbinlog.cc
      Text conflict in mysql-test/Makefile.am
      Text conflict in mysql-test/collections/default.daily
      Text conflict in mysql-test/r/mysqlbinlog_row_innodb.result
      Text conflict in mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
      Text conflict in mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
      Text conflict in mysql-test/suite/rpl/t/rpl_row_create_table.test
      Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
      Text conflict in mysql-test/suite/rpl/t/rpl_typeconv_innodb.test
      Text conflict in mysys/charset.c
      Text conflict in sql/field.cc
      Text conflict in sql/field.h
      Text conflict in sql/item.h
      Text conflict in sql/item_func.cc
      Text conflict in sql/log.cc
      Text conflict in sql/log_event.cc
      Text conflict in sql/log_event_old.cc
      Text conflict in sql/mysqld.cc
      Text conflict in sql/rpl_utility.cc
      Text conflict in sql/rpl_utility.h
      Text conflict in sql/set_var.cc
      Text conflict in sql/share/Makefile.am
      Text conflict in sql/sql_delete.cc
      Text conflict in sql/sql_plugin.cc
      Text conflict in sql/sql_select.cc
      Text conflict in sql/sql_table.cc
      Text conflict in storage/example/ha_example.h
      Text conflict in storage/federated/ha_federated.cc
      Text conflict in storage/myisammrg/ha_myisammrg.cc
      Text conflict in storage/myisammrg/myrg_open.c
      f1088567
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · 58d8bfab
      Alexander Nozdrin authored
      58d8bfab
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · c203c8da
      Alexander Nozdrin authored
      c203c8da
  14. 23 Mar, 2010 2 commits
  15. 22 Mar, 2010 3 commits