An error occurred fetching the project authors.
  1. 01 Dec, 2007 1 commit
    • unknown's avatar
      Merge mysql.com:/misc/mysql/31177/50-31177 · 54ad7d88
      unknown authored
      into  mysql.com:/misc/mysql/31177/51-31177
      
      
      include/m_string.h:
        Auto merged
      include/my_getopt.h:
        Auto merged
      mysql-test/r/delayed.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/key_cache.result:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/type_bit_innodb.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      BitKeeper/deleted/.del-index_merge.result:
        Auto merged
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        manual merge
      client/mysql.cc:
        manual merge
      client/mysqltest.c:
        manual merge
      mysql-test/r/subselect.result:
        manual merge
      mysys/my_getopt.c:
        manual merge
      sql/mysqld.cc:
        manual merge
      54ad7d88
  2. 30 Nov, 2007 1 commit
    • unknown's avatar
      Bug#31177: Server variables can't be set to their current values · 89a20885
      unknown authored
      Default values of variables were not subject to upper/lower bounds
      and step, while setting variables was. Bounds and step are also
      applied to defaults now; defaults are corrected quietly, values
      given by the user are corrected, and a correction-warning is thrown
      as needed. Lastly, very large values could wrap around, starting
      from 0 again. They are bounded at the maximum value for the
      respective data-type now if no lower maximum is specified in the
      variable's definition.
      
      
      client/mysql.cc:
        correct maxima in options array
      client/mysqltest.c:
        adjust minimum for "sleep" option so default value is no longer
        out of bounds.
      include/m_string.h:
        ullstr() - the unsigned brother of llstr()
      include/my_getopt.h:
        Flag if we bounded the value (that is, correct anything aside from
        making value a multiple of block-size)
      mysql-test/r/delayed.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/index_merge.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/innodb.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/innodb_mysql.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/key_cache.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/packet.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/ps.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/subselect.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/type_bit.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/type_bit_innodb.result:
        We throw a warning now when we adjust out of range parameters.
      mysql-test/r/variables.result:
        correct results: bounds and step apply to variables' default values, too
      mysql-test/t/variables.test:
        correct results: bounds and step apply to variables' default values, too
      mysys/my_getopt.c:
        - apply bounds/step to default values of variables (based on work by serg)
        - print complaints about incorrect values for variables (truncation etc.,
          by requestion of consulting)
        - if no lower maximum is specified in variable definition, bound unsigned
          values at their maximum to prevent wrap-around
        - some calls to error_reporter had a \n, some didn't. remove \n from calls,
          let reporter-function handle it, so the default reporter behaves like that
          in mysqld
      sql/mysql_priv.h:
        correct RANGE_ALLOC_BLOCK_SIZE (cleared with monty)
      sql/mysqld.cc:
        correct maxima to correct data-type.
        correct minima where higher than default.
        correct range-alloc-block-size.
        correct inno variables so GET_* corresponds to actual variable's type.
      sql/set_var.cc:
        When the new value for a variable is out of bounds, we'll send the
        client a warning (but not if the value was simply not a multiple of
        'blocksize').  sys_var_thd_ulong had this, sys_var_long_ptr_global
        didn't; broken out and streamlined to avoid duplication of code.
      strings/llstr.c:
        ullstr() - the unsigned brother of llstr()
      89a20885
  3. 29 Oct, 2007 14 commits
    • unknown's avatar
      after merge fix · f97b8e48
      unknown authored
      f97b8e48
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 2b3e5606
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      2b3e5606
    • unknown's avatar
      Bug#30889: filesort and order by with float/numeric crashes server · 9e6bb07d
      unknown authored
      There are two problems with ROUND(X, D) on an exact numeric 
      (DECIMAL, NUMERIC type) field of a table:
      1) The implementation of the ROUND function would change the number of decimal
      places regardless of the value decided upon in fix_length_and_dec. When the
      number of decimal places is not constant, this would cause an inconsistent
      state where the number of digits was less than the number of decimal places,
      which crashes filesort.
      
      Fixed by not allowing the ROUND operation to add any more decimal places than
      was decided in fix_length_and_dec.
      
      2) fix_length_and_dec would allow the number of decimals to be greater than
      the maximium configured value for constant values of D. This led to the same 
      crash as in (1).
      
      Fixed by not allowing the above in fix_length_and_dec.
      
      
      mysql-test/r/type_decimal.result:
        Bug#30889: Test result
      mysql-test/t/type_decimal.test:
        Bug#30889: Test case
      sql/item_func.cc:
        Bug#30889: 
        - Avoid setting number of digits after decimal point (scale) higher than its 
          maximum value.
        - Avoid increasing the number of decimal places in ::decimal_op
      sql/item_func.h:
        Bug#30889: Added comments to the declarations of Item_func_numhybrid::<type>_op
        family of methods.
      9e6bb07d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 91ca02ad
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/func_gconcat.result:
        Auto merged
      mysql-test/t/func_gconcat.test:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      91ca02ad
    • unknown's avatar
      Bug#30897 GROUP_CONCAT returns extra comma on empty fields · d5b1d620
      unknown authored
      The fix is a copy of Martin Friebe's suggestion.
      added testing for no_appended which will be false if anything,
      including the empty string is in result
      
      
      mysql-test/r/func_gconcat.result:
        test result
      mysql-test/t/func_gconcat.test:
        test case
      sql/item_sum.cc:
        added testing for no_appended which will be False if anything,
        including the empty string is in result
      d5b1d620
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6b750312
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/information_schema.result:
        manual merge
      mysql-test/t/information_schema.test:
        manual merge
      6b750312
    • unknown's avatar
      backported test case from 5.1 · 95e66de2
      unknown authored
      95e66de2
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a056854e
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      a056854e
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 04eb31c6
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      sql/mysqld.cc:
        Null merge.
      04eb31c6
    • unknown's avatar
      25939026
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7d9c59b7
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      7d9c59b7
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 8a5f350f
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      8a5f350f
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131 · 33a8fdea
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      33a8fdea
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 · b52ab3bd
      unknown authored
      into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      b52ab3bd
  4. 28 Oct, 2007 1 commit
    • unknown's avatar
      Many files: · 849dec44
      unknown authored
        Error message numbers.
      
      
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
        Error message numbers.
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
        Error message numbers.
      mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
        Error message numbers.
      849dec44
  5. 27 Oct, 2007 7 commits
  6. 26 Oct, 2007 9 commits
    • unknown's avatar
      Many files: · 130f9b9f
      unknown authored
        Error message numbers.
      
      
      mysql-test/r/binlog_unsafe.result:
        Error message numbers.
      mysql-test/r/events_bugs.result:
        Error message numbers.
      mysql-test/r/events_trans.result:
        Error message numbers.
      mysql-test/r/sp_gis.result:
        Error message numbers.
      mysql-test/r/xml.result:
        Error message numbers.
      mysql-test/suite/rpl/r/rpl_incident.result:
        Error message numbers.
      mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
        Error message numbers.
      mysql-test/suite/rpl/r/rpl_udf.result:
        Error message numbers.
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
        Error message numbers.
      mysql-test/suite/ndb/r/ndb_dd_basic.result:
        Error message numbers.
      mysql-test/suite/ndb/r/ndb_dd_ddl.result:
        Error message numbers.
      mysql-test/suite/ndb/r/ndb_gis.result:
        Error message numbers.
      mysql-test/suite/ndb/r/ndb_row_format.result:
        Error message numbers.
      mysql-test/suite/ndb/r/ndb_single_user.result:
        Error message numbers.
      130f9b9f
    • unknown's avatar
      Fixed bug #31036: Using order by with archive table crashes server. · b9ecbb7e
      unknown authored
      1. Memory overrun have been fixed.
      2. Server failure on assertion has been fixed.
      
      
      storage/archive/azio.c:
        Fixed bug #31036.
        The ha_archive::rnd_pos function has been modified to take
        into account the result of the azseek function and
        to return HA_ERR_CRASHED_ON_USAGE in case of seek error.
      storage/archive/ha_archive.cc:
        Fixed bug #31036.
        1. Memory overrun has been fixed: maximal sizes of azio_stream::inbuf
           and azio_stream::outbuf was mixed.
        2. Zero value of the output parameter of the azread function was
           incorrectly interpreted by the azseek function: after the first
           successful read attempt the execution of the azseek loop was
           interrupted and negative value was returned.
           (See ha_archive::rnd_pos: that negative value was silently ignored,
           and an incomplete data was used, for example, as a size of a packed
           record, and server failed with the assertion:
           "row_len <= record_buffer->length".)
      mysql-test/t/archive.test:
        Added test case for bug #31036.
      mysql-test/r/archive.result:
        Added test case for bug #31036.
      b9ecbb7e
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 0e076d4b
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        Merge with 5.0-opt
      0e076d4b
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/PA/5.0-opt-31663 · 46b03c59
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.0-opt
      
      
      sql/sql_class.cc:
        Auto merged
      46b03c59
    • unknown's avatar
      Merge polly.(none):/home/kaa/src/opt/bug29131/my50-bug29131 · 07219e4d
      unknown authored
      into  polly.(none):/home/kaa/src/opt/bug29131/my51-bug29131
      
      
      mysql-test/r/variables.result:
        Null merge.
      mysql-test/t/variables.test:
        Null merge.
      sql/mysql_priv.h:
        Null merge.
      sql/mysqld.cc:
        Null merge.
      sql/set_var.cc:
        Null merge.
      sql/set_var.h:
        Null merge.
      07219e4d
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · efbc310a
      unknown authored
      into  mysql.com:/scratch/tnurnberg/31662/51-31662
      
      
      sql/sql_base.cc:
        Auto merged
      efbc310a
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · ca126a99
      unknown authored
      into  mysql.com:/misc/mysql/31662/50-31662
      
      
      sql/sql_base.cc:
        Auto merged
      ca126a99
    • unknown's avatar
      Merge mysql.com:/scratch/tnurnberg/31662/50-31662 · be4d0626
      unknown authored
      into  mysql.com:/scratch/tnurnberg/31662/51-31662
      
      
      mysql-test/r/information_schema_db.result:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      be4d0626
    • unknown's avatar
      Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump · 0e700e1e
      unknown authored
      SHOW FIELDS FROM a view with no valid definer was possible (since fix
      for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
      of such views being successful, but loading such a dump with the client
      failing. Patch allows SHOW FIELDS to give data-type of field in underlying
      table.
      
      
      mysql-test/r/information_schema_db.result:
        Fix test results: SHOW FIELDS FROM a view with no valid DEFINER
        gives us the field-type of the underlying table now rather than NULL.
      sql/sql_base.cc:
        In the case of SHOW FIELDS FROM <view>, do not require a valid
        DEFINER for determining underlying data-type like we usually do.
        This is needed for mysqldump.
      0e700e1e
  7. 25 Oct, 2007 4 commits
    • unknown's avatar
      Mimic a rename which Daniel already did in 6.0, · a71a829a
      unknown authored
      to get rid of a name clash among *deleted* files on case-insignificant file systems.
      
      
      BitKeeper/deleted/.del-changelog-bleh:
        Rename: BitKeeper/deleted/.del-changelog -> BitKeeper/deleted/.del-changelog-bleh
      a71a829a
    • unknown's avatar
      Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET · 974201c7
      unknown authored
      doesn't recognize it
        
      This is a 5.1 version of the patch.
        
      Problem:
        
      'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
      in SHOW VARIABLES, but could not be used in expressions like 
      "select @@log". Also, using them in the SET statement produced an 
      incorrect "unknown system variable" error.
        
      Solution:
      
      Since as of MySQL 5.1.12 one can enable or disable the general query log
      or the slow query log at runtime by changing values of
      general_log/slow_query_log, make 'log' and 'log_slow_queries" to be 
      synonyms for 'general_log' and 'slow_query_log' respectively.  This 
      makes expressions using the '@@var' syntax backward compatible with 
      5.0 and SHOW VARIABLES output to be consistent with the SET statement.
      
      
      mysql-test/r/log_state.result:
        Added a test case for bug #29131.
      mysql-test/t/log_state.test:
        Added a test case for bug #29131.
      sql/set_var.cc:
        Made the 'log' and 'log_slow_queries' system variables to be synonyms for 'general_log' and 'slow_query_log'.
      974201c7
    • unknown's avatar
      Fix for bug #29131: SHOW VARIABLES reports variable 'log' but SET · 6eced1b8
      unknown authored
      doesn't recognize it
      
      This is a 5.0 version of the patch, it will be null-merged to 5.1
      
      Problem:
      
      'log' and 'log_slow_queries' were "fixed" variables, i.e. they showed up
      in SHOW VARIABLES, but could not be used in expressions like 
      "select @@log". Also, using them in the SET statement produced an 
      incorrect "unknown system variable" error.
      
      Solution:
      
      Make 'log' and 'log_slow_queries' read-only dynamic variables to make 
      them available for use in expressions, and produce a correct error 
      about the variable being read-only when used in the SET statement.
      
      
      mysql-test/r/variables.result:
        Added a test case for bug #29131.
      mysql-test/t/variables.test:
        Added a test case for bug #29131.
      sql/mysql_priv.h:
        Changed the type of opt_log and opt_slow_log to my_bool to 
        align with the interfaces in set_var.cc
      sql/mysqld.cc:
        Changed the type of opt_log and opt_slow_log to my_bool to 
        align with the interfaces in set_var.cc
      sql/set_var.cc:
        Made 'log' and 'log_slow_queries' to be read-only dynamic system 
        variable, i.e. available for use in expressions with the @@var syntax.
      sql/set_var.h:
        Added a new system variable class representing a read-only boolean
        variable.
      6eced1b8
    • unknown's avatar
      Fixed bug #27695: View should not be allowed to have empty or · 04ff9d4d
      unknown authored
      all space column names.
      
      The parser has been modified to check VIEW column names
      with the check_column_name function and to report an error
      on empty and all space column names (same as for TABLE
      column names).
      
      
      sql/sql_yacc.yy:
        Fixed bug #27695.
        The parser has been modified to check VIEW column aliases
        with the check_column_name function and to report an error
        on empty columns and all space columns (same as for TABLE
        column names).
      mysql-test/t/select.test:
        Updated test case for bug #27695.
      mysql-test/r/select.result:
        Updated test case for bug #27695.
      04ff9d4d
  8. 24 Oct, 2007 3 commits
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt · ee8ab6d9
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.1-opt
      
      
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/opt_sum.cc:
        merge bug 30715 to 5.1-opt
      ee8ab6d9
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B30715-5.0-opt · e66f7e1d
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30715-merged-5.0-opt
      
      
      e66f7e1d
    • unknown's avatar
      Bug #30715: Assertion failed: item_field->field->real_maybe_null(), · e2433cbc
      unknown authored
        file .\opt_sum.cc, line
      The optimizer pre-calculates the MIN/MAX values for queries like
       SELECT MIN(kp_k) WHERE kp_1 = const AND ... AND kp_k-1 = const
      when there is a key over kp_1...kp_k
      In doing so it was not checking correctly nullability and 
      there was a superfluous assert(). 
      Fixed by making sure that the field can be null before checking and
      taking out the wrong assert().
      .
      Introduced a correct check for nullability 
      The MIN(field) can return NULL when all the row values in the group
      are NULL-able or if there were no rows.
      Fixed the assertion to reflect the case when there are no rows.
      
      
      mysql-test/r/func_group.result:
        Bug #30715: test case
      mysql-test/t/func_group.test:
        Bug #30715: test case
      sql/opt_sum.cc:
        Bug #30715: correct nullability check for MIN/MAX pre-calculation over index.
      e2433cbc