1. 28 Jun, 2010 6 commits
    • Davi Arnaut's avatar
      3a57c8d1
    • Davi Arnaut's avatar
      bfd3b7a1
    • Davi Arnaut's avatar
      73994755
    • Davi Arnaut's avatar
      407b68bf
    • Davi Arnaut's avatar
      Bug#54457: Test suite broken for 32-bit build · 715bac92
      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.
      715bac92
    • Davi Arnaut's avatar
      Bug#54041: MySQL 5.0.92 fails when tests from Connector/C suite run · e42d9085
      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.
      e42d9085
  2. 27 Jun, 2010 4 commits
    • Alfranio Correia's avatar
      null-merge · 8efca286
      Alfranio Correia authored
      8efca286
    • Alfranio Correia's avatar
      77854696
    • unknown's avatar
      Manual merge · af01afa0
      unknown authored
      af01afa0
    • unknown's avatar
      The following statements support the CURRENT_USER() where a user is needed. · 451cea3f
      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.
      451cea3f
  3. 26 Jun, 2010 3 commits
    • Jon Olav Hauglid's avatar
      null-merge from mysql-5.1-bugteam. · 04e31b7f
      Jon Olav Hauglid authored
      04e31b7f
    • Jon Olav Hauglid's avatar
      Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE with open HANDLER · b4593605
      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.
      b4593605
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk. · 433c64cc
      Alexander Nozdrin authored
      433c64cc
  4. 25 Jun, 2010 4 commits
    • Georgi Kodinov's avatar
      merge · dbd40508
      Georgi Kodinov authored
      dbd40508
    • Georgi Kodinov's avatar
      merge · 8fc01031
      Georgi Kodinov authored
      8fc01031
    • Sergey Glukhov's avatar
      5.1-bugteam->trunk-merge merge · 68c5b544
      Sergey Glukhov authored
      68c5b544
    • Sergey Glukhov's avatar
      Bug#54422 query with = 'variables' · 2a86768e
      Sergey Glukhov authored
      During creation of the table list of
      processed tables hidden I_S table 'VARIABLES'
      is erroneously added into the table list.
      it leads to ER_UNKNOWN_TABLE error in
      TABLE_LIST::add_table_to_list() function.
      The fix is to skip addition of hidden I_S
      tables into the table list.
      
      
      mysql-test/r/information_schema.result:
        test case
      mysql-test/t/information_schema.test:
        test case
      sql/sql_show.cc:
        The fix is to skip addition of hidden I_S
        tables into the table list.
      2a86768e
  5. 24 Jun, 2010 13 commits
  6. 23 Jun, 2010 2 commits
  7. 22 Jun, 2010 4 commits
    • Alexey Kopytov's avatar
      Bug#54477: Crash on IN / CASE with NULL arguments · 0e656039
      Alexey Kopytov authored
      Incorrect handling of NULL arguments could lead to a crash on
      the IN or CASE operations when either NULL arguments were
      passed explicitly as arguments (IN) or implicitly generated by
      the WITH ROLLUP modifier (both IN and CASE).
      
      Item_func_case::find_item() assumed all necessary comparators
      to be instantiated in fix_length_and_dec(). However, in the
      presence of WITH ROLLUP modifier, arguments could be
      substituted with an Item_null leading to an "unexpected"
      STRING_RESULT comparator being invoked.
      
      In addition to the problem identical to the above,
      Item_func_in::val_int() could crash even with explicitly passed
      NULL arguments due to an optimization in fix_length_and_dec()
      leading to NULL arguments being ignored during comparators
      creation.
      
      
      mysql-test/r/func_in.result:
        Test cases for bug#54477.
      mysql-test/t/func_in.test:
        Test cases for bug#54477.
      sql/item_cmpfunc.cc:
        Added additional checks for Item_nulls in 
        Item_func_case::find_item() and Item_func_in::val_int().
      0e656039
    • Vasil Dimov's avatar
      Merge mysql-trunk -> mysql-trunk-merge · ea73b23e
      Vasil Dimov authored
      ea73b23e
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-trunk-bugfixing. · a96267c1
      Alexander Nozdrin authored
      a96267c1
    • Magne Mahre's avatar
      Post-push fixups for WL#5349 · 7657ee10
      Magne Mahre authored
      
      mysql-test/suite/perfschema/t/no_threads-master.opt:
        Innodb will start multiple threads, which is
        not compatible with --one-thread.   Disable
        innodb to be able to run the test case.
      7657ee10
  8. 21 Jun, 2010 4 commits