1. 28 Sep, 2010 3 commits
    • smenon's avatar
      Backport into mysql-5.1.49sp1-release · 283a9555
      smenon authored
      > ------------------------------------------------------------
      > revno: 3457.3.1
      > revision-id: alexey.kopytov@sun.com-20100712145855-niybvwsthe480r69
      > parent: mattias.jonsson@oracle.com-20100709130033-fgr7hggrrebf6qkc
      > committer: Alexey Kopytov <Alexey.Kopytov@sun.com>
      > branch nick: 55061-5.1-bugteam
      > timestamp: Mon 2010-07-12 18:58:55 +0400
      > message:
      >   Bug#55061: Build failing on sol 8 x86 - assembler code vs 
      >              compiler problem
      >   
      >   GCC-style inline assembly is not supported by the Sun Studio
      >   compilers prior to version 12.
      >   
      >   Added a check for the Sun Studio version to avoid using 
      >   _FPU_GETCW() / _FPU_SETCW() when inline assembly is
      >    unsupported. This can lead to some differences in floating
      >   point calculations on Solaris 8/x86 which, however, is not worth
      >   bothering with Sun-style assembly .il templates.
      283a9555
    • smenon's avatar
      Backport into mysql-5.1.49sp1-release · 07b3d659
      smenon authored
      > ------------------------------------------------------------
      > revno: 3452.1.12
      > revision-id: davi.arnaut@oracle.com-20100730121710-sc068t4d2f1c2gi9
      > parent: dao-gang.qu@sun.com-20100730035934-8in8err1b1rqu72y
      > committer: Davi Arnaut <davi.arnaut@oracle.com>
      > branch nick: mysql-5.1-bugteam
      > timestamp: Fri 2010-07-30 09:17:10 -0300
      > message:
      >   Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run
      >   
      >   Fix a regression (due to a typo) which caused spurious incorrect
      >   argument errors for long data stream parameters if all forms of
      >   logging were disabled (binary, general and slow logs).
      07b3d659
    • unknown's avatar
      Set version number for mysql-5.1.49sp1 release · cef5c332
      unknown authored
      cef5c332
  2. 09 Jul, 2010 1 commit
  3. 07 Jul, 2010 1 commit
  4. 04 Jul, 2010 1 commit
    • Vasil Dimov's avatar
      Merge mysql-5.1-innodb -> mysql-5.1-security · bfc27995
      Vasil Dimov authored
      Merge up to sunny.bains@oracle.com-20100625081841-ppulnkjk1qlazh82 .
      There are 8 more changesets in mysql-5.1-innodb, but PB2 shows a
      failure for a test added in one of them. If that is resolved quickly
      then those 8 more changesets will be merged too.
      bfc27995
  5. 02 Jul, 2010 8 commits
  6. 01 Jul, 2010 2 commits
    • Alexey Kopytov's avatar
      Automerge. · 034165ce
      Alexey Kopytov authored
      034165ce
    • Alexey Kopytov's avatar
      Bug#54667: Unnecessary signal handler redefinition · e5a6661a
      Alexey Kopytov authored
      POSIX requires that a signal handler defined with sigaction()
      is not reset on delivering a signal unless SA_NODEFER or
      SA_RESETHAND is set. It is therefore unnecessary to redefine
      the handler on signal delivery on platforms where sigaction()
      is used without those flags.
      
      include/my_alarm.h:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY.
      include/my_global.h:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY. The latter is now defined
        only on non-BSD platforms missing the POSIX sigaction()
        function.
      libmysql/libmysql.c:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      mysys/thr_alarm.c:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      sql/mysqld.cc:
        Renamed DONT_REMEMBER_SIGNAL ->
        SIGNAL_HANDLER_RESET_ON_DELIVERY
      e5a6661a
  7. 30 Jun, 2010 2 commits
    • Sergey Glukhov's avatar
      Bug#51431 Wrong sort order after import of dump file · 65edc14d
      Sergey Glukhov authored
      The problem is that QUICK_SELECT_DESC behaviour depends
      on used_key_parts value which can be bigger than selected
      best_key_parts value if an engine supports clustered key.
      But used_key_parts is overwritten with best_key_parts
      value that prevents from correct selection of index
      access method. The fix is to preserve used_key_parts
      value for further use in QUICK_SELECT_DESC.
      
      
      mysql-test/r/innodb_mysql.result:
        test case
      mysql-test/t/innodb_mysql.test:
        test case
      sql/sql_select.cc:
        preserve used_key_parts value for further use in QUICK_SELECT_DESC
      65edc14d
    • Staale Smedseng's avatar
      Bug #53899 Wrong mysql_stmt_errno() after connection loss with · 6d617b6d
      Staale Smedseng authored
      automatic reconnect
      
      A client with automatic reconnect enabled will see the error
      message "Lost connection to MySQL server during query" if the
      connection is lost between mysql_stmt_prepare() and
      mysql_stmt_execute(). The mysql_stmt_errno() number, however,
      is 0 -- not the corresponding value 2013.
      
      This patch checks for the case where the prepared statement
      has been pruned due to a connection loss (i.e., stmt->mysql
      has been set to NULL) during a call to cli_advanced_command(),
      and avoids changing the last_errno to the result of the last
      reconnect attempt.
      6d617b6d
  8. 29 Jun, 2010 2 commits
  9. 28 Jun, 2010 5 commits
    • Luis Soares's avatar
    • Davi Arnaut's avatar
      b594cee7
    • Davi Arnaut's avatar
      86f1652d
    • Davi Arnaut's avatar
      Bug#54457: Test suite broken for 32-bit build · b8ec2794
      Davi Arnaut authored
      The default value of the myisam_max_extra_sort_file_size could be
      higher than the maximum accepted value, leading to warnings upon
      the server start.
      
      The solution is to simply set the value to the maximum value in a
      32-bit built (2147483647, one less than the current). This should
      be harmless as the option is currently unused in 5.1.
      
      include/myisam.h:
        Remove now-unused macro.
      sql/mysqld.cc:
        Set max value to INT_MAX32.
      b8ec2794
    • Davi Arnaut's avatar
      Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run · a065c7a5
      Davi Arnaut authored
      The problem was that a user could supply supply data in chunks
      via the COM_STMT_SEND_LONG_DATA command to prepared statement
      parameter other than of type TEXT or BLOB. This posed a problem
      since other parameter types aren't setup to handle long data,
      which would lead to a crash when attempting to use the supplied
      data.
      
      Given that long data can be supplied at any stage of a prepared
      statement, coupled with the fact that the type of a parameter
      marker might change between consecutive executions, the solution
      is to validate at execution time each parameter marker for which
      a data stream was provided. If the parameter type is not TEXT or
      BLOB (that is, if the type is not able to handle a data stream),
      a error is returned.
      
      sql/sql_prepare.cc:
        Before converting the parameter data stream, check the type
        compatibility.
      tests/mysql_client_test.c:
        Add test case.
      a065c7a5
  10. 27 Jun, 2010 2 commits
    • Alfranio Correia's avatar
      11d658d1
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 95e5c868
      unknown authored
      DROP USER 
      RENAME USER CURRENT_USER() ...
      GRANT ... TO CURRENT_USER()
      REVOKE ... FROM CURRENT_USER()
      ALTER DEFINER = CURRENT_USER() EVENTbut, When these statements are binlogged, CURRENT_USER() just is binlogged
      as 'CURRENT_USER()', it is not expanded to the real user name. When slave 
      executes the log event, 'CURRENT_USER()' is expand to the user of slave 
      SQL thread, but SQL thread's user name always NULL. This breaks the replication.
      
      After this patch, session's user will be written into query log events 
      if these statements call CURREN_USER() or 'ALTER EVENT' does not assign a definer.
      
      
      mysql-test/include/diff_tables.inc:
        Expend its abilities.
        Now it can diff not only in sessions of 'master' and 'slave', but 
        other sessions as well.
      mysql-test/include/rpl_diff_tables.inc:
        Diff the same table between master and slaves.
      sql/log_event.cc:
        session's user will be written into Query_log_event, if is_current_user_used() is TRUE.
        On slave SQL thread, Only thd->variables.current_user is written into Query_log_event,
        if it exists.
      sql/sql_acl.cc:
        On slave SQL thread, grantor should copy from thd->variables.current_user, if it exists
      sql/sql_class.h:
        On slave SQL thread, thd->variables.current_user is used to store the applying event's
        invoker.
      95e5c868
  11. 26 Jun, 2010 1 commit
    • Jon Olav Hauglid's avatar
      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER · 8aa85cfc
      Jon Olav Hauglid authored
      This deadlock happened if DROP DATABASE was blocked due to an open
      HANDLER table from a different connection. While DROP DATABASE
      is blocked, it holds the LOCK_mysql_create_db mutex. This results
      in a deadlock if the connection with the open HANDLER table tries
      to execute a CREATE/ALTER/DROP DATABASE statement as they all
      try to acquire LOCK_mysql_create_db.
      
      This patch makes this deadlock scenario very unlikely by closing and
      marking for re-open all HANDLER tables for which there are pending
      conflicing locks, before LOCK_mysql_create_db is acquired.
      However, there is still a very slight possibility that a connection
      could access one of these HANDLER tables between closing/marking for
      re-open and the acquisition of LOCK_mysql_create_db.
      
      This patch is for 5.1 only, a separate and complete fix will be
      made for 5.5+.
      
      Test case added to schema.test.
      8aa85cfc
  12. 25 Jun, 2010 8 commits
  13. 24 Jun, 2010 4 commits