1. 18 Jan, 2011 7 commits
  2. 17 Jan, 2011 7 commits
  3. 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
  4. 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
  5. 14 Jan, 2011 13 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
    • Guilhem Bichot's avatar
      Fix for BUG#59432 "--autocommit=on does not work (@@global.autocommit is 0)" · 3ddfad4a
      Guilhem Bichot authored
      mysql-test/r/mysqld--help-notwin.result:
        consequence of introducing opt_autocommit and its default
      mysql-test/suite/sys_vars/r/autocommit_func4.result:
        Before this fix, this test would have shown @@global.autocommit == 0
        in spite of --autocommit=on.
      mysql-test/suite/sys_vars/r/autocommit_func5.result:
        result unchanged by the fix
      sql/mysqld.cc:
        atoi(argument) was reliable for =0|1 parameters. Now that boolean options
        must support =on/off/true/false, atoi(argument) is wrong (being always 0
        for those strings). Instead, let the internal logic of my_getopt
        (in particular get_bool_argument()) set a boolean opt_autocommit
        properly, and use that to set global_system_variables.option_bits.
      3ddfad4a
    • Georgi Kodinov's avatar
      Bug #55509 : main.lowercase_table2 fails on Mac OSX (again) · c5a95841
      Georgi Kodinov authored
      The test passes on MacOSX. removing it from the experimental list.
      c5a95841
    • Luis Soares's avatar
      e41b1b81
    • Sven Sandberg's avatar
      cfb019cd
    • Sven Sandberg's avatar
      BUG#59063: rpl_migration_crash_safe fails on Windows · 8309a50c
      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.
      8309a50c
    • Georgi Kodinov's avatar
      bumped up the version · 5f8b4cbc
      Georgi Kodinov authored
      5f8b4cbc
    • Tor Didriksen's avatar
      Bug #59241 invalid memory read in do_div_mod with doubly assigned variables · dfb9e8ca
      Tor Didriksen authored
      Fix: copy my_decimal by value, to avoid dangling pointers.
      
      
      mysql-test/r/func_math.result:
        New test case.
      mysql-test/t/func_math.test:
        New test case.
      sql/item_cmpfunc.cc:
        No need to call fix_buffer_pointer() anymore.
      sql/item_func.cc:
        Copy my_decimal by value, to avoid dangling pointers.
      sql/my_decimal.h:
        Implement proper copy constructor and assignment operator for my_decimal.
      sql/sql_analyse.cc:
        No need to call fix_buffer_pointer() anymore.
      strings/decimal.c:
        Remove #line directive: it messes up TAGS and it confuses gdb when debugging.
      dfb9e8ca
  6. 13 Jan, 2011 7 commits