1. 20 Nov, 2009 3 commits
    • Konstantin Osipov's avatar
      Merge with next-mr · 34b11fb6
      Konstantin Osipov authored
      34b11fb6
    • Martin Hansson's avatar
      merge of Bug#33204 (backport) · 3937a798
      Martin Hansson authored
      3937a798
    • Mattias Jonsson's avatar
      Bug#32115: Bad use of Name_resolution_context from current LEX in partitioning · d8d8efc8
      Mattias Jonsson authored
      port from mysql-next (5.4?) to mysql-next-mr-bugfixes (5.5/5.6?)
      
      3477 Mikael Ronstrom	2009-07-29
      Bug#32115, made use of local lex object to avoid side effects of opening partitioned
      tables
      
      3478 Mikael Ronstrom	2009-07-29
      Bug#32115, added an extra test in debug builds to ensure no dangling pointers to the
      old lex object is still around
      
      3479 Mikael Ronstrom	2009-07-29
      Bug#32115, Removed an assert that was no longer needed
      
      3480 Mikael Ronstrom	2009-08-05
      Bug#32115, fixed review comments
      
      3481 Mikael Ronstrom	2009-08-07
      Bug#32115, remove now obsolete lex_start calls
      d8d8efc8
  2. 19 Nov, 2009 2 commits
  3. 18 Nov, 2009 1 commit
    • Guilhem Bichot's avatar
      Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same... · 27fca0ab
      Guilhem Bichot authored
      Backport of the fix for BUG#40368 "mysqld_safe not honouring underscore same as dash on server options" from 6.0
      (revision-id:guilhem@mysql.com-20090505113602-l12kxupeatve18dh).
      Such bug led "mysqld_safe --core_file_size=#" to not work because mysqld_safe wouldn't recognize
      that "ulimit -c" is needed; only --core-file-size=# worked. Same for --open_files_limit and other
      options with _ where mysqld_safe needs to do something more than passing to mysqld.
      Original fix by Erik Ljungstrom erik at ibiblio dot org ; slightly modified here.
      Tested on all internally accessible Unix.
      27fca0ab
  4. 17 Nov, 2009 3 commits
  5. 15 Nov, 2009 1 commit
  6. 13 Nov, 2009 1 commit
    • Davi Arnaut's avatar
      Post-merge fixes for backports. · 5128b54c
      Davi Arnaut authored
      mysql-test/r/sp-error.result:
        Update test case result.
      mysql-test/t/dirty_close.test:
        Dirty close does not work under embedded.
      mysql-test/t/sp-error.test:
        Use the specific error number so it won't catch
        other non-fatal errors.
      5128b54c
  7. 12 Nov, 2009 10 commits
  8. 11 Nov, 2009 13 commits
  9. 10 Nov, 2009 6 commits
    • Alexey Botchkov's avatar
      Bug #47139 Test "merge" crashes in "embedded" run · c868e89f
      Alexey Botchkov authored
        In fact this crashes in normal (not embedded) run also.
        The problem is in the memory mapping. Handling the ha_myisammrg::extra(MMAP)
        the MERGE engine tries to mmap all the tables it unites.
        Though some can be empty and then in the mi_dynmap_file()
        we call the my_mmap(0). Normally this call returns MAP_FAILED,
        but not on FreeBSD. There it returns like a 'normal' value,
        and after the consequitive munmap systems gets unstable and
        crashes on some system call later.
      
      per-file comments:
        storage/myisam/mi_dynrec.c
      Bug #47139      Test "merge" crashes in "embedded" run
          don't try to mmap zero-length area, just return at once.
      c868e89f
    • Alexey Botchkov's avatar
      Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8 · 6388a132
      Alexey Botchkov authored
         The additional patch. That 'loadxml.test' failure was actually about our testing system,
         not the code.
         Firstly we need a new mysqltest command, wich i called 'send_eval'. So the expression
         can be evaluated, then started in a parallel thread. We only have separane 'send' and
         'eval' commands at the moment.
         Then we need to add the waiting code after the 'KILL' to our test, so the thread will be killed
         before the test goes further. The present 'reap' command doesn't handle the killed threads
         well.
            
      per-file comments:
        client/mysqltest.cc
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
          The 'send_eval' command implemented.
      
        mysql-test/r/loadxml.result
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
         test result updated.
      
        mysql-test/t/loadxml.test
      Bug#42520      killing load .. infile Assertion failed: ! is_set(), file .\sql_error.cc, line 8
         test case added.
      6388a132
    • Davi Arnaut's avatar
      Backport of Bug#45767 to mysql-next-mr · 891dffa3
      Davi Arnaut authored
      ------------------------------------------------------------
      revno: 3405
      revision-id: davi.arnaut@sun.com-20090626124624-m4wolyo5193j4cu7
      parent: luis.soares@sun.com-20090626113019-1j4mn1jos480u9f3
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: mysql-pe
      timestamp: Fri 2009-06-26 09:46:24 -0300
      message:
        Bug#45767: deprecate/remove Field::pack_key, Field::unpack_key, Field::pack_cmp
        
        Remove unused and dead code.
        
        Parts of the patch contributed by Zardosht Kasheff
      891dffa3
    • Davi Arnaut's avatar
      Backport of Bug#27249 to mysql-next-mr · ff847056
      Davi Arnaut authored
      ------------------------------------------------------------
      revno: 2476.784.4
      revision-id: sp1r-davi@moksha.local-20071008114751-46069
      parent: sp1r-davi@moksha.local-20071003002731-48537
      committer: davi@moksha.local
      timestamp: Mon 2007-10-08 08:47:51 -0300
      message:
        Bug#27249 table_wild with alias: select t1.* as something
      
        Aliases to table wildcards are silently ignored, but they should
        not be allowed as it is non-standard and currently useless. There
        is not point in having a alias to a wildcard of column names.
      
        The solution is to rewrite the select_item rule so that aliases
        for table wildcards are not accepted.
      
        Contribution by Martin Friebe
      
      mysql-test/r/alias.result:
        Add test case result for Bug#27249
      mysql-test/t/alias.test:
        Add test case for Bug#27249
      sql/sql_yacc.yy:
        Split up select_item rule so that aliases for table wildcards
        are not accepted by the parser.
      ff847056
    • Davi Arnaut's avatar
      Backport of Bug#15192 to mysql-next-mr · e879919a
      Davi Arnaut authored
      ------------------------------------------------------------
      revno: 2597.4.17
      revision-id: sp1r-davi@mysql.com/endora.local-20080328174753-24337
      parent: sp1r-anozdrin/alik@quad.opbmk-20080328140038-16479
      committer: davi@mysql.com/endora.local
      timestamp: Fri 2008-03-28 14:47:53 -0300
      message:
        Bug#15192 "fatal errors" are caught by handlers in stored procedures
      
        The problem is that fatal errors (e.g.: out of memory) were being
        caught by stored procedure exception handlers which could cause
        the execution to not be stopped due to a continue handler.
      
        The solution is to not call any exception handler if the error is
        fatal and send the fatal error to the client.
      
      mysql-test/r/sp-error.result:
        Add test case result for Bug#15192
      mysql-test/t/sp-error.test:
        Add test case for Bug#15192
      mysys/my_alloc.c:
        Pass flag to signal fatal error in memory root allocations.
      sql/event_data_objects.cc:
        Use init_sql_alloc to initialize memory roots, which uses
        the sql error handler to push errors.
      sql/ha_partition.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/item_func.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/item_subselect.cc:
        Remove redundant fatal error, memory root already pushes error.
      sql/opt_sum.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sp_head.cc:
        Allocator already sets fatal error.
      sql/sql_class.h:
        A error must exist for it to be fatal. Pass flag to signal fatal
        error instead of calling fatal_error.
      sql/sql_insert.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_list.h:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_parse.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_partition.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_select.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_servers.cc:
        Use init_sql_alloc to initialize memory roots, which uses
        the sql error handler to push errors.
      sql/sql_show.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/sql_trigger.cc:
        Use init_sql_alloc to initialize memory roots, which uses
        the sql error handler to push errors.
      sql/sql_update.cc:
        Pass flag to signal fatal error instead of calling fatal_error.
      sql/tztime.cc:
        Use init_sql_alloc to initialize memory roots, which uses
        the sql error handler to push errors.
      e879919a
    • Davi Arnaut's avatar
      Backport of Bug#41860 to mysql-next-mr · 17871ade
      Davi Arnaut authored
      ------------------------------------------------------------
      revno: 3317
      revision-id: davi.arnaut@sun.com-20090522170916-fzc5ca3tjs9roy1t
      parent: patrick.crews@sun.com-20090522152933-ole8s3suy4zqyvku
      committer: Davi Arnaut <Davi.Arnaut@Sun.COM>
      branch nick: 41860-6.0
      timestamp: Fri 2009-05-22 14:09:16 -0300
      message:
        Bug#41860: Without Windows named pipe
      
        The problem was that the patch for Bug#10374 broke named pipe
        and shared memory transports on Windows due to a failure to
        implement a dummy poll method for transports other than BSD
        sockets. Another problem was that mysqltest lacked support
        for named pipe and shared memory connections, which lead to
        misleading test cases that were supposed run common queries
        over both transports.
      
        The solution is to properly implement, at the VIO layer, the
        poll and is_connected methods. The is_connected method is
        implemented for every suppported transport and the poll one
        only where it makes sense. Furthermore, support for named pipe
        and shared memory connections is added to mysqltest as to
        enable testing of both transports using the test suite.
      
      client/mysqltest.cc:
        Add support for named pipe and shared memory connections.
      include/violite.h:
        Move private functions to vio/vio_priv.h
        Add poll_read and is_connected methods.
      mysql-test/t/named_pipe.test:
        Run tests over a named pipe connection.
      mysql-test/t/shm.test:
        Run tests over a shared memory connection.
      sql/item_func.cc:
        Rename method.
      sql/sql_class.cc:
        Remove higher-level vio_is_connected implementation.
      sql/sql_class.h:
        Rename vio_is_connected to not conflict with the vio one.
        Verify that there is a valid vio.
      vio/vio.c:
        Add poll_read and is_connected methods.
      vio/vio_priv.h:
        Add private functions.
      vio/viosocket.c:
        Implement the is_connected method for the various transports.
      17871ade