1. 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
  2. 13 Jan, 2011 9 commits
  3. 12 Jan, 2011 2 commits
    • Bjorn Munch's avatar
      merge from 5.1-mtr · 7def3081
      Bjorn Munch authored
      7def3081
    • Davi Arnaut's avatar
      Bug#42054: SELECT CURDATE() is returning bad value · 7ba98a4a
      Davi Arnaut authored
      The problem from a user point of view was that on Solaris the
      time related functions (e.g. NOW(), SYSDATE(), etc) would always
      return a fixed time.
      
      This bug was happening due to a logic in the time retrieving
      wrapper function which would only call the time() function every
      half second. This interval between calls would be calculated
      using the gethrtime() and the logic relied on the fact that time
      returned by it is monotonic.
      
      Unfortunately, due to bugs in the gethrtime() implementation,
      there are some cases where the time returned by it can drift
      (See Solaris bug id 6600939), potentially causing the interval
      calculation logic to fail.
      
      Since newer versions of Solaris (10+) have alleviated the
      performance degradation associated with time(2), the solution is
      to simply directly rely on time() at each invocation.
      
      This simplification has an upside that it allows us to eliminate
      a lock which was used to control access to the variables used
      to track the half second interval, thus improving the overall
      scalability of timekeeping related functions (e.g. NOW()).
      
      Benchmarks runs have shown no significant degradation associated
      with this change. With this, there are actually improvements in
      performance for cases involving many connections.
      
      In summary, the changes introduced by this patch are:
      
      a) my_time() and my_micro_time_and_time() no longer use gethrtime().
         Instead, time() and gettimeofdate() are used correspondingly.
      
      b) my_micro_time() is changed to not use gethrtime() so as to
         have the same time source as my_micro_time_and_time().
         There shouldn't be any performance impact from this change
         since this function is used only a few times during statement
         execution and, on Solaris, gettimeofday() shows acceptable
         performance.
      
      mysys/my_getsystime.c:
        Use time() even if gethrtime() is available. Remove logic which
        relied on gethrtime() to only call time() every half second.
        Since gethrtime() is not used anymore, also remove it from
        my_micro_time() to keep a common time source.
        
        Also, function comments are cleaned up (fixed typos and wrong
        information) and converted to doxygen.
      mysys/my_thr_init.c:
        Remove mutex which is no longer used.
      mysys/mysys_priv.h:
        Remove mutex which is no longer used.
      7ba98a4a
  4. 13 Jan, 2011 6 commits
    • Ole John Aske's avatar
      Fix for #58422: Incorrect result when OUTER JOIN'ing with an empty table. · e3cd0582
      Ole John Aske authored
      Fixed incorrect checks in join_read_const_table() for when to 
      accept a non-existing, or empty const-row as a part of the const'ified 
      set of tables.
            
      Intention of this test is to only accept NULL-rows if this table is outer joined
      into the resultset. (In case of an inner-join we can conclude at this point that 
      resultset will be empty, end we want to return 'error' to signal this.)
            
      Initially 'maybe_null' is set to the same value as 'outer_join' in 
      setup_table_map(), mysql_priv.h ~line 2424. Later simplify_joins() will
      attemp to replace outer joins by inner join whenever possible. This
      will cause 'outer_join' to be updated. However, 'maybe_null' is *not* updated
      to reflect this rewrite as this field is used to currectly set the 'nullability'
      property for the columns in the resultset.
            
      We should therefore change join_read_const_table() to check the 'outer_join'
      property instead of 'maybe_null', as this correctly reflect the nullability of
      the *execution plan* (not *resultset*).
      e3cd0582
    • Nirbhay Choubey's avatar
      Merging from mysql-5.1. · d5950254
      Nirbhay Choubey authored
      d5950254
    • Ole John Aske's avatar
      Fix for bug#58134: 'Incorrectly condition pushdown inside subquery to NDB engine' · a4663115
      Ole John Aske authored
      An incorrect 'table_map' containing both the table itself, 
      and possible any outer-refs if this was the last table in 
      the subquery, was presented to make_cond_for_table().
            
      As a pushed condition is only able to refer column from the table
      the condition is pushed to, nothing else than columns from the
      table itself (tab->table->map) may be refered in the pushed condition
      constructed by 'push_cond= make_cond_for_table()'. 
            
      Also fix a minor 'copy and paste' bug in a comment 
      inside make_cond_for_table().
      
      No testcase is possible on mainbranch as the NDB engine is not available (yet)
      on mysql >= 5.5
      a4663115
    • Georgi Kodinov's avatar
      null merge of the version bumps. · d4198e24
      Georgi Kodinov authored
      d4198e24
    • Ole John Aske's avatar
      Fix for Bug#57034 incorrect OUTER JOIN result when joined on unique key · 8abae5c6
      Ole John Aske authored
      Item_equal::val_int() checked for NULL-values by checking Item::null_value
      *before* the respective ::store_value() and ::cmp(Item*) metods where called.
      
      As Item::null_value is set by these metods, the value of 'null_value' 
      is not valid until *after* ::store_value() or ::cmp() has
      been called for the Item object.
            
      Fix is to swap order of ::store_value()/::cmp() and checking of Item::null_value.
      This pattern is widely used other places inside item_cmpfunc.cc .
      
      8abae5c6
    • Martin Hansson's avatar
      Merge of fix for Bug#58165. · e25ee9e7
      Martin Hansson authored
      e25ee9e7
  5. 12 Jan, 2011 10 commits
    • Bjorn Munch's avatar
      null upmerge · d09a6f58
      Bjorn Munch authored
      d09a6f58
    • Bjorn Munch's avatar
      merge from 5.5-mtr · 61a1dc97
      Bjorn Munch authored
      61a1dc97
    • Luis Soares's avatar
      BUG#59177: mysqlbinlog_row_big fails on Windows with out of memory · 86f4bcd4
      Luis Soares authored
            
      The test case fails with out of memory while updating a table
      with several multi-megabytes sized rows. This can probably be too
      exhausting for PB2 env.
            
      The quick fix here is to reduce the size of the biggest
      row (256MB) so that it becomes a little smaller (64MB).
      86f4bcd4
    • Luis Soares's avatar
      BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runs · c0de0932
      Luis Soares authored
      The test started failing on the same day patch for BUG 49978 was
      pushed. BUG 49978 changed part of the replication testing
      infrastructure in mysql-test-run. This caused the test to fail
      sporadically with result differences on relay log file
      names. When the test fails the relay-log filenames are shifted by
      one, eg:
      
      -show relaylog events in 'slave-relay-bin.000002' from <binlog_start>;
      +show relaylog events in 'slave-relay-bin.000003' from <binlog_start>;
      
      The problem was caused by a bad cleanup when using the include
      files:
      
        - include/setup_fake_relay_log.inc
        - include/cleanup_fake_relay_log.inc
      
      Which would leave a spurious relay-log file around (not listed in
      slave-relay-bin.index), causing the server to shift the name of
      the relay logs by one, even if cleaning up with RESET SLAVE.
      
      We fix this by removing the relay-log file when it is not needed
      anymore, ie at setup time and after recreating the fake relay-log
      index.
      
      Additionally, to make the affected test more resilient, we
      deployed a call to rpl_reset.inc (which resets both master and
      slave, including log files) before actually running the test
      case.
      
      Finally, appart from the reported bug, we also fix: (a) an
      unrelated issue with the failing test itself - in some cases, the
      test was not setting the log file name to use when it should; 
      (b) one typo.
      
      mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc:
        Added call to rpl_reset.inc.
        Deployed missing instructions to get the binlog file name 
        before including show_relaylog/binlog_events.inc
      c0de0932
    • Evgeny Potemkin's avatar
      Auto-merge. · 7d2c7748
      Evgeny Potemkin authored
      7d2c7748
    • Bjorn Munch's avatar
      null upmerge · 31ecfd7d
      Bjorn Munch authored
      31ecfd7d
    • Bjorn Munch's avatar
      merge from 5.5 main · 45594d4b
      Bjorn Munch authored
      45594d4b
    • Bjorn Munch's avatar
      merge from 5.1 · c144d37f
      Bjorn Munch authored
      c144d37f
    • Dmitry Lenev's avatar
      Merged fix for bug #58499 "DEFINER-security view selecting from · 511a494c
      Dmitry Lenev authored
      INVOKER-security view access check wrong" into mysql-5.5 tree.
      511a494c
    • Bjorn Munch's avatar
      Bug #58841 Generalise handling of plugins in MTR mysql-test-run.pl script · 6d93b1e3
      Bjorn Munch authored
      Follow-up fix: mtr died if trying to run semisync test w/o the plugin
      6d93b1e3