An error occurred fetching the project authors.
  1. 27 Feb, 2008 3 commits
    • unknown's avatar
      merging · 4a8c442f
      unknown authored
      4a8c442f
    • unknown's avatar
      Merge mysql.com:/home/hf/work/25097/my50-25097 · 33c43019
      unknown authored
      into  mysql.com:/home/hf/work/25097/my51-25097
      
      
      client/mysql.cc:
        Auto merged
      include/sql_common.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql-common/client.c:
        merging
      sql/log.cc:
        merging
      33c43019
    • unknown's avatar
      Bug #25097 mysql_server_init fails silently if no errmsg.sys is present. · a4b0a2cf
      unknown authored
      There was no way to return an error from the client library
      if no MYSQL connections was established.
      So here i added variables to store that king of errors and
      made functions like mysql_error(NULL) to return these.
      
      
      client/mysql.cc:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        Show the error message on std_error
      include/sql_common.h:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        cant_connect_sqlstate constant declared
      libmysql/libmysql.c:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        mysql_sqlstate(NULL) returns 'unknown_sqlstate'
      libmysqld/lib_sql.cc:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        EMBEDDED_SERVER version of the vprint_msg_to_log() implemented
      sql-common/client.c:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        mysql_server_last_errno and mysql_server_last_error introduced
        to store errors not related to particular connections.
        
        mysql_error(NULL) and mysql_errno(NULL) now returns these
        mysql_server_last_error and errno respectively
      sql/log.cc:
        Bug #25097 mysql_server_init fails silently if no errmsg.sys is present.
        
        EMBEDDED_LIBRARY implementation of the vprint_msg_to_log() moved
        to lib_sql.cc
      a4b0a2cf
  2. 01 Feb, 2008 2 commits
    • unknown's avatar
      Merge mbp.local:/Users/kaa/src/opt/bug25162/my50-bug25162 · 78e19d42
      unknown authored
      into  mbp.local:/Users/kaa/src/opt/bug25162/my51-bug25162
      
      
      mysql-test/t/create.test:
        Auto merged
      sql/sql_yacc.yy:
        Null merge.
      mysql-test/r/create.result:
        Manual merge.
      78e19d42
    • unknown's avatar
      Fix for bug #25162: Backing up DB from 5.1 adds 'USING BTREE' to KEYs · 4d794c23
      unknown authored
                          on table creates
      
      The problem was in incompatible syntax for key definition in CREATE
      TABLE.
      
      5.0 supports only the following syntax for key definition (see "CREATE
      TABLE syntax" in the manual):
      
      {INDEX|KEY} [index_name] [index_type] (index_col_name,...)
      
      While 5.1 parser supports the above syntax, the "preferred" syntax was
      changed to:
      
      {INDEX|KEY} [index_name] (index_col_name,...) [index_type]
      
      The above syntax is used in 5.1 for the SHOW CREATE TABLE output, which
      led to dumps generated by 5.1 being incompatible with 5.0.
      
      Fixed by changing the parser in 5.0 to support both 5.0 and 5.1 syntax
      for key definition.
      
      
      mysql-test/r/create.result:
        Added a test case for bug #25162.
      mysql-test/t/create.test:
        Added a test case for bug #25162.
      sql/sql_yacc.yy:
        Changed the parser to support both 5.0 and 5.1 syntax for index type
        specification in CREATE TABLE.
      4d794c23
  3. 20 Jan, 2008 2 commits
  4. 19 Jan, 2008 2 commits
    • unknown's avatar
      Post-merge fixes. · 80857e0d
      unknown authored
      mysql-test/r/group_by.result:
        Post-merge fix after merging 5.0-opt to 5.1-opt.
      mysql-test/t/disabled.def:
        Disabled innodb_mysql back, bug #32724 is still not fixed.
      80857e0d
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 153771ed
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/r/type_decimal.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/type_decimal.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/t/group_by.test:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      mysql-test/t/view.test:
        Manual merge.
      153771ed
  5. 18 Jan, 2008 2 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 35b035cf
      unknown authored
      into  lamia.dupka:/home/mhansson/my50-bug33143-again-pushee
      
      
      35b035cf
    • unknown's avatar
      BUG#33794 "MySQL crashes executing specific query": · c71a6428
      unknown authored
      The problem occurred when one had a subquery that had an equality X=Y where 
      Y referred to a named select list expression from the parent select. MySQL 
      crashed when trying to use the X=Y equality for ref-based access. 
      
      Fixed by allowing non-Item_field items in the described case.
      
      
      mysql-test/r/subselect.result:
        BUG#33794 "MySQL crashes executing specific query"
        - Testcase
      mysql-test/t/subselect.test:
        BUG#33794 "MySQL crashes executing specific query"
        - Testcase
      sql/sql_select.cc:
        BUG#33794 "MySQL crashes executing specific query"
        get_store_key() assumed that if it got a reference
          t.key=Item_outer_ref(Item_direct_ref(x)) 
        then x was an Item_field object, which is not the case when one refers to a
        named select list expression out ot subquery.
      c71a6428
  6. 17 Jan, 2008 3 commits
  7. 14 Jan, 2008 1 commit
    • unknown's avatar
      Bug#33143: Incorrect ORDER BY for ROUND()/TRUNCATE() result · f9440588
      unknown authored
      The ROUND(X, D) function would change the Item::decimals field during
      execution to achieve the effect of a dynamic number of decimal digits.
      This caused a series of bugs:
      Bug #30617:Round() function not working under some circumstances in InnoDB
      Bug #33402:ROUND with decimal and non-constant cannot round to 0 decimal places
      Bug #30889:filesort and order by with float/numeric crashes server
      Fixed by never changing the number of shown digits for DECIMAL when
      used with a nonconstant number of decimal digits.
      
      
      mysql-test/r/type_decimal.result:
        Bug#33143: Test result
      mysql-test/t/type_decimal.test:
        Bug#33143: Test case
      sql/item_func.cc:
        Bug#33143: 
        - Moved the DECIMAL_MAX_SCALE limitation to fix_length_and_dec.
        - Removed resetting of Item::decimals field.
        - set the frac field of the output value to current scale.
      strings/decimal.c:
        Bug#33143: It is necessary to set all digits in the buffer following the 
        rounded one to zero, as they may now be displayed.
      f9440588
  8. 12 Jan, 2008 1 commit
  9. 11 Jan, 2008 10 commits
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · a034c714
      unknown authored
      into  lamia.dupka:/home/mhansson/my51-bug31797-pushee
      
      
      a034c714
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · c37689f1
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797-pushee
      
      
      mysql-test/r/group_by.result:
        Auto merged
      mysql-test/t/group_by.test:
        Auto merged
      sql/item.cc:
        Auto merged
      c37689f1
    • unknown's avatar
      Merge linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797 · ab0f3e46
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug31797/my51-bug31797
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/group_by.result:
        Bug#31797: Manual merge
      mysql-test/t/group_by.test:
        Bug#31797: Manual merge
      ab0f3e46
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.1-opt · 4ddfa7ba
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697
      
      
      mysql-test/t/disabled.def:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      4ddfa7ba
    • unknown's avatar
      Fixed bug #33697. · d8363a40
      unknown authored
      When the function test_if_skip_sort_order prefers index backward scan 
      to ref access the corresponding access functions must be set accordingly.
      
      
      mysql-test/include/mix1.inc:
        Added a test case for bug #33697.
        Corrected one previous bad merge.
      mysql-test/r/innodb_mysql.result:
        Added a test case for bug #33697.
      mysql-test/t/disabled.def:
        Turned innodb_mysql test on.
      d8363a40
    • unknown's avatar
      Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 7bd7e988
      unknown authored
      into  linux-st28.site:/home/martin/mysql/src/bug31797/my50-bug31797-pushee
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/group_by.result:
        Bug#31797: Manual merge
      mysql-test/t/group_by.test:
        Bug#31797: Manual merge
      7bd7e988
    • unknown's avatar
      Bug#31797: error while parsing subqueries -- WHERE is parsed as HAVING · df8e9fc2
      unknown authored
      The name resolution for correlated subqueries and HAVING clauses
      failed to distinguish which of two was being performed when there 
      was a reference to an outer aliased field.
      Fixed by adding the condition that HAVING clause name resulotion
      is being performed.
      
      
      mysql-test/r/group_by.result:
        Bug#31797: Test result
      mysql-test/t/group_by.test:
        Bug#31797: Test case
      sql/item.cc:
        Bug#31797: 
        Corrected function comment.
        The fix, raising the error is restricted to HAVING name resolution.
      df8e9fc2
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.1-opt-33699 · d52a1a14
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
        Merge with local tree (bug#33699).
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
        Merge with local tree (bug#33699).
      d52a1a14
    • unknown's avatar
      Bug#29477: Not all fields of the target table were checked to have a default · 72ebb0aa
      unknown authored
      value when inserting into a view.
      
      The mysql_prepare_insert function checks all fields of the target table that
      directly or indirectly (through a view) are specified in the INSERT
      statement to have a default value. This check can be skipped if the INSERT
      statement doesn't mention any insert fields. In case of a view this allows
      fields that aren't mentioned in the view to bypass the check.
      
      Now fields of the target table are always checked to have a default value
      when insert goes into a view.
      
      
      mysql-test/t/view.test:
        Added a test case for the bug#29477: Not all fields of the target table were 
        checked to have a default value when inserting into a view.
      mysql-test/r/view.result:
        Added a test case for the bug#29477: Not all fields of the target table were 
        checked to have a default value when inserting into a view.
      sql/sql_insert.cc:
        Bug#29477: Not all fields of the target table were checked to have a default
        value when inserting into a view.
        Now fields of the target table are always checked to have a default value
        when insert goes into a view.
      72ebb0aa
    • unknown's avatar
      Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULL · a114ede2
      unknown authored
      columns (default datatype value is assigned).
      
      The mysql_update function has been modified to generate
      an error when trying to set a NOT NULL field to NULL rather than a warning
      in the set_field_to_null_with_conversions function.
      
      
      
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test:
        Updated test case (for bug#33699).
      mysql-test/include/ps_modify.inc:
        Updated test case (for bug#33699).
      mysql-test/r/auto_increment.result:
        Updated test case (for bug#33699).
      mysql-test/r/null.result:
        Updated test case (for bug#33699).
      mysql-test/r/ps_2myisam.result:
        Updated test case (for bug#33699).
      mysql-test/r/ps_3innodb.result:
        Updated test case (for bug#33699).
      mysql-test/r/ps_4heap.result:
        Updated test case (for bug#33699).
      mysql-test/r/ps_5merge.result:
        Updated test case (for bug#33699).
      mysql-test/r/warnings.result:
        Updated test case (for bug#33699).
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Updated test case (for bug#33699).
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result:
        Updated test case (for bug#33699).
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result:
        Updated test case (for bug#33699).
      mysql-test/suite/rpl/t/rpl_err_ignoredtable.test:
        Updated test case (for bug#33699).
      mysql-test/t/auto_increment.test:
        Updated test case (for bug#33699).
      mysql-test/t/null.test:
        Updated test case (for bug#33699).
      mysql-test/t/warnings.test:
        Updated test case (for bug#33699).
      sql/sql_update.cc:
        Bug#33699: The mysql_update function has been modified to generate
        an error when trying to set a NOT NULL field to NULL rather than
        a warning in the set_field_to_null_with_conversions function.
      tests/mysql_client_test.c:
        Updated test case (for bug#33699).
      a114ede2
  10. 10 Jan, 2008 12 commits
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 8a757010
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      8a757010
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.1 · 824ced46
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      client/mysql.cc:
        Auto merged
      client/mysqltest.c:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/repl_failsafe.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      824ced46
    • unknown's avatar
      Merge kaamos.(none):/data/src/mysql-5.0 · 84762ce2
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      client/mysql.cc:
        Auto merged
      84762ce2
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · cd6dc10c
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/filesort.cc:
        Auto merged
      cd6dc10c
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · eb80c468
      unknown authored
      into  moonbone.local:/work/33675-bug-5.0-opt-mysql
      
      
      eb80c468
    • unknown's avatar
      filesort.cc: · 1a8bcceb
      unknown authored
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      
      
      sql/filesort.cc:
        Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
        server crash.
        Free smaller buffer before allocating bigger one.
      1a8bcceb
    • unknown's avatar
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 1040bea9
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      sql/field.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      sql/filesort.cc:
        Manual merge.
      1040bea9
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/mysql-4.1-opt · dafd3f43
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      sql/set_var.cc:
        Auto merged
      dafd3f43
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305 · 3869d363
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.1-opt
      
      
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      3869d363
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 7085583c
      unknown authored
      into  kaamos.(none):/data/src/opt/mysql-5.0-opt
      
      
      7085583c
    • unknown's avatar
      Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 · 10909bf4
      unknown authored
      into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/type_date.result:
        Auto merged
      mysql-test/r/union.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/skip_grants.test:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/t/union.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/skip_grants.result:
        Manual merge.
      10909bf4
  11. 09 Jan, 2008 2 commits