1. 06 Jan, 2011 2 commits
  2. 05 Jan, 2011 7 commits
  3. 04 Jan, 2011 3 commits
    • Jon Olav Hauglid's avatar
      Merge from mysql-5.1 to mysql-5.5. · 44c18a8c
      Jon Olav Hauglid authored
      No conflicts.
      44c18a8c
    • Jon Olav Hauglid's avatar
      Bug #50619 assert in handler::update_auto_increment · 2bbc6f38
      Jon Olav Hauglid authored
      This assert could be triggered if -1 was inserted into
      an auto increment column by a statement writing more than
      one row.
      
      Unless explicitly given, an interval of auto increment values
      is generated when a statement first needs an auto increment
      value. The triggered assert checks that the auto increment
      counter is equal to or higher than the lower bound of this
      interval.
      
      Generally, the auto increment counter starts at 1 and is
      incremented by 1 each time it is used. However, inserting an
      explicit value into the auto increment column, sets the auto
      increment counter to this value + 1 if this value is higher
      than the current value of the auto increment counter.
      
      This bug was triggered if the explicit value was -1. Since the
      value was converted to unsigned before any comparisons were made,
      it was found to be higher than the current vale of the auto
      increment counter and the counter was set to -1 + 1. This value
      was below the reserved interval and caused the assert to be
      triggered the next time the statement tried to write a row.
      
      With the patch for Bug#39828, this bug is no longer repeatable.
      Now, -1 + 1 is detected as an "overflow" which causes the auto
      increment counter to be set to ULONGLONG_MAX. This avoids hitting
      the assert for the next insert and causes a new interval of
      auto increment values to be generated. This resolves the issue.
      
      This patch therefore only contains a regression test and no code
      changes. Test case added to auto_increment.test.
      2bbc6f38
    • Marc Alff's avatar
      Bug#59091 perfschema.binlog_mix and perfschema.binlog_row tests fail with openssl · 89490b87
      Marc Alff authored
      Fixed the test case to be independent of build options used.
      Removed the lowercase-table-names constraint, since performance schema tables are now in lowercase.
      89490b87
  4. 03 Jan, 2011 2 commits
  5. 31 Dec, 2010 2 commits
  6. 30 Dec, 2010 1 commit
  7. 29 Dec, 2010 8 commits
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.1. · 19fdd973
      Alexander Nozdrin authored
      19fdd973
    • Alexander Nozdrin's avatar
      Empty merge from mysql-5.0. · 664dd08e
      Alexander Nozdrin authored
      664dd08e
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.5-bugteam. · e2ca55a4
      Alexander Nozdrin authored
      e2ca55a4
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.1-bugteam. · 7983590d
      Alexander Nozdrin authored
      7983590d
    • Alexander Nozdrin's avatar
      Auto-merge from mysql-5.0-bugteam. · a218c24f
      Alexander Nozdrin authored
      a218c24f
    • unknown's avatar
      Bug #50914 mysqlbinlog not handling drop of current default database · 12ff0b38
      unknown authored
            
      mysqlbinlog only prints "use $database" statements to its output stream
      when the active default database changes between events. This will cause
      "No Database Selected" error when dropping and recreating that database.
            
      To fix the problem, we clear print_event_info->db when printing an event
      of CREATE/DROP/ALTER database statements, so that the Query_log_event
      after such statements will be printed with the use 'db' anyway except
      transaction keywords.
      
      
      mysql-test/r/mysqlbinlog.result:
        Test result for Bug#50914.
      mysql-test/t/mysqlbinlog.test:
        Added test to verify if the approach of the mysqlbinlog prints
        "use $database" statements to its output stream will cause
        "No Database Selected" error when dropping and recreating
        that database.
      sql/log_event.cc:
        Updated code to clear print_event_info->db when printing an event
        of CREATE/DROP/ALTER database statements, so that the Query_log_event
        after such statements will be printed with the use 'db' anyway except
        transaction keywords.
      12ff0b38
    • unknown's avatar
      Bug #50914 mysqlbinlog not handling drop of current default database · b15f216c
      unknown authored
      mysqlbinlog only prints "use $database" statements to its output stream
      when the active default database changes between events. This will cause
      "No Database Selected" error when dropping and recreating that database.
      
      To fix the problem, we clear print_event_info->db when printing an event
      of CREATE/DROP/ALTER database statements, so that the Query_log_event
      after such statements will be printed with the use 'db' anyway except
      transaction keywords.
      
      mysql-test/r/mysqlbinlog.result:
        Test result for Bug#50914.
      mysql-test/t/mysqlbinlog.test:
        Added test to verify if the approach of the mysqlbinlog prints
        "use $database" statements to its output stream will cause
        "No Database Selected" error when dropping and recreating
        that database.
      sql/log_event.cc:
        Updated code to clear print_event_info->db when printing an event
        of CREATE/DROP/ALTER database statements, so that the Query_log_event
        after such statements will be printed with the use 'db' anyway except
        transaction keywords.
      b15f216c
    • Kent Boortz's avatar
      Merge · fbf93ce4
      Kent Boortz authored
      fbf93ce4
  8. 28 Dec, 2010 2 commits
    • Kent Boortz's avatar
      Merge · bdd5d1ec
      Kent Boortz authored
      bdd5d1ec
    • Kent Boortz's avatar
      - Added/updated copyright headers · a1a90798
      Kent Boortz authored
      - Removed files specific to compiling on OS/2
      - Removed files specific to SCO Unix packaging
      - Removed "libmysqld/copyright", text is included in documentation
      - Removed LaTeX headers for NDB Doxygen documentation
      - Removed obsolete NDB files
      - Removed "mkisofs" binaries
      - Removed the "cvs2cl.pl" script
      - Changed a few GPL texts to use "program" instead of "library"
      a1a90798
  9. 24 Dec, 2010 2 commits
    • Sergey Glukhov's avatar
      5.1-bugteam->5.5-bugteam merge · a8425872
      Sergey Glukhov authored
      a8425872
    • Sergey Glukhov's avatar
      Bug#57810 case/when/then : Assertion failed: length || !scale · 86d448a9
      Sergey Glukhov authored
      ASSERT happens due to improper calculation of the max_length
      in Item_func_div object, if dividend has max_length == 0 then
      Item_func_div::max_length is set to 0 under some circumstances.
      The fix:
      If decimals == NOT_FIXED_DEC then set
      Item_func_div::max_length to max possible
      DOUBLE length value.
      
      
      mysql-test/r/func_math.result:
        test case
      mysql-test/t/func_math.test:
        test case
      sql/item_func.cc:
        The fix:
        If decimals == NOT_FIXED_DEC then set
        Item_func_div::max_length to max possible
        DOUBLE length value.
      86d448a9
  10. 21 Dec, 2010 11 commits
    • Anitha Gopi's avatar
      BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb... · 691bb650
      Anitha Gopi authored
      BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb suites. RQG uses MTR V1 and that still has these in the default suite. Removing these from V1. Also removing references to ndb tests in some more disabled.def files
      
      691bb650
    • Sergey Glukhov's avatar
      automerge · ab2f1fdc
      Sergey Glukhov authored
      ab2f1fdc
    • Sergey Glukhov's avatar
      test case fix · 18c28c47
      Sergey Glukhov authored
      18c28c47
    • Sven Sandberg's avatar
      BUG#59084: rpl_do_grant started to fail on FreeBSD (presumably after BUG#49978) · 165b3240
      Sven Sandberg authored
      Problem: master executed a statement that would fail on slave
      (namely, DROP USER 'create_rout_db'@'localhost').
      Then the test did:
        --let $rpl_only_running_threads= 1
        --source include/rpl_reset.inc
      rpl_reset.inc calls rpl_sync.inc, which first checks which of
      the threads are running and then syncs those threads that are
      running. If the SQL thread fails after the check, the sync will
      fail. So there was a race in the test and it failed on some
      slow hosts.
      Fix: Don't replicate the failing statement.
      165b3240
    • Tor Didriksen's avatar
      Bug #58699 cannot build with gcc dbg on solaris · b47a78d2
      Tor Didriksen authored
      
      cmake/os/SunOS.cmake:
        Remove TARGET_OS_SOLARIS
      config.h.cmake:
        Remove TARGET_OS_SOLARIS
        Add PTHREAD_ONCE_INITIALIZER
      configure.cmake:
        Add function for testing whether we need { PTHREAD_ONCE_INIT } rather than PTHREAD_ONCE_INIT
      include/my_pthread.h:
        Use PTHREAD_ONCE_INITIALIZER if set by cmake.
      include/mysql/psi/mysql_file.h:
        Include my_global.h first, to get correct platform definitions.
      mysys/ptr_cmp.c:
        Hide the unused static functions in #ifdef's on solaris.
        Use __sun (defined by both gcc and SunPro cc) rather than TARGET_OS_SOLARIS
      sql/my_decimal.cc:
        Include my_global.h first, to get correct platform definitions.
      sql/mysqld.cc:
        Fix signed/unsigned comparison warning.
      sql/sql_audit.h:
        Include my_global.h first, to get correct platform definitions.
      sql/sql_plugin.h:
        Include my_global.h first, to get correct platform definitions.
      sql/sql_show.cc:
        Fix: warning: cast from pointer to integer of different size
      sql/sys_vars.h:
        Use reinterpret_cast rather than c-style cast.
      storage/perfschema/pfs_instr.cc:
        Include my_global.h first, to get correct platform definitions.
      b47a78d2
    • Sergey Glukhov's avatar
      automerge · a397448b
      Sergey Glukhov authored
      a397448b
    • Sergey Glukhov's avatar
      automerge · 1ea65695
      Sergey Glukhov authored
      1ea65695
    • Sergey Glukhov's avatar
      5.1-bugteam->5.5-bugteam merge · f5753919
      Sergey Glukhov authored
      f5753919
    • Sven Sandberg's avatar
    • Sergey Glukhov's avatar
      5.1-bugteam->5.5-bugteam merge · 197e4b2f
      Sergey Glukhov authored
      197e4b2f
    • Sergey Glukhov's avatar
      Bug#58030 crash in Item_func_geometry_from_text::val_str · 8246b5a4
      Sergey Glukhov authored
      Item_sum_max/Item_sum_min incorrectly set null_value flag and
      attempt to get result in parent functions leads to crash.
      This happens due to double evaluation of the function argumet.
      First evaluation happens in the comparator and second one
      happens in Item_cache::cache_value().
      The fix is to introduce new Item_cache object which
      holds result of the argument and use this cached value
      as an argument of the comparator.
      
      mysql-test/r/func_group.result:
        test case
      mysql-test/t/func_group.test:
        test case
      sql/item.cc:
        added assertion that ether we have some result or result is NULL.
      sql/item_sum.cc:
        introduce new Item_cache object which
        holds result of the argument and use this cached value
        as an argument of the comparator.
      sql/item_sum.h:
        introduce new Item_cache object which
        holds result of the argument and use this cached value
        as an argument of the comparator.
      8246b5a4