1. 19 Jan, 2011 1 commit
  2. 18 Jan, 2011 17 commits
    • Libing Song's avatar
      Automerge · 7992b0a2
      Libing Song authored
      7992b0a2
    • Anitha Gopi's avatar
      automerge · 98fc54a0
      Anitha Gopi authored
      98fc54a0
    • Anitha Gopi's avatar
    • Libing Song's avatar
      Manual merge · d12d5584
      Libing Song authored
      d12d5584
    • Libing Song's avatar
      Bug#58546 test rpl_packet timeout failure sporadically on PB · 84e4bdbf
      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
      84e4bdbf
    • John H. Embretsen's avatar
      Post push test fix for show_check.test. · 72b448f0
      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.
      72b448f0
    • Bjorn Munch's avatar
      upmerge undo of 59063 · e5effc9b
      Bjorn Munch authored
      e5effc9b
    • Bjorn Munch's avatar
      Bug #59063 rpl_migration_crash_safe fails on Windows · 0bb2c151
      Bjorn Munch authored
      Undoing the patch, it complicates the code but is not the solution
      
      I do not beleive newline mismatch could be the cause of this failure
      First, I cannot see how this could be a problem, mtr ignores the newline
        when reading the expect file, and the file is written and read on Windows.
      Second, if this really was the problem it should have been deterministic:
        either the newline is correctly interepreted or it is not.
      0bb2c151
    • Bjorn Munch's avatar
      oops forgot one file in last commit · 3565f4fd
      Bjorn Munch authored
      3565f4fd
    • Bjorn Munch's avatar
      Some more copyright fixes in mtr · 80fcb883
      Bjorn Munch authored
      80fcb883
    • Bjorn Munch's avatar
      Some more copyright fixes in mtr · 057eaa03
      Bjorn Munch authored
      057eaa03
    • Bjorn Munch's avatar
      Fixed copyright headers in mtr src files · 41471223
      Bjorn Munch authored
      41471223
    • Bjorn Munch's avatar
      Fixed copyright headers in mtr src files · eb420d82
      Bjorn Munch authored
      eb420d82
    • Alexander Barkov's avatar
      Merging from 5.1. · 36e96e53
      Alexander Barkov authored
      36e96e53
    • Alexander Barkov's avatar
      Bug#44332 my_xml_scan reads behind the end of buffer · 19f4e4d6
      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.
      19f4e4d6
    • Vinay Fisrekar's avatar
      Merge from mysql-5.1 for · c70b239e
      Vinay Fisrekar authored
      sys_vars.innodb_max_dirty_pages_pct_func fails sporadically
            
      c70b239e
    • Vinay Fisrekar's avatar
      · 5302bb48
      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
      5302bb48
  3. 17 Jan, 2011 10 commits
    • Luis Soares's avatar
      BUG#42879: CHANGE MASTER RELAY_LOG_FILE=path fails on windows · 720e1212
      Luis Soares authored
      Re-enabling the test case on windows since BUG#12190 has fixed
      the issue.
      720e1212
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · e9843a85
      Magnus Blåudd authored
        - Support for graceful shutdown of cluster by using "ndb_mgm -e 'shutdown'"
      e9843a85
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · 79173ada
      Magnus Blåudd authored
       - Make it possible to use MTR_MAXNDB to set the upper limit of number of
        parallel ndb test to run.
       - Very useful on machines with many cores and lots of RAM
      79173ada
    • Magnus Blåudd's avatar
      mtr.pl fixes for ndb · cbd40a61
      Magnus Blåudd authored
       -  Find ndbmtd and use it round robin
      cbd40a61
    • Alexander Barkov's avatar
      Bug#58371 Assertion failed: !s.uses_buffer_owned_by(this) with format string function · 271514a7
      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
      271514a7
    • Bjorn Munch's avatar
      null upmerge · 06dbda69
      Bjorn Munch authored
      06dbda69
    • Bjorn Munch's avatar
      merge from 5.5 main · 0a9cb01a
      Bjorn Munch authored
      0a9cb01a
    • Alexander Barkov's avatar
      Bug#59149 valgrind warnings with "like .. escape .." function · a084545f
      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.
      a084545f
    • Bjorn Munch's avatar
      merge from 5.1 main · 1f99a0da
      Bjorn Munch authored
      1f99a0da
    • John H. Embretsen's avatar
      Fix for Bug#45730 - Test case disabled in show_check.test due to WL#1324. · b4f4ce23
      John H. Embretsen authored
      Enabled test snippet for bug 4374, tested on Mac OS X 10.6 as well as Solaris.
      Moved test snippet to a different place in the file, in order to avoid having 
      to save and restore "SET NAMES" setting. New surroundings expect latin1, as is 
      used in the testsnippet.
      
      An extra copy of the commented test snippet is removed, a comment is added,
      SQL keywords are converted to uppercase, and engine name "heap" is updated to 
      "Memory".
      
      Also added Copyright statement and a notice about the file's encoding(s).
      b4f4ce23
  4. 16 Jan, 2011 1 commit
    • Nirbhay Choubey's avatar
      Bug#58139 : default-auth option not recognized in MySQL standard · 25f433bd
      Nirbhay Choubey authored
                  command line clients.
      
      Postfix covering other mysql standard clients like mysql_upgrade,
      mysqlbinlog, mysqlcheck, mysqlimport, mysqlshow and mysqlslap.
      
      
      client/client_priv.h:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients
        
        Added an entry for 'default-auth' option.
      client/mysql.cc:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients
        
        Updated the id entry for default_auth option.
      client/mysql_upgrade.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      client/mysqladmin.cc:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients
        
        Updated the id entry for default_auth option.
      client/mysqlbinlog.cc:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      client/mysqlcheck.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      client/mysqldump.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients
        
        Updated the id entry for default_auth option.
      client/mysqlimport.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      client/mysqlshow.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      client/mysqlslap.c:
        Bug#58139 : default-auth option not recognized in MySQL standard
                    command line clients.
        
        Introduced two new variables to hold values from default-auth and
        plugin-dir options and further pushed them to client's st_mysql
        instance.
      mysql-test/r/plugin_auth.result:
        Added test case for Bug#58139 for mysql_upgrade.
      mysql-test/t/plugin_auth.test:
        Added test case for Bug#58139 for mysql_upgrade.
      25f433bd
  5. 15 Jan, 2011 5 commits
    • Nirbhay Choubey's avatar
    • Nirbhay Choubey's avatar
      Bug#58221 : mysqladmin --sleep=x --count=x keeps looping · c884d136
      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.
      c884d136
    • unknown's avatar
      Auto merge · bd3daafb
      unknown authored
      bd3daafb
    • unknown's avatar
      Null merge from 5.0 · d69860ea
      unknown authored
      It is a backported patch.
      d69860ea
    • unknown's avatar
      BUG#49124 Security issue with /*!-versioned */ SQL statements on Slave · 263e63a4
      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)*/
      263e63a4
  6. 14 Jan, 2011 6 commits
    • Alexey Botchkov's avatar
      Bug#46393 If for slow_query_log a string is entered it does not complain. · cd7de761
      Alexey Botchkov authored
              For all the boolean system variables we now issue warnings if the
              value wasn't recognized. Before that we just silently set them
              to FALSE in this case.
      
      per-file comments:
        mysys/my_getopt.c
      Bug #46393 If for slow_query_log a string is entered it does not complain.
              warning issued if no documented value was specified.
      cd7de761
    • Alexey Botchkov's avatar
      merging. · 97a0bbbf
      Alexey Botchkov authored
      97a0bbbf
    • Alexey Botchkov's avatar
      Bug#52208 gis fails on some platforms (Solaris, HP-UX, Linux) · 9e8935eb
      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
      9e8935eb
    • Nirbhay Choubey's avatar
      Bug#13618 : mysqldump --xml omits comment on table field · aeda5996
      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.
      aeda5996
    • Tor Didriksen's avatar
      Bug #59498 div function broken in mysql-trunk · da94fc5d
      Tor Didriksen authored
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      sql/item_func.cc:
        Check for null before converting value to my_decimal.
      da94fc5d
    • Nirbhay Choubey's avatar
      Merging fix of Bug#13618 from mysql-5.1. · 3ea2b498
      Nirbhay Choubey authored
      3ea2b498