1. 22 Oct, 2009 1 commit
  2. 21 Oct, 2009 3 commits
    • Ramil Kalimullin's avatar
      Fix for bug#47019: Assertion failed: 0, file .\rt_mbr.c, · 5e3f89fd
      Ramil Kalimullin authored
      line 138 when forcing a spatial index
      
      Problem: "Spatial indexes can be involved in the search 
      for queries that use a function such as MBRContains() 
      or MBRWithin() in the WHERE clause".
      Using spatial indexes for JOINs with =, <=> etc.
      predicates is incorrect.
      
      Fix: disable spatial indexes for such queries.
      
      
      mysql-test/r/select.result:
        Fix for bug#47019: Assertion failed: 0, file .\rt_mbr.c, 
        line 138 when forcing a spatial index
          - test result.
      mysql-test/t/select.test:
        Fix for bug#47019: Assertion failed: 0, file .\rt_mbr.c, 
        line 138 when forcing a spatial index
          - test case.
      sql/sql_select.cc:
        Fix for bug#47019: Assertion failed: 0, file .\rt_mbr.c, 
        line 138 when forcing a spatial index
          - disable spatial indexes for queries which use 
        non-spatial conditions (e.g. NATURAL JOINs).
      5e3f89fd
    • Tatiana A. Nurnberg's avatar
      auto-merge · 5b5fc532
      Tatiana A. Nurnberg authored
      5b5fc532
    • Tatiana A. Nurnberg's avatar
      auto-merge · d689dda1
      Tatiana A. Nurnberg authored
      d689dda1
  3. 20 Oct, 2009 12 commits
    • Tatiana A. Nurnberg's avatar
      manual merge of 28141 · 6293dc7c
      Tatiana A. Nurnberg authored
      6293dc7c
    • Alexander Barkov's avatar
      A post fix for BUG#45645 Mysql server close all connection and restart using lower function · ed7be95b
      Alexander Barkov authored
      - Initialized caseinfo only if it is NULL
      ed7be95b
    • Kristofer Pettersson's avatar
      Automerge · a9ce3864
      Kristofer Pettersson authored
      a9ce3864
    • Satya B's avatar
      merge mysql-5.0-bugteam to mysql-5.1-bugteam · 8d647d5e
      Satya B authored
      8d647d5e
    • Satya B's avatar
      merge to mysql-5.0-bugteam · c5ab62b7
      Satya B authored
      c5ab62b7
    • Satya B's avatar
      merge mysql-5.0-bugteam to mysql-5.1-bugteam · bef64f0c
      Satya B authored
      bef64f0c
    • Kristofer Pettersson's avatar
      automerge · 34629198
      Kristofer Pettersson authored
      34629198
    • Satya B's avatar
      Fix for Bug #41597 - After rename of user, there are additional grants when · 15ddeb08
      Satya B authored
                           grants are reapplied.
      
      
      After renaming a user and trying to re-apply grants results in additional
      grants.
      
      This is because we use username as part of the key for GRANT_TABLE structure.
      When the user is renamed, we only change the username stored and the hash key
      still contains the old user name and this results in the extra privileges
      
      Fixed by rebuilding the hash key and updating the column_priv_hash structure
      when the user is renamed
      
      mysql-test/r/grant3.result:
        Bug #41597 - After rename of user, there are additional grants when 
                     grants are reapplied.
        
        Testcase for BUG#41597
      mysql-test/t/grant3.test:
        Bug #41597 - After rename of user, there are additional grants when 
                     grants are reapplied.
        
        Testcase for BUG#41597
      sql/sql_acl.cc:
        Bug #41597 - After rename of user, there are additional grants when 
                     grants are reapplied.
        
        Fixed handle_grant_struct() to update the hash key when the user is renamed.
        Added to set_user_details() method to GRANT_NAME class
      15ddeb08
    • Sergey Vojtovich's avatar
      Merge 5.1-bugteam -> 5.1-bugteam-local. · 138414c8
      Sergey Vojtovich authored
      138414c8
    • Sergey Vojtovich's avatar
      Merge 5.1-bugteam -> 5.1-bugteam-local. · ed3e32ea
      Sergey Vojtovich authored
      ed3e32ea
    • unknown's avatar
      Bug #34777 mysqlbinlog: --help output for --base64-output is hard to understand · 93cd66f4
      unknown authored
      There are some problems about help text:
      - It is stated that "auto" is the default twice. It need be stated only once.
      - It is stated that --base64-output is short for --base64-output=always. But that sounds
      like the default is "always", not "auto".
      
      Make the help text clear as following:
      Determine when the output statements should be base64-encoded BINLOG 
      statements: 'never' disables it and works only for binlogs without 
      row-based events; 'auto' prints base64 only when necessary (i.e., 
      for row-based events and format description events); 'always' prints 
      base64 whenever possible. 'always' is for debugging only and should 
      not be used in a production system. If this argument is not given, 
      the default is 'auto'; if it is given with no argument, 'always' is used.
      93cd66f4
    • Tatiana A. Nurnberg's avatar
      Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutdown) · 4ebfd532
      Tatiana A. Nurnberg authored
      If a thread is killed in the server, we throw "shutdown" only if one is actually in
      progress; otherwise, we throw "query interrupted".
      
      Control-C in the mysql command-line client is "incremental" now.
      First Control-C sends KILL QUERY (when connected to 5.0+ server, otherwise, see next)
      Next  Control-C sends KILL CONNECTION
      Next  Control-C aborts client.
      
      As the first two steps only pertain to an existing query,
      Control-C will abort the client right away if no query is running.
      
      client will give more detailed/consistent feedback on Control-C now.
      
      
      client/mysql.cc:
        Extends Control-C handling; enhances up feedback to user.
        
        On 5.0+ servers, we try to be nice and send KILL QUERY first
        if Control-C is pressed in the command-line client, but if
        that doesn't work, we now give the user the opportunity to
        send KILL CONNECTION with another Control-C (and to kill the
        client with another Control-C if that somehow doesn't work
        either).
      mysql-test/t/flush_read_lock_kill.test:
        we're getting correct "thread killed" rather than
        "in shutdown" error now
      mysql-test/t/kill.test:
        we're getting correct "thread killed" rather than
        "in shutdown" error now
      mysql-test/t/rpl000001.test:
        we're getting correct "thread killed" rather than
        "in shutdown" error now
      mysql-test/t/rpl_error_ignored_table.test:
        we're getting correct "thread killed" rather than
        "in shutdown" error now
      sql/records.cc:
        make error messages on KILL uniform for rr_*()
        by folding that handling into rr_handle_error()
      sql/sql_class.h:
        Only throw "shutdown" when we have one flagged as being in progress;
        otherwise, throw "query interrupted" as it's likely to be "KILL CONNECTION"
        or related.
      4ebfd532
  4. 19 Oct, 2009 6 commits
    • Alexander Barkov's avatar
      Bug#45645 Mysql server close all connection and restart using lower function · c0fa9695
      Alexander Barkov authored
      Problem: the "caseinfo" member of CHARSET_INFO structure was not
      initialized for user-defined Unicode collations, which made the
      server crash.
      Fix: initializing caseinfo properly.
      c0fa9695
    • Kristofer Pettersson's avatar
      Automerge · 53a37a51
      Kristofer Pettersson authored
      53a37a51
    • Kristofer Pettersson's avatar
      Automerge · 31791a82
      Kristofer Pettersson authored
      31791a82
    • Alexander Barkov's avatar
      Bug#43207 wrong LC_TIME names for romanian locale · 587b6787
      Alexander Barkov authored
      Adding tests for the bug.
      587b6787
    • Alexander Barkov's avatar
      Bug#43207 wrong LC_TIME names for romanian locale · a81e6cef
      Alexander Barkov authored
      A contributed patch by Andrei Boros (SCA signed).
      - Fixing locale definition file
      - Adding tests
      a81e6cef
    • Kristofer Pettersson's avatar
      Bug#47627 SET @@{global.session}.local_variable in stored routine causes crash · d2b9286f
      Kristofer Pettersson authored
      Adding @@session and @@global prefixes to a
      declared variable in a stored procedure the server
      would lead to a crash.
      
      The reason was that during the parsing of the
      syntactic rule 'option_value' an uninitialized
      set_var object was pushed to the parameter stack
      of the SET statement. The parent rule
      'option_type_value'  interpreted the existence of
      variables on the parameter stack as an assignment
      and wrapped it in a sp_instr_set object.
      
      As the procedure later was executed an attempt
      was made to run the method 'check()' on an
      uninitialized member object (NULL value) belonging
      to the previously created but uninitialized object.
      
      
      sql/sql_yacc.yy:
        * Assign the option_type at once since it is needed by the next
          parsing rule (internal_variable_name)
        * Rearranged the if statement to reduce negations and gain more
          clarity of code.
        * Added check for option_type to better detect if current
          variable is a SP local variable or a system variable.
      d2b9286f
  5. 18 Oct, 2009 1 commit
    • Ramil Kalimullin's avatar
      Fix for bug#47963: Wrong results when index is used · 910f43bb
      Ramil Kalimullin authored
      Problem: using null microsecond part in a WHERE condition 
      (e.g. WHERE date_time_field <= "YYYY-MM-DD HH:MM:SS.0000") 
      may lead to wrong results due to improper DATETIMEs 
      comparison in some cases.
      
      Fix: comparing DATETIMEs as strings we must trim trailing 0's
      in such cases.
      
      
      mysql-test/r/innodb_mysql.result:
        Fix for bug#47963: Wrong results when index is used
          - test result.
      mysql-test/t/innodb_mysql.test:
        Fix for bug#47963: Wrong results when index is used
          - test case.
      sql/item.cc:
        Fix for bug#47963: Wrong results when index is used
          - comparing DATETIMEs as strings we must trim trailing 0's in the 
        microsecond part to ensure
        'YYYY-MM-DD HH:MM:SS.000' == 'YYYY-MM-DD HH:MM:SS'
      910f43bb
  6. 16 Oct, 2009 16 commits
    • Alexey Kopytov's avatar
      Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN · 62007189
      Alexey Kopytov authored
       
      The problem was in incorrect handling of predicates involving 
      NULL as a constant value by the range optimizer. 
       
      For example, when creating a SEL_ARG node from a condition of 
      the form "field < const" (which would normally result in the 
      "NULL < field < const" SEL_ARG),  the special case when "const" 
      is NULL was not taken into account, so "NULL < field < NULL" 
      was produced for the "field < NULL" condition. 
       
      As a result, SEL_ARG structures of this form could not be 
      further optimized which in turn could lead to incorrectly 
      constructed SEL_ARG trees. In particular, code assuming SEL_ARG 
      structures to always form a sequence of ordered disjoint 
      intervals could enter an infinite loop under some 
      circumstances. 
       
      Fixed by changing get_mm_leaf() so that for any sargable 
      predicate except "<=>" involving NULL as a constant, "empty" 
      SEL_ARG is returned, since such a predicate is always false. 
      
      mysql-test/r/partition_pruning.result:
        Fixed a broken test case.
      mysql-test/r/range.result:
        Added a test case for bug #47123.
      mysql-test/r/subselect.result:
        Fixed a broken test cases.
      mysql-test/t/range.test:
        Added a test case for bug #47123.
      sql/opt_range.cc:
        Fixed get_mm_leaf() so that for any sargable
        predicate except "<=>" involving NULL as a constant, "empty"
        SEL_ARG is returned, since such a predicate is always false.
      62007189
    • Joerg Bruehe's avatar
      f7831d7c
    • Joerg Bruehe's avatar
      Upmerge a merge changeset. · bad7108e
      Joerg Bruehe authored
      bad7108e
    • Joerg Bruehe's avatar
      Upmerge merge changesets. · ed7a74be
      Joerg Bruehe authored
      ed7a74be
    • Joerg Bruehe's avatar
      Merge a compile fix. · 8bb87c0d
      Joerg Bruehe authored
      8bb87c0d
    • Georgi Kodinov's avatar
      merge · d02ac8cc
      Georgi Kodinov authored
      d02ac8cc
    • Joerg Bruehe's avatar
      90871e02
    • Joerg Bruehe's avatar
      15612306
    • Joerg Bruehe's avatar
      4c51ee51
    • Joerg Bruehe's avatar
      d4cb54c7
    • Joerg Bruehe's avatar
      Compile fix for Windows: · 789bc510
      Joerg Bruehe authored
      Use "#ifdef", not plain "#if".
      789bc510
    • Martin Hansson's avatar
      Bug#46019: ERROR 1356 When selecting from within another · 8ac7c311
      Martin Hansson authored
                  view that has Group By
            
      When SELECT'ing from a view that mentions another,
      materialized, view, access was being denied. The issue was
      resolved by lifting a special case which avoided such access
      checking in check_single_table_access. In the past, this was
      necessary since if such a check were performed, the error
      message would be downgraded to a warning in the case of SHOW
      CREATE VIEW. The downgrading of errors was meant to handle
      only that scenario, but could not distinguish the two as it
      read only the error messages.
            
      The special case was needed in the fix of bug no 36086.
      Before that, views were confused with derived tables.
            
      After bug no 35996 was fixed, the manipulation of errors
      during SHOW CREATE VIEW execution is not dependent on the
      actual error messages in the queue, it rather looks at the
      actual cause of the error and takes appropriate
      action. Hence the aforementioned special case is now
      superfluous and the bug is fixed.
      
      
      mysql-test/r/view_grant.result:
        Bug#46019: Test result.
      mysql-test/t/view_grant.test:
        Bug#46019: Test case.
      sql/sql_parse.cc:
        Bug#46019: fix.
      8ac7c311
    • Georgi Kodinov's avatar
      Bug #40877: multi statement execution fails in 5.1.30 · 9c6668d6
      Georgi Kodinov authored
            
      Implemented the server infrastructure for the fix:
      
      1. Added a function LEX_STRING *thd_query_string(THD) to return
      a LEX_STRING structure instead of char *.
      This is the function that must be called in innodb instead of 
      thd_query()
      
      2. Did some encapsulation in THD : aggregated thd_query and 
      thd_query_length into a LEX_STRING and made accessor and mutator 
      methods for easy code updating. 
      
      3. Updated the server code to use the new methods where applicable.
      9c6668d6
    • Joerg Bruehe's avatar
      494623ab
    • Georgi Kodinov's avatar
      merge · 2605f94a
      Georgi Kodinov authored
      2605f94a
    • Georgi Kodinov's avatar
  7. 15 Oct, 2009 1 commit