1. 03 Oct, 2008 4 commits
    • Andrei Elkin's avatar
      merge with the main 5.1-bugteam · 0e2681e9
      Andrei Elkin authored
      0e2681e9
    • Davi Arnaut's avatar
      Bug#37481: status.test fails randomly · 5fcb4607
      Davi Arnaut authored
      The problem was that the test was trying to obtain a lock on
      a table in one connection without ensuring that a insert which
      was executed in another connection had released the lock on the
      same table.
      
      The solution is to add a dummy select query after the insert to
      ensure that the table is unlocked and closed by the time it tries
      to lock it again. This is enough to prevent test failures described
      in the bug report. As an extra safety measure, concurrent inserts
      are disabled.
      
      Remove comments that calculated the Table_locks_immediate. This
      value is not tested anymore and it's calculation did not reflect
      the actual value.
      
      mysql-test/r/status.result:
        Update test case result.
      mysql-test/t/status.test:
        Issue a dummy select to ensure that tables are unlocked after a
        insert and disable concurrent inserts as a extra-safety.
      5fcb4607
    • Davi Arnaut's avatar
      Wrap function used for debugging with the DBUG_OFF condition. · 1c453040
      Davi Arnaut authored
      Function uses a variable only available under debug mode.
      1c453040
    • Andrei Elkin's avatar
      Bug #28786 binlog_killed.test fails: 'reset master' does not reset binlogging · 66aa0210
      Andrei Elkin authored
      The test failed originally -- did not reset binlogging - for the reason
      identified by bug@15580.
      However it never can be run on the embedded platfrom for yet another cause -
      the embedded can not KILL query.
            
      Comments added to the test particularly relating `reset master'
      to the mentioned bug.
      
      mysql-test/suite/binlog/t/binlog_killed.test:
        adding commets explaining why the test has to have include/not_embedded.inc guard.
      66aa0210
  2. 02 Oct, 2008 10 commits
    • Davi Arnaut's avatar
      Merge from main branch. · 323c82e9
      Davi Arnaut authored
      323c82e9
    • Davi Arnaut's avatar
      Remove usage of the _db_strict_keyword_ in favor of the more reliable · 5c4af956
      Davi Arnaut authored
      DBUG_EXECUTE_IF macro. The usage of the former caused breakage in other
      trees as it got removed from the dbug library.
      
      sql/sql_base.cc:
        Rework code to remove unreliable usage of _db_script_keyword_.
      5c4af956
    • Vladislav Vaintroub's avatar
      merge fix for 38629 from 5.0 · 753eff2a
      Vladislav Vaintroub authored
      753eff2a
    • Vladislav Vaintroub's avatar
      merge · 73aced2f
      Vladislav Vaintroub authored
      73aced2f
    • Vladislav Vaintroub's avatar
      Bug #38629 · 0d7ec55b
      Vladislav Vaintroub authored
      mysql-test-run.pl --start-and-exit starts but does not exit
      Instead, it hangs with ActiveState perl. The error is
      believed to be a bug in ActiveState implementation.
      Workaround is using POSIX::_exit, as described here
      http://www.perlmonks.org/?node_id=334610
      
      Thanks to Philip Stoev for the idea of the patch.
      0d7ec55b
    • Sergey Glukhov's avatar
      5.0->5.1 bugteam merge · de175698
      Sergey Glukhov authored
      mysql-test/r/create.result:
        automerge
      mysql-test/t/create.test:
        automerge
      sql/mysql_priv.h:
        manual merge
      sql/sql_parse.cc:
        manual merge
      sql/sql_yacc.yy:
        manual merge
      de175698
    • Sergey Glukhov's avatar
      Bug#35924 DEFINER should be stored 'quoted' in I_S · fe51a7ce
      Sergey Glukhov authored
      The '@' symbol can not be used in the host name according to rfc952.
      The fix:
      added function check_host_name(LEX_STRING *str)
      which checks that all symbols in host name string are valid and
      host name length is not more than max host name length
      (just moved check_string_length() function from the parser into check_host_name()).
      
      
      mysql-test/r/create.result:
        test result
      mysql-test/t/create.test:
        test case
      sql/mysql_priv.h:
        added function check_host_name(LEX_STRING *str)
      sql/sql_parse.cc:
        added function check_host_name(LEX_STRING *str)
        which checks that all symbols in host name string are valid and
        host name length is not more than max host name length(HOSTNAME_LENGTH).
      sql/sql_yacc.yy:
        using newly added function check_host_name()
      fe51a7ce
    • Sergey Glukhov's avatar
      automerge · 46dee896
      Sergey Glukhov authored
      46dee896
    • Sergey Glukhov's avatar
      automerge · 00a80f06
      Sergey Glukhov authored
      00a80f06
    • Sergey Glukhov's avatar
      Bug#22763 Disrepancy between SHOW CREATE VIEW and I_S.VIEWS · 7c67be63
      Sergey Glukhov authored
      The problem:
      I_S views table does not check the presence of SHOW_VIEW_ACL|SELECT_ACL
      privileges for a view. It leads to discrepancy between SHOW CREATE VIEW
      and I_S.VIEWS.
      The fix:
      added appropriate check.
      
      
      mysql-test/r/information_schema_db.result:
        test result
      mysql-test/t/information_schema_db.test:
        test case
      sql/sql_show.cc:
        The problem:
        I_S views table does not check the presence of SHOW_VIEW_ACL|SELECT_ACL
        privileges for a view. It leads to discrepancy between SHOW CREATE VIEW
        and I_S.VIEWS.
        The fix:
        added appropriate check.
      7c67be63
  3. 01 Oct, 2008 17 commits
    • Ingo Struewing's avatar
      merge · 7abc96fb
      Ingo Struewing authored
      7abc96fb
    • Georgi Kodinov's avatar
      8bea469c
    • Georgi Kodinov's avatar
      Bug#37943: Reproducible mysqld crash/sigsegv in sel_trees_can_be_ored · 73be5f95
      Georgi Kodinov authored
                  
      When analyzing the possible index use cases the server was re-using an internal structure.
      This is wrong, as this internal structure gets updated during the analysis.
      Fixed by making a copy of the internal structure for every place it needs to be used.
      Also stopped the generation of empty SEL_TREE structures that unnecessary 
      complicate the analysis.
      
      mysql-test/r/index_merge.result:
        Bug#37943: test case
      mysql-test/t/index_merge.test:
        Bug#37943: test case
      sql/opt_range.cc:
        Bug#37943: 
         - Make copy constructors for SEL_TREE and sub-structures and use them when OR-ing trees.
         - don't generate empty SEL_TREEs. Return NULL instead.
      73be5f95
    • Ingo Struewing's avatar
      merge · 4737a081
      Ingo Struewing authored
      4737a081
    • Sven Sandberg's avatar
      BUG#38269: pushbuild gives valgrind error in ha_statistic_increment for rpl_temporary · da4cc11b
      Sven Sandberg authored
      Re-enabling failing test case because server logs were lost in pushbuild, so we need to run it again.
      
      
      mysql-test/suite/rpl/t/disabled.def:
        Re-enabling failing test case because server logs were lost in pushbuild, so we need to run it again.
      da4cc11b
    • Georgi Kodinov's avatar
      5721d2d9
    • Georgi Kodinov's avatar
    • Ingo Struewing's avatar
      merge · 8e488336
      Ingo Struewing authored
      8e488336
    • Ingo Struewing's avatar
      Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine. · a85379af
      Ingo Struewing authored
      This patch contains fixes for two problems:
      
      1. As originally reported, the server crashed on Mac OS X when trying to access
         an EXAMPLE table after the EXAMPLE plugin was installed.
      
         It turned out that the dynamically loaded EXAMPLE plugin called the
         function hash_earch() from a Mac OS X system library, instead of
         hash_earch() from MySQL's mysys library. Makefile.am in storage/example
         does not include libmysys. So the Mac OS X linker arranged the hash_search()
         function to be linked to the system library when the shared object is
         loaded.
      
         One possible solution would be to include libmysys into the linkage of
         dynamic plugins. But then we must have a libmysys.so, which must be
         used by the server too. This could have a minimal performance impact,
         but foremost the change seems to bee too risky at the current state of
         MySQL 5.1.
      
         The selected solution is to rename MySQL's hash_search() to my_hash_search()
         like it has been done before with hash_insert() and hash_reset().
      
         Since this is the third time, we need to rename a hash_*() function,
         I did renamed all hash_*() functions to my_hash_*().
      
         To avoid changing a zillion calls to these functions, and announcing
         this to hundreds of developers, I added defines that map the old names
         to the new names.
      
         This change is in hash.h and hash.c.
      
      2. The other problem was improper implementation of the handlerton-to-plugin
         mapping. We use a fixed-size array to hold a plugin reference for each
         handlerton. On every install of a handler plugin, we allocated a new slot
         of the array. On uninstall we did not free it. After some uninstall/install
         cycles the array overflowed. We did not check for overflow.
      
         One fix is to check for overflow to stop the crashes.
      
         Another fix is to free the array slot at uninstall and search for a free slot
         at plugin install.
      
         This change is in handler.cc.
      
      
      
      include/hash.h:
        Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine.
        Renamed hash_*() functions to my_hash_*().
        Added defines that map old names to new names.
      mysys/hash.c:
        Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine.
        Renamed hash_*() functions to my_hash_*().
      sql/handler.cc:
        Bug#37958 - test main.plugin crash on Mac OS X when selecting from EXAMPLE engine.
        Protect against a failing ha_initialize_handlerton() in ha_finalize_handlerton().
        Free hton2plugin slot on uninstall of a handler plugin.
        Reuse freed slost of the hton2plugin array.
        Protect against array overrun.
      a85379af
    • Georgi Kodinov's avatar
      38d8ea5c
    • Georgi Kodinov's avatar
      merged 5.0-bugteam -> 5.1-bugteam · f0124682
      Georgi Kodinov authored
      f0124682
    • Georgi Kodinov's avatar
      merged 5.1-5.1.29-rc -> 5.1-bugteam · adf60749
      Georgi Kodinov authored
      adf60749
    • Georgi Kodinov's avatar
      fixed a wrong directory in distinct.test · fbb331c2
      Georgi Kodinov authored
      fbb331c2
    • Georgi Kodinov's avatar
      merged 5.0-main -> 5.0-bugteam · e2a3b58c
      Georgi Kodinov authored
      e2a3b58c
    • Georgi Kodinov's avatar
      merged 5.0-5.1.29-rc into 5.0-bugteam · 9fa56ec7
      Georgi Kodinov authored
      9fa56ec7
    • Patrick Crews's avatar
      automerge · 69d926ce
      Patrick Crews authored
      69d926ce
    • Patrick Crews's avatar
      Bug#38311 Some tests use 'rm' which is not portable · 6e554e16
      Patrick Crews authored
      Repush of change to fix tests on Pushbuild.
      6e554e16
  4. 30 Sep, 2008 9 commits
    • Davi Arnaut's avatar
      Merge from main branch. · 90acf5e2
      Davi Arnaut authored
      90acf5e2
    • Davi Arnaut's avatar
      Bug#38727: BUILD/compile-solaris-* scripts should compile MySQL with libmtmalloc · 63fada64
      Davi Arnaut authored
      Link with mtmalloc on Solaris as it is done in our release builds.
      Replace deprecated flag with the newer option as already done in
      other scripts.
      
      BUILD/compile-solaris-amd64-forte:
        Link to mtmalloc and replace deprecated flag.
      BUILD/compile-solaris-amd64-forte-debug:
        Replace deprecated flag.
      BUILD/compile-solaris-sparc:
        Link to mtmalloc.
      BUILD/compile-solaris-sparc-forte:
        Link to mtmalloc
      63fada64
    • Patrick Crews's avatar
      automerge · d662efe9
      Patrick Crews authored
      d662efe9
    • Patrick Crews's avatar
      Merge 5.0 -> 5.1 · 05cef245
      Patrick Crews authored
      05cef245
    • Patrick Crews's avatar
      Automerge · e217dd78
      Patrick Crews authored
      e217dd78
    • Davi Arnaut's avatar
      Bug#34306: Can't make copy of log tables when server binary log is enabled · 7ca8a7fb
      Davi Arnaut authored
      Post-merge bug fix: lock_type is a enumeration type and not a bit mask.
      
      sql/sql_cache.cc:
        Check for lock type explicitly. Also err on the safe side and
        invalidate the query cache for any write lock.
      7ca8a7fb
    • Gleb Shchepa's avatar
      manual merge 5.0-bugteam --> 5.1-bugteam · 98e81c01
      Gleb Shchepa authored
      98e81c01
    • Gleb Shchepa's avatar
      Fixed bug #17823: 'arc' directories inside database directories. · 18876585
      Gleb Shchepa authored
      Server created "arc" directories inside database directories and
      maintained there useless copies of .frm files.
      
      Creation and renaming procedures of those copies as well as
      creation of "arc" directories has been discontinued.
      Removal procedure has been kept untouched to be able to
      cleanup existent database directories by the DROP DATABASE
      query. Also view renaming procedure has been updated to remove
      these directories.
      
      
      sql/parse_file.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        View/table creation and renaming procedures maintained
        backup copies of .frm files. Those copies are unused yet,
        so this feature was incomplete and unnecessary.
        
        1. Unwanted code has been hidden by FRM_ARCHIVE ifdefs
        (the FRM_ARCHIVE macro is not defined).
        
        2. Renaming procedure has been modified to remove obsolete
        "arc" directories.
      sql/parse_file.h:
        Fixed bug #17823: 'arc' directories inside database directories.
        The "thd" parameter has been added to the rename_in_schema_file()
        function.
      sql/sql_db.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Scope of the mysql_rm_arc_files() function has been changed to
        global for use from the parse_file.cc file.
      sql/sql_view.cc:
        Fixed bug #17823: 'arc' directories inside database directories.
        Added the "thd" argument to rename_in_schema_file() calls.
      18876585
    • Alexey Botchkov's avatar
      merging · 1f970c8b
      Alexey Botchkov authored
      1f970c8b