1. 10 Feb, 2011 7 commits
  2. 03 Feb, 2011 1 commit
  3. 24 Jan, 2011 2 commits
  4. 20 Jan, 2011 2 commits
  5. 18 Jan, 2011 10 commits
    • Libing Song's avatar
      Automerge · 76d2e222
      Libing Song authored
      76d2e222
    • Anitha Gopi's avatar
      automerge · fb7a2a00
      Anitha Gopi authored
      fb7a2a00
    • Anitha Gopi's avatar
    • Libing Song's avatar
      Manual merge · 16c09339
      Libing Song authored
      16c09339
    • Libing Song's avatar
      Bug#58546 test rpl_packet timeout failure sporadically on PB · 77bc81b8
      Libing Song authored
                  
      rpl_packet got a timeout failure sporadically on PB when stopping
      slave. The real reason of this bug is that STOP SLAVE stopped
      IO thread first and then stopped SQL thread. It was
      possible that IO thread stopped after replicating part of a
      transaction which SQL thread was executing. SQL thread would
      be hung if the transaction could not be rolled back safely.
                  
      After this patch, STOP SLAVE will stop SQL thread first and then stop IO
      thread, which guarantees that IO thread will fetch the reset of the
      events of the transaction that SQL thread is executing, so that SQL
      thread can finish the transaction if it cannot be rolled back safely.
                  
      Added below auxiliary files to make the test code neater.
      restart_slave_sql.inc
      rpl_connection_master.inc
      rpl_connection_slave.inc
      rpl_connection_slave1.inc
      77bc81b8
    • John H. Embretsen's avatar
      Post push test fix for show_check.test. · 4bdfcf59
      John H. Embretsen authored
      Fix for bug#45740 introduced test case using SHOW TABLE STATUS against a Memory table using latin1 character in table name.
      The test failed on Windows and FreeBSD due to a difference in the value for Avg_row_length.
      The average row length normally depends on the values for data length and row count. According to the 5.5 manual data length is approximate with Memory tables.
      With MyISAM and InnoDB the Avg_row_length is the same on Windows and Solaris.
      The solution implemented by this patch is to mask out the value for Avg_row_length, as it may vary when using Memory tables.
      4bdfcf59
    • Alexander Barkov's avatar
      Merging from 5.1. · daf602a2
      Alexander Barkov authored
      daf602a2
    • Alexander Barkov's avatar
      Bug#44332 my_xml_scan reads behind the end of buffer · 5574a2cd
      Alexander Barkov authored
      Problem: the scanner function tested for strings "<![CDATA[" and
      "-->" without checking input string boundaries, which led to valgrind's
      "Conditional jump or move depends on uninitialised value(s)" error.
      
      Fix: Adding boundary checking.
      
        @ mysql-test/r/xml.result
        @ mysql-test/t/xml.test
        Adding test
      
        @ strings/xml.c
        Adding a helper function my_xml_parser_prefix_cmp(),
        with input string boundary check.
      5574a2cd
    • Vinay Fisrekar's avatar
      Merge from mysql-5.1 for · 377c9661
      Vinay Fisrekar authored
      sys_vars.innodb_max_dirty_pages_pct_func fails sporadically
            
      377c9661
    • Vinay Fisrekar's avatar
      · afa2ec12
      Vinay Fisrekar authored
      BUG#58858 : sys_vars.innodb_max_dirty_pages_pct_func fails sporadically
      
      Committing After latest merge.      
      Modified check_pct procedure to check return value of wait condition instead 
      of calling "dirty_pct".
         
      Adding Review comments:
      1) Added comment for success variable value
      2) Procedure check_pct changed For Adding BOOLEAN input and SELECT QUERY Change
      afa2ec12
  6. 17 Jan, 2011 4 commits
    • Luis Soares's avatar
      BUG#42879: CHANGE MASTER RELAY_LOG_FILE=path fails on windows · b3635084
      Luis Soares authored
      Re-enabling the test case on windows since BUG#12190 has fixed
      the issue.
      b3635084
    • Mikael Ronstrom's avatar
      BUG#59549, fix compiler error on Windows · 14a46479
      Mikael Ronstrom authored
      14a46479
    • Alexander Barkov's avatar
      Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string function · 6665ca25
      Alexander Barkov authored
      Introduced by the fix for bug#44766.
      
      Problem: it's not correct to use args[0]->str_value as a buffer,
      because args[0] may need this buffer for its own purposes.
      
      Fix: adding a new class member tmp_value to use as return value.
      
        @ mysql-test/r/ctype_many.result
        @ mysql-test/t/ctype_many.test
        Adding tests
      
        @ sql/item_strfunc.cc
        Changing code into traditional style:
        use "str" as a buffer for the argument and tmp_value for the result value.
      
        @ sql/item_strfunc.h
        Adding tmp_value
      6665ca25
    • Alexander Barkov's avatar
      Bug#59149 valgrind warnings with "like .. escape .." function · a2850a2f
      Alexander Barkov authored
            
      Problem: when processing a query like:
        SELECT '' LIKE '1' ESCAPE COUNT(1);
      escape_item->val_str() was never executed and the "escape" class member
      stayed initialized, which led to valgrind uninitialized memory error.
            
      Note, a query with some tables in "FROM" clause
      returns ER_WRONG_ARGUMENTS in the same situation:
      
         SELECT '' LIKE '1' ESCAPE COUNT(1) FROM t1;
         ERROR 1210 (HY000): Incorrect arguments to ESCAPE
      
      Fix: disallowing using aggregate functions in ESCAPE clause,
      even if there are no tables used. There is no much use of that anyway.
      a2850a2f
  7. 15 Jan, 2011 3 commits
    • Nirbhay Choubey's avatar
      Bug#58221 : mysqladmin --sleep=x --count=x keeps looping · 208b6776
      Nirbhay Choubey authored
      When mysqldadmin is run with sleep and count options,
      it goes into an infinite loop and keeps executing the
      specified command.
      
      This happened because the statement, responsible for
      decrementing the count value, was missing.
      
      Fixed by adding a statement which will decrement the
      count value for each iteration.
      
      
      client/mysqladmin.cc:
        Bug#58221 : mysqladmin --sleep=x --count=x keeps looping
        
        Added a condition to check and decrement the count
        value stored in nr_iterations per iteration.
      mysql-test/r/mysqladmin.result:
        Added a testcase for Bug#58221.
      mysql-test/t/mysqladmin.test:
        Added a testcase for Bug#58221.
      208b6776
    • unknown's avatar
      Null merge from 5.0 · 3a6b4048
      unknown authored
      It is a backported patch.
      3a6b4048
    • unknown's avatar
      BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave · 12c6d1f3
      unknown authored
      Backport to 5.0.
      
      /*![:version:] Query Code */, where [:version:] is a sequence of 5 
      digits representing the mysql server version(e.g /*!50200 ... */),
      is a special comment that the query in it can be executed on those 
      servers whose versions are larger than the version appearing in the 
      comment. It leads to a security issue when slave's version is larger 
      than master's. A malicious user can improve his privileges on slaves. 
      Because slave SQL thread is running with SUPER privileges, so it can
      execute queries that he/she does not have privileges on master.
            
      This bug is fixed with the logic below: 
      - To replace '!' with ' ' in the magic comments which are not applied on
        master. So they become common comments and will not be applied on slave.
            
      - Example:
        'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /*!99999 ,(3)*/
         will be binlogged as
        'INSERT INTO t1 VALUES (1) /*!10000, (2)*/ /* 99999 ,(3)*/
      12c6d1f3
  8. 14 Jan, 2011 10 commits
    • Alexey Botchkov's avatar
      Bug#52208 gis fails on some platforms (Solaris, HP-UX, Linux) · 335fcd91
      Alexey Botchkov authored
              IA64 and some other arcitectures use different float rounding mode and
              i find no decent way to make it consistent.
              So the test changed to be insensitive to this.
      
      per-file messages:
        mysql-test/t/gis.test
      Bug#52208      gis fails on some platforms (Solaris, HP-UX, Linux)
              --replace_result added
      335fcd91
    • Mikael Ronstrom's avatar
      Disable kill.test for thread pool · 1ce30b73
      Mikael Ronstrom authored
      1ce30b73
    • Mikael Ronstrom's avatar
      Updated plugin.defs with thread pool · c2fb1a9b
      Mikael Ronstrom authored
      c2fb1a9b
    • Nirbhay Choubey's avatar
      Bug#13618 : mysqldump --xml omits comment on table field · ab2d29ec
      Nirbhay Choubey authored
      When mysqldump tries to dump information in xml format,
      the result does not contain field level comments.
      
      In order to retrieve various informations for a field/column,
      mysqldump currently uses 'show fields from <tab>' statement.
      The attributes returned by the statement lacks the information
      regarding field comments.
      
      Fixed by changing the query to one that probes I_S to retrieve
      required field informations, including the field comment.
      
      
      client/mysqldump.c:
        Bug#13618 : mysqldump --xml omits comment on table field.
        
        Replaced the 'show fields' command by a statement that
        queries I_S, in order to retrieve information on all the
        attributes that 'show fields' returns along-with an additional
        column_comment information.
      mysql-test/r/client_xml.result:
        Result modifications for bug#13618.
      mysql-test/r/mysqldump.result:
        Result modifications for bug#13618.
      mysql-test/t/mysqldump.test:
        Added a testcase for bug#13618.
      ab2d29ec
    • Sven Sandberg's avatar
      BUG#59063: rpl_migration_crash_safe fails on Windows · faafae78
      Sven Sandberg authored
      Backported the fix to 5.1.
      Problem: the auxiliary test files rpl_start_server.inc and rpl_stop_server.inc
      write a file that is later read by mtr. The bug was that the file was written
      with platform-dependent newline terminators, i.e., \r\n on windows, whereas mtr
      only understands \n.
      Fix: write the file so that it uses \n on all platforms.
      
      
      mysql-test/include/rpl_start_server.inc:
        Force test to use \n instead of platform-dependent newline terminator.
      mysql-test/include/rpl_stop_server.inc:
        Force test to use \n instead of platform-dependent newline terminator.
      faafae78
    • Mikael Ronstrom's avatar
      merge to mysql-5.5 · 45d98016
      Mikael Ronstrom authored
      45d98016
    • Mikael Ronstrom's avatar
      Tests not supporting thread pool marked · 02e82345
      Mikael Ronstrom authored
      02e82345
    • Mikael Ronstrom's avatar
      Added thread pool interface to server · 2071e6e3
      Mikael Ronstrom authored
      2071e6e3
    • Mikael Ronstrom's avatar
      Fixed status test case · 35f5e014
      Mikael Ronstrom authored
      35f5e014
    • Mikael Ronstrom's avatar
      4bc4a696
  9. 13 Jan, 2011 1 commit