An error occurred fetching the project authors.
  1. 11 May, 2007 8 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27957/my50-27957 · 5f41b262
      unknown authored
      into  mysql.com:/home/hf/work/27957/my51-27957
      
      
      mysql-test/r/cast.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/my_decimal.h:
        merging
      5f41b262
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27921/my51-27921 · 3f28924e
      unknown authored
      into  mysql.com:/home/hf/work/27957/my51-27957
      
      
      mysql-test/r/cast.result:
        Auto merged
      sql/item_create.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/my_decimal.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      3f28924e
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27921/my50-27921 · 78ed69c3
      unknown authored
      into  mysql.com:/home/hf/work/27957/my50-27957
      
      
      mysql-test/r/cast.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/my_decimal.h:
        merging
      78ed69c3
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27957/my50-27957 · 62db8d6d
      unknown authored
      into  mysql.com:/home/hf/work/27957/my51-27957
      
      
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      mysql-test/include/mix1.inc:
        merging
      mysql-test/r/innodb_mysql.result:
        SCCS merged
      sql/sql_select.cc:
        merging
      62db8d6d
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · f4ded1f2
      unknown authored
      into  mysql.com:/home/hf/work/27957/my51-27957
      
      
      sql/item_func.cc:
        Auto merged
      f4ded1f2
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 563b1297
      unknown authored
      into  mysql.com:/home/hf/work/27957/my50-27957
      
      
      sql/item_func.cc:
        Auto merged
      563b1297
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27957/my50-27957 · 61b947c3
      unknown authored
      into  mysql.com:/home/hf/work/27957/my51-27957
      
      
      include/decimal.h:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      strings/decimal.c:
        Auto merged
      mysql-test/r/cast.result:
        merging
      sql/my_decimal.h:
        merging
      61b947c3
    • unknown's avatar
      Merge mysql.com:/home/hf/work/27921/my50-27921 · 812a6ee7
      unknown authored
      into  mysql.com:/home/hf/work/27921/my51-27921
      
      
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_create.h:
        merging
      sql/my_decimal.h:
        merging
      sql/sql_yacc.yy:
        merging
      812a6ee7
  2. 10 May, 2007 6 commits
    • unknown's avatar
      Fixed bug #28000. · 36190568
      unknown authored
      Bug occurs in INSERT IGNORE ... SELECT ... ON DUPLICATE KEY UPDATE
      statements, when SELECT returns duplicated values and UPDATE clause
      tries to assign NULL values to NOT NULL fields.
      NOTE: By current design MySQL server treats INSERT IGNORE ... ON
      DUPLICATE statements as INSERT ... ON DUPLICATE with update of
      duplicated records, but MySQL manual lacks this information.
      After this fix such behaviour becomes legalized.
      
      The write_record() function was returning error values even within
      INSERT IGNORE, because ignore_errors parameter of
      the fill_record_n_invoke_before_triggers() function call was
      always set to FALSE. FALSE is replaced by info->ignore.
      
      
      sql/sql_insert.cc:
        Fixed bug #28000:
        The write_record() function was returning error values even within
        INSERT IGNORE, because ignore_errors parameter of
        the fill_record_n_invoke_before_triggers() function call was
        always set to FALSE. FALSE is replaced by info->ignore.
      mysql-test/t/insert_update.test:
        Added test case for bug #28000.
      mysql-test/r/insert_update.result:
        Added test case for bug #28000.
      36190568
    • unknown's avatar
      bigint.test made ps-protocol consistent · f1dbb95b
      unknown authored
      mysql-test/r/bigint.result:
        test result fixed
      mysql-test/t/bigint.test:
        testcase made ps-protocol consistent
      f1dbb95b
    • unknown's avatar
      Fixed bug #28189: in some rare cases optimizer preferred a more expensive · 184cc3b5
      unknown authored
      ref access to a less expensive range access. 
      This occurred only with InnoDB tables.
      
      
      mysql-test/r/innodb_mysql.result:
        Added a test case for bug #28189.
      mysql-test/t/innodb_mysql.test:
        Added a test case for bug #28189.
      184cc3b5
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · eb5b5ad4
      unknown authored
      into  mysql.com:/home/hf/work/28005/my51-28005
      
      
      sql/item_func.cc:
        Auto merged
      eb5b5ad4
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 5083c33f
      unknown authored
      into  mysql.com:/home/hf/work/28005/my51-28005
      
      
      sql/item_func.cc:
        Auto merged
      5083c33f
    • unknown's avatar
      bug 27921 (Views ignore precision for CAST) · a6da564a
      unknown authored
      test result fixed
      
      
      a6da564a
  3. 09 May, 2007 6 commits
    • unknown's avatar
      Bug #27921 View ignores precision for CAST() · f2a52dd0
      unknown authored
      Item_decimal_typecast::print properly implemented
      
      
      mysql-test/r/view.result:
        Bug #27921 View ignores precision for CAST()
        test result
      mysql-test/t/view.test:
        Bug #27921 View ignores precision for CAST()
        test case
      sql/field.cc:
        zero decimals handling unified
      sql/item_create.cc:
        Bug #27921 View ignores precision for CAST()
        create_func_cast parameters changed, zero precision handling unified
      sql/item_create.h:
        Bug #27921 View ignores precision for CAST()
        create_func_cast parameters changed
      sql/item_func.cc:
        Bug #27921 View ignores precision for CAST() 
        Item_decimal_typecast::print properly implemented
      sql/item_func.h:
        Bug #27921 View ignores precision for CAST()
        max_length counting fixed
      sql/my_decimal.h:
        Bug #27921 View ignores precision for CAST()
        my_decimal_trim() implemented to unify zero precision handling
      sql/sql_yacc.yy:
        Bug #27921 View ignores precision for CAST()
        create_func_cast calls simplified
      f2a52dd0
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · b32473a3
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      b32473a3
    • unknown's avatar
      Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect · 82b7c543
      unknown authored
      Missing check for overflow added to the Item_decimal_typecast::val_decimal
      
      
      include/decimal.h:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        decimal_intg() declaration
      mysql-test/r/cast.result:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        result fixed
      mysql-test/r/type_newdecimal.result:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        test result
      mysql-test/t/type_newdecimal.test:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        test case added
      sql/item_func.cc:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        now we check for possible ovreflow in Item_decimal_typecast::val_decimal
      sql/my_decimal.h:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        my_decimal_intg() implemented
      strings/decimal.c:
        Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect
        decimal_intg() implemented
      82b7c543
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · 80a36692
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
      
      
      mysql-test/r/loaddata.result:
        Auto merged
      mysql-test/t/loaddata.test:
        Auto merged
      80a36692
    • unknown's avatar
      loaddata.result, loaddata.test: · ba9657bc
      unknown authored
        A test case is corrected.
      
      
      mysql-test/t/loaddata.test:
        A test case is corrected.
      mysql-test/r/loaddata.result:
        A test case is corrected.
      ba9657bc
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 0ba14149
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      mysql-test/t/loaddata.test:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      mysql-test/r/loaddata.result:
        SCCS merged
      0ba14149
  4. 08 May, 2007 6 commits
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c863f1ee
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql
      
      
      c863f1ee
    • unknown's avatar
      Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a · 80788a34
      unknown authored
      TIMESTAMP field when no value has been provided.
      
      The LOAD DATA sets the current time in the TIMESTAMP field with
      CURRENT_TIMESTAMP default value when the field is detected as a null.
      But when the LOAD DATA command loads data from a file that doesn't contain
      enough data for all fields then the rest of fields are simply set to null
      without any check. This leads to no value being inserted to such TIMESTAMP
      field.
      
      Now the read_sep_field() and the read_fixed_length() functions set current
      time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
      when a NULL value is loaded to the field.
      
      
      mysql-test/t/loaddata.test:
        Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
        default value for a TIMESTAMP field when no value has been provided.
      mysql-test/r/loaddata.result:
        Added a test case for the bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP
        default value for a TIMESTAMP field when no value has been provided.
      sql/sql_load.cc:
        Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a
        TIMESTAMP field when no value has been provided.
        Now the read_sep_field() and the read_fixed_length() functions set current
        time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
        when a NULL value is loaded to the field.
      80788a34
    • unknown's avatar
      item_cmpfunc.cc, type_datetime.result, type_datetime.test, item_cmpfunc.h: · a15fe8d9
      unknown authored
        After merge fix.
      
      
      sql/item_cmpfunc.cc:
        After merge fix.
      sql/item_cmpfunc.h:
        After merge fix.
      mysql-test/r/type_datetime.result:
        After merge fix.
      mysql-test/t/type_datetime.test:
        After merge fix.
      a15fe8d9
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 58a22741
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      mysql-test/r/func_in.result:
        Auto merged
      mysql-test/r/insert_update.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/insert_update.test:
        Auto merged
      mysql-test/t/type_datetime.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/handler.cc:
        Manual merge
      sql/item_cmpfunc.cc:
        Manual merge
      sql/item_cmpfunc.h:
        Manual merge
      sql/item_func.h:
        Manual merge
      sql/sql_class.h:
        Manual merge
      58a22741
    • unknown's avatar
      Raise version number after cloning 5.1.18-beta · 3a065ffa
      unknown authored
      3a065ffa
    • unknown's avatar
      warning eliminated · 4fbd484e
      unknown authored
      4fbd484e
  5. 07 May, 2007 14 commits
    • unknown's avatar
      be5ff3e2
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 2626d024
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/27759-bug-5.0-opt-mysql
      
      
      2626d024
    • unknown's avatar
      Additional fix for the bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions. · dd3f1be8
      unknown authored
      mysql-test/t/type_datetime.test:
        Additional test case for the bug#27759.
      sql/item_func.h:
        Bug#27759: Wrong DATE/DATETIME comparison in LEAST()/GREATEST() functions.
        Now the Item_func_min_max::result_as_longlong() returns TRUE when LEAST()
        compares DATE/DATETIME values. This allows caller to obtain correct integer
        values through the val_int() function.
      dd3f1be8
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt · fabad719
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-27954
      
      
      fabad719
    • unknown's avatar
      Merge xiphis.org:/home/antony/work2/mysql-5.1-engines · d6410b34
      unknown authored
      into  xiphis.org:/home/antony/work2/mysql-5.1-merge
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      d6410b34
    • unknown's avatar
      Fixed bug #27954. · 35659a28
      unknown authored
      This bug affects multi-row INSERT ... ON DUPLICATE into table
      with PRIMARY KEY of AUTO_INCREMENT field and some additional UNIQUE indices.
      If the first row in multi-row INSERT contains duplicated values of UNIQUE
      indices, then following rows of multi-row INSERT (with either duplicated or
      unique key field values) may me applied to _arbitrary_ records of table as
      updates.
      This bug was introduced in 5.0. Related code was widely rewritten in 5.1, and
      5.1 is already free of this problem. 4.1 was not affected too.
      
      When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
      restore_auto_increment(), which set next_insert_id back to 0, but we
      forgot to set clear_next_insert_id back to 0.
      restore_auto_increment() function has been fixed.
      
      
      sql/sql_class.h:
        Fixed bug #27954.
        Added commentary for THD::clear_next_insert_id variable.
      sql/handler.cc:
        Fixed bug #27954.
        When updating the row during INSERT ON DUPLICATE KEY UPDATE, we called
        restore_auto_increment(), which set next_insert_id back to 0, but we
        forgot to set clear_next_insert_id back to 0.
        restore_auto_increment() function has been fixed.
      mysql-test/t/insert_update.test:
        Added test case for bug #27954.
      mysql-test/r/insert_update.result:
        Added test case for bug #27954.
      35659a28
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 44e54a30
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/28133-bug-5.0-opt-mysql
      
      
      sql/item_cmpfunc.cc:
        Auto merged
      mysql-test/r/type_datetime.result:
        SCCS merged
      mysql-test/t/type_datetime.test:
        SCCS merged
      44e54a30
    • unknown's avatar
      Bug#28133: Wrong DATE/DATETIME comparison in IN() function. · 0fd2b3dd
      unknown authored
      The IN function was comparing DATE/DATETIME values either as ints or as
      strings. Both methods have their disadvantages and may lead to a wrong
      result.
      
      Now IN function checks whether all of its arguments has the STRING result
      types and at least one of them is a DATE/DATETIME item. If so it uses either
      an object of the in_datetime class or an object of the cmp_item_datetime
      class to perform its work. If the IN() function arguments are rows then
      row columns are checked whether the DATE/DATETIME comparator should be used
      to compare them.
      The in_datetime class is used to find occurence of the item to be checked
      in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
      class is used to compare items one by one in the DATE/DATETIME context.
      Both classes obtain values from items with help of the get_datetime_value()
      function and cache the left item if it is a constant one.
      
      
      
      mysql-test/t/type_datetime.test:
        Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.
      mysql-test/r/type_datetime.result:
        Added a test case for the bug#28133: Wrong DATE/DATETIME comparison in IN() function.
      mysql-test/r/func_in.result:
        A test case result is corrected after the fix for the bug#28133.
      sql/item_cmpfunc.h:
        Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
        Two DATE/DATETIME comparison classes are added.
        The in_datetime class is used to find occurence of the item to be checked
        in the vector of the constant DATE/DATETIME values. The cmp_item_datetime
        class is used to compare items one by one in the DATE/DATETIME context.
        Both classes obtain values from items with help of the get_datetime_value()
        function and cache the left item if it is a constant one.
      sql/item_cmpfunc.cc:
        Bug#28133: Wrong DATE/DATETIME comparison in IN() function.
        Now IN function checks whether all of its arguments has the STRING result
        types and at least one of them is a DATE/DATETIME item. If so it uses either
        an object of the in_datetime class or an object of the cmp_item_datetime
        class to perform its work. If the IN() function arguments are rows then
        row columns are checked whether the DATE/DATETIME comparator should be used
        to compare them.
      0fd2b3dd
    • unknown's avatar
      item_func.cc: · cc33cf29
      unknown authored
        Fixed compiler warnings.
      
      
      sql/item_func.cc:
        Fixed compiler warnings.
      cc33cf29
    • unknown's avatar
      merging fix · 59ae1777
      unknown authored
      mysql-test/r/sp-vars.result:
        merging
      59ae1777
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 6e07c2e6
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/sp-vars.result:
        merging
      mysql-test/r/type_datetime.result:
        SCCS merged
      mysql-test/t/type_datetime.test:
        SCCS merged
      sql/item_func.h:
        merging
      sql/mysql_priv.h:
        merging
      6e07c2e6
    • unknown's avatar
      Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · 187ccf4b
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      187ccf4b
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · 3a04df06
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      3a04df06
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1 · 30b4f5d0
      unknown authored
      into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
      
      
      30b4f5d0