1. 04 Jul, 2007 1 commit
    • unknown's avatar
      A fix and a teset case for Bug#28551 The warning · d30d026e
      unknown authored
      'No database selected' is reported when calling stored procedures
      
      Remove the offending warning introduced by the fix for Bug
      25082
      This minimal patch relies on the intrinsic knowledge of the fact that
      mysql_change_db is never called with 'force_switch' set to TRUE
      when such a warning may be needed:
       * every stored routine belongs to a database (unlike, e.g., a 
      user defined function, which does not), so if we're activating the
      database of a stored routine, it can never be NULL.
      Therefore, this branch is never called for activation.
       * if we're restoring the 'old' current database after routine
      execution is complete, we should not issue a warning, since it's OK to 
      call a routine without having previously selected the current database.
      
      TODO: 'force_switch' is an ambiguous flag, since we do not actually
      have to 'force' the switch in case of stored routines at all.
      When we activate the routine's database, we should perform
      all the checks as in case of 'use db', and so we already do (in this
      case 'force_switch' is unused).
      When we load a routine into cache, we should not use mysql_change_db
      at all, since there it's enough to call thd->reset_db(). We
      do it this way for triggers, but code for routines is different (wrongly). 
      
      TODO: bugs are lurking in replication, since it bypasses mysql_change_db
      and calls thd->[re_]set_db to set the current database.
      The latter does not change thd->db_charset, thd->sctx->db_access
      and thd->variables.collation_database (and this may have nasty side
      effects).
      
      These todo items are to be addressed in a separate patch, if at all.
      
      
      mysql-test/r/sp.result:
        Update results (Bug#28551)
      mysql-test/t/sp.test:
        Add a test case (Bug#28551)
      sql/sp.cc:
        Remove an obsolete comment.
        Replace a check with an assert.
      sql/sql_db.cc:
        Remove the offending warning introduced by the fix for Bug
        25082
        This minimal patch relies on the intrinsic knowledge of the fact that
        mysql_change_db is never called with 'force_switch' set to TRUE
        when such a warning may be needed.
      d30d026e
  2. 01 Jul, 2007 2 commits
  3. 30 Jun, 2007 1 commit
  4. 29 Jun, 2007 9 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29205 · 1f866bcf
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      1f866bcf
    • unknown's avatar
      Fixed bug #29205. · bf7a9ad2
      unknown authored
      When a UNION statement forced conversion of an UTF8
      charset value to a binary charset value, the byte
      length of the result values was truncated to the
      CHAR_LENGTH of the original UTF8 value.
      
      
      sql/item.cc:
        Fixed bug #29205.
        The calculation of data length was modified in
        the Item_type_holder::join_types method to take into
        account possible conversion of a multibyte charset
        value to a binary charset value, when each
        multibyte character is converted into a sequence
        of bytes (not to a single byte of binary charset).
      mysql-test/t/ctype_utf8.test:
        Updated test case for bug #29205.
      mysql-test/r/ctype_utf8.result:
        Updated test case for bug #29205.
      bf7a9ad2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 49ab98f9
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/29261-bug-5.0-opt-mysql
      
      49ab98f9
    • unknown's avatar
      Bug#29261: Sort order of the collation wasn't used when comparing trailing · 80824e67
      unknown authored
      spaces.
      
      When the my_strnncollsp_simple function compares two strings and one is a prefix
      of another then this function compares characters in the rest of longer key
      with the space character to find whether the longer key is greater or less.
      But the sort order of the collation isn't used in this comparison. This may
      lead to a wrong comparison result, wrongly created index or wrong order of the
      result set of a query with the ORDER BY clause.
      
      Now the my_strnncollsp_simple function uses collation sort order to compare
      the characters in the rest of longer key with the space character.
      
      
      mysql-test/t/ctype_collate.test:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      mysql-test/r/ctype_collate.result:
        Added a test case for the bug#29261: Sort order of the collation wasn't used
        when comparing trailing spaces.
      strings/ctype-simple.c:
        Bug#29261: Sort order of the collation wasn't used when comparing trailing
        spaces.
        Now the my_strnncollsp_simple function uses collation sort order to compare
        the characters in the rest of longer key with the space character.
      80824e67
    • unknown's avatar
      Update result files. · f66a2726
      unknown authored
      
      mysql-test/r/ps_6bdb.result:
        Update result file.
      mysql-test/r/ps_7ndb.result:
        Update result file.
      f66a2726
    • unknown's avatar
      Follow up to the patch for the BUG#10491. · 7e5e42b3
      unknown authored
      
      mysql-test/r/ps_1general.result:
        Update result file.
      mysql-test/r/ps_2myisam.result:
        Update result file.
      mysql-test/r/ps_3innodb.result:
        Update result file.
      mysql-test/r/ps_4heap.result:
        Update result file.
      mysql-test/r/ps_5merge.result:
        Update result file.
      tests/mysql_client_test.c:
        Fix test -- after field changing character set to utf8 in the server,
        length should be calculated differently.
      7e5e42b3
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b01a04eb
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B27333-gcov-5.0-opt
      
      b01a04eb
    • unknown's avatar
      Bug#27333: subquery grouped for aggregate of outer · 7d6c4d8d
      unknown authored
      query / no aggregate of subquery
       The optimizer counts the aggregate functions that 
       appear as top level expressions (in all_fields) in 
       the current subquery. Later it makes a list of these
       that it uses to actually execute the aggregates in
       end_send_group().
       That count is used in several places as a flag whether
       there are aggregates functions.
       While collecting the above info it must not consider
       aggregates that are not aggregated in the current 
       context. It must treat them as normal expressions 
       instead. Not doing that leads to incorrect data about
       the query, e.g. running a query that actually has no
       aggregate functions as if it has some (and hence is
       expected to return only one row).
       Fixed by ignoring the aggregates that are not aggregated
       in the current context. 
       One other smaller omission discovered and fixed in the 
       process : the place of aggregation was not calculated for
       user defined functions. Fixed by calling 
       Item_sum::init_sum_func_check() and 
       Item_sum::check_sum_func() as it's done for the rest of 
       the aggregate functions.
      
      
      mysql-test/r/subselect.result:
        Bug #27333: test case
      mysql-test/t/subselect.test:
        Bug #27333: test case
      sql/item_subselect.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.cc:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      sql/item_sum.h:
        Bug#27333: calculate the place of 
         aggregation for user defined functions.
      sql/sql_select.cc:
        Bug#27333: When counting the aggregated functions
         and collecting a list of them we must not consider
         the aggregates that are not aggregated in the local
         context as "local" : i.e. we must treat them as 
         normal functions and not add them to the aggregate
         functions list.
      sql/sql_select.h:
        Bug#27333: need select_lex to filter out
         aggregates that are not aggregated in
         the current select.
      7d6c4d8d
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · d71167d6
      unknown authored
      into  mysql.com:/home/hf/work/29247/my50-29247
      
      
      sql-common/client.c:
        Auto merged
      d71167d6
  5. 28 Jun, 2007 2 commits
    • unknown's avatar
      Fix for BUG#10491: Server returns data as charset binary · 003f416f
      unknown authored
      SHOW CREATE TABLE or SELECT FROM I_S.
      
      Actually, the bug discovers two problems:
        - the original query is not preserved properly. This is the problem
          of BUG#16291;
        - the resultset of SHOW CREATE TABLE statement is binary.
      
      This patch fixes the second problem for the 5.0.
      
      Both problems will be fixed in 5.1.
      
      
      mysql-test/r/show_check.result:
        Update result file.
      mysql-test/t/show_check.test:
        Provide test case for BUG#10491.
      sql/item.h:
        Use utf8_general_ci instead of binary collation by default,
        because for views and base tables utf8 is the character set
        in which their definition is stored. For system constants
        it's the default character set, and for other objects
        (routines, triggers), no character set is stored, and
        therefore no character set is known, so returning utf8
        is just as good as any non-binary character set.
        This latter problem is fixed in 5.1 by 16291. In 5.1
        we will return the "real" character set.
      003f416f
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a8e2767
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B26642-5.0-opt
      
      8a8e2767
  6. 27 Jun, 2007 3 commits
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · 900a42f7
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
      
      900a42f7
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ea771d52
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug28677
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      ea771d52
    • unknown's avatar
      Bug #26642: create index corrupts table definition in .frm · 8f16be87
      unknown authored
        
        Thanks to Martin Friebe for finding and submitting a fix for this bug!
        
        A table with maximum number of key segments and maximum length key name
        would have a corrupted .frm file, due to an incorrect calculation of the
        complete key length.  Now the key length is computed correctly (I hope) :-)
        
        MyISAM would reject a table with the maximum number of keys and the maximum
        number of key segments in all keys.  It would allow one less than this total
        maximum.  Now MyISAM accepts a table defined with the maximum.  (This is a
        very minor issue.)
      
      
      myisam/mi_open.c:
        Bug #26642: change >= to > in a comparison (i.e., error 
        only if key_parts_in_table really is greater than 
        MAX_KEY * MAX_KEY_SEG)
      mysql-test/r/create.result:
        Bug #26642: test case
      mysql-test/t/create.test:
        Bug #26642: test case
      sql/table.cc:
        Bug #26642: In create_frm(), fix formula for key_length; 
        it was too small by (keys * 2) bytes
      8f16be87
  7. 26 Jun, 2007 4 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 17562e96
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29087
      
      17562e96
    • unknown's avatar
      Fixed bug #29251. · 5e0349cc
      unknown authored
      Sometimes special 0 ENUM values was ALTERed to normal
      empty string ENUM values.
      
      Special 0 ENUM value has the same string representation
      as normal ENUM value defined as '' (empty string).
      The do_field_string function was used to convert
      ENUM data at an ALTER TABLE request, but this
      function doesn't care about numerical "indices" of
      ENUM values, i.e. do_field_string doesn't distinguish
      a special 0 value from an empty string value.
      
      A new copy function called do_field_enum has been added to
      copy special 0 ENUM values without conversion to an empty
      string.
      
      
      sql/field_conv.cc:
        Fixed bug #29251.
        The Copy_field::get_copy_func method has been modified to
        return a pointer to the do_field_enum function if a conversion
        between two columns of incompatible enum types is required.
        The do_field_enum function has been added for the correct
        conversion of special 0 enum values.
      mysql-test/t/type_enum.test:
        Updated test case for bug #29251.
      mysql-test/r/type_enum.result:
        Updated test case for bug #29251.
      5e0349cc
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 06b672c7
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      06b672c7
    • unknown's avatar
      Fixed bug #29087. This bug manifested itself for queries that performed · b24e8e16
      unknown authored
      a lookup into a BINARY index by a key ended with spaces. It caused
      an assertion abort for a debug version and wrong results for non-debug
      versions.
      
      The problem occurred because the function _mi_pack_key stripped off 
      the trailing spaces from binary search keys while the function _mi_make_key
      did not do it when keys were inserted into the index.
      
      Now the function _mi_pack_key does not remove the trailing spaces from
      search keys if they are of the binary type.
      
      
      mysql-test/r/binary.result:
        Added a test case for bug #29087.
      mysql-test/t/binary.test:
        Added a test case for bug #29087.
      b24e8e16
  8. 25 Jun, 2007 7 commits
    • unknown's avatar
      Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · ae72c1ef
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
      
      
      sql/sql_yacc.yy:
        Auto merged
      ae72c1ef
    • unknown's avatar
      Bug #29247 Double free in libmysqlclient_r when mysql restarted. · 021622bf
      unknown authored
      If one sets MYSQL_READ_DEFAULTS_FILE and MYSQL_READ_DEFAULT_GROUP options
      after mysql_real_connect() called with that MYSQL instance,
      these options will affect next mysql_reconnect then.
      As we use a copy of the original MYSQL object inside mysql_reconnect,
      and mysql_real_connect frees options.my_cnf_file and _group strings,
      we will free these twice when we execute mysql_reconnect with the
      same MYSQL for the second time.
      
      I don't think we should ever read defaults files handling mysql_reconnect.
      So i just set them to 0 for the temporary MYSQL object there/
      
      
      sql-common/client.c:
        Bug #29247 Double free in libmysqlclient_r when mysql restarted.
        
        we don't need mysql_real_connect to reread defaults file in this
        case, so set related parameters to zero
      021622bf
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 30f5af6f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      30f5af6f
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 4380493d
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      4380493d
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1 · 7d8a30f5
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/4.1-opt
      
      7d8a30f5
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2a67ba23
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B29154-5.0-opt
      
      2a67ba23
    • unknown's avatar
      Bug #29154: LOCK TABLES is not atomic when >1 InnoDB tables are locked · 6a1657ae
      unknown authored
        LOCK TABLES takes a list of tables to lock. It may lock several 
        tables successfully and then encounter a tables that it can't lock, 
        e.g. because it's locked. In such case it needs to undo the locks on
        the already locked tables. And it does that. But it has also notified
        the relevant table storage engine handlers that they should lock.
        The only reliable way to ensure that the table handlers will give up
        their locks is to end the transaction. This is what UNLOCK TABLE 
        does : it ends the transaction if there were locked tables by LOCK 
        tables.
        It is possible to end the transaction when the lock fails in 
        LOCK TABLES because LOCK TABLES ends the transaction at its start 
        already. 
        Fixed by ending (again) the transaction when LOCK TABLES fails to
        lock a table.
      
      
      mysql-test/r/innodb_mysql.result:
        Bug #29154: test case
      mysql-test/t/innodb_mysql.test:
        Bug #29154: test case
      sql/sql_parse.cc:
        Bug #29154: end the trasaction at a failing 
        LOCK TABLES so the handler can free its locks.
      6a1657ae
  9. 24 Jun, 2007 3 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 683a1119
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug25602
      
      
      sql/sql_select.cc:
        Auto merged
      683a1119
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0 · 98646c96
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/log_event.cc:
        Auto merged
      98646c96
    • unknown's avatar
      Fixed bug #25602. A query with DISTINCT in the select list to which · 09e2b603
      unknown authored
      the loose scan optimization for grouping queries was applied returned 
      a wrong result set when the query was used with the SQL_BIG_RESULT
      option.
      
      The SQL_BIG_RESULT option forces to use sorting algorithm for grouping
      queries instead of employing a suitable index. The current loose scan
      optimization is applied only for one table queries when the suitable
      index is covering. It does not make sense to use sort algorithm in this
      case. However the create_sort_index function does not take into account
      the possible choice of the loose scan to implement the DISTINCT operator
      which makes sorting unnecessary. Moreover the current implementation of
      the loose scan for queries with distinct assumes that sorting will
      never happen. Thus in this case create_sort_index should not call
      the function filesort.
      
      
      mysql-test/r/group_min_max.result:
        Added a test case for bug #25602.
      mysql-test/t/group_min_max.test:
        Added a test case for bug #25602.
      09e2b603
  10. 23 Jun, 2007 3 commits
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/4.1-opt · 6688a54f
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      6688a54f
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29095 · e45576ac
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      e45576ac
    • unknown's avatar
      Fixed bug #29095. · e7778b65
      unknown authored
      INSERT into table from SELECT from the same table
      with ORDER BY and LIMIT was inserting other data
      than sole SELECT ... ORDER BY ... LIMIT returns.
      
      One part of the patch for bug #9676 improperly pushed
      LIMIT to temporary table in the presence of the ORDER BY
      clause.
      That part has been removed.
      
      
      sql/sql_select.cc:
        Fixed bug #29095.
        One part of the patch for bug #9676 improperly pushed
        LIMIT to temporary table in the presence of the ORDER BY
        clause.
        That part has been removed.
      mysql-test/t/insert_select.test:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      mysql-test/r/insert_select.result:
        Expanded the test case for bug #9676.
        Created a test case for bug #29095.
      e7778b65
  11. 22 Jun, 2007 5 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 77825106
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      77825106
    • unknown's avatar
      Add the "nist" suite to the "test-bt" target, · 21905996
      unknown authored
      to be run only if it is available on the machine.
      
      21905996
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846 · a8117ebe
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      a8117ebe
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9f368072
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28400-5.0-opt
      
      9f368072
    • unknown's avatar
      Bug #27383: Crash in test "mysql_client_test" · 0200ffc7
      unknown authored
      The C optimizer may decide that data access operations
      through pointer of different type are not related to 
      the original data (strict aliasing).
      This is what happens in fetch_long_with_conversion(),
      when called as part of mysql_stmt_fetch() : it tries 
      to check for truncation errors by first storing float
      (and other types of data) into a char * buffer and then 
      accesses them through a float pointer.
      This is done to prevent the effects of excess precision
      when using FPU registers.
      However the doublestore() macro converts a double pointer
      to an union pointer. This violates the strict aliasing rule.
      Fixed by making the intermediary variables volatile (
      to not re-introduce the excess precision bug) and using
      the intermediary value instead of the char * buffer.
      Note that there can be loss of precision for both signed
      and unsigned 64 bit integers converted to double and back,
      so the check must stay there (even for compatibility 
      reasons).
      Based on the excellent analysis in bug 28400.
      
      
      libmysql/libmysql.c:
        Bug #27383: avoid pointer aliasing problems while 
        not re-violating the Intel FPU gcc bug.
      0200ffc7