1. 19 Nov, 2007 1 commit
  2. 18 Nov, 2007 1 commit
    • unknown's avatar
      Merge gleb.loc:/work/bk/PA/5.0-opt-32335 · e316f813
      unknown authored
      into  gleb.loc:/work/bk/5.1-opt
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Merge with 5.0-opt.
      e316f813
  3. 17 Nov, 2007 9 commits
    • unknown's avatar
      Fixed bug #32335. · 99054db6
      unknown authored
      Comparison of a BIGINT NOT NULL column with a constant arithmetic
      expression that evaluates to NULL caused error 1048: "Column '...'
      cannot be null".
      
      Made convert_constant_item() check if the constant expression is NULL
      before attempting to store it in a field. Attempts to store NULL in a
      NOT NULL field caused query errors.
      
      
      sql/item_cmpfunc.cc:
        Fixed bug #32335.
        1. Made convert_constant_item() check if the constant expression is NULL
           before attempting to store it in a field. Attempts to store NULL in
           a NOT NULL field caused query errors.
        
        2. Also minor bug has been fixed: the thd->count_cuted_fields value
           was not restored in case of successful conversion.
      mysql-test/t/select.test:
        Added test case for bug #32335.
      mysql-test/r/select.result:
        Added test case for bug #32335.
      99054db6
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31158/my50-31158 · 6bb3c8ee
      unknown authored
      into  mysql.com:/home/hf/work/31158/my51-31158
      
      
      sql/field.cc:
        Auto merged
      6bb3c8ee
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31158/my41-31158 · 71232b16
      unknown authored
      into  mysql.com:/home/hf/work/31158/my50-31158
      
      
      71232b16
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-4.1-opt · d28ae94e
      unknown authored
      into  mysql.com:/home/hf/work/31158/my41-31158
      
      
      d28ae94e
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · dd07707b
      unknown authored
      into  mysql.com:/home/hf/work/31158/my50-31158
      
      
      sql/field.cc:
        Auto merged
      dd07707b
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.1-opt · 12cc8e12
      unknown authored
      into  mysql.com:/home/hf/work/31158/my51-31158
      
      
      sql/field.cc:
        Auto merged
      12cc8e12
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31158/my50-31158 · e42a2230
      unknown authored
      into  mysql.com:/home/hf/work/31158/my51-31158
      
      
      mysql-test/t/gis.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      mysql-test/r/gis.result:
        merging
      e42a2230
    • unknown's avatar
      merging · 8a8d634b
      unknown authored
      8a8d634b
    • unknown's avatar
      Merge mysql.com:/home/hf/work/31158/my41-31158 · 75b8713b
      unknown authored
      into  mysql.com:/home/hf/work/31158/my50-31158
      
      
      mysql-test/t/gis.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/item_geofunc.cc:
        Auto merged
      mysql-test/r/gis.result:
        merging
      sql/field.cc:
        merging
      75b8713b
  4. 16 Nov, 2007 9 commits
  5. 15 Nov, 2007 7 commits
  6. 14 Nov, 2007 11 commits
    • unknown's avatar
      updated result file · dfbd0952
      unknown authored
      dfbd0952
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 8fe6d1d4
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/t/select.test:
        Auto merged
      8fe6d1d4
    • unknown's avatar
      after merge fix · 1490691e
      unknown authored
      1490691e
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · f655bcda
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      f655bcda
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 711cf750
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/r/events_bugs.result:
        Auto merged
      mysql-test/r/partition.result:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Auto merged
      mysql-test/r/ps_3innodb.result:
        Auto merged
      mysql-test/r/ps_4heap.result:
        Auto merged
      mysql-test/r/ps_5merge.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/partition.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/opt_range.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_partition.cc:
        Auto merged
      sql/sql_plugin.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/r/select.result:
        manual merge
      mysql-test/t/select.test:
        manual merge
      711cf750
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · bad2242d
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      bad2242d
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · bed60e01
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/select.result:
        manual merge
      mysql-test/t/select.test:
        manual merge
      bed60e01
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 2e01bfc4
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
      
      
      2e01bfc4
    • unknown's avatar
      Merge gleb.loc:/home/uchum/work/bk/5.1-opt-32034 · c670190e
      unknown authored
      into  gleb.loc:/home/uchum/work/bk/5.1-opt
      
      
      c670190e
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · f71f07f2
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.1-opt
      
      
      f71f07f2
    • unknown's avatar
      Fixed bug #32034: On 64bit platforms assigning values of · 69762c05
      unknown authored
      storage engine system variables was not validated and
      unexpected value was assigned.
      
      The check_func_enum function used subtraction from the uint
      value with the probably negative result. That result of
      type uint was compared with 0 after casting to signed long
      type. On architectures where long type is longer than int
      type the result of comparison was unexpected.
      
      
      storage/example/ha_example.cc:
        Fixed bug #32034.
        Sample system variable example_enum_var has been added to the
        EXAMPLE storage to test ENUM variables.
      sql/sql_plugin.cc:
        Fixed bug #32034.
        The check_func_enum function used subtraction from the uint
        value with the probably negative result. That result of
        type uint was compared with 0 after casting to signed long
        type. On architectures where long type is longer than int
        type the result of comparison was unexpected.
        
        uint value has been casted to long type before subtraction.
      mysql-test/t/plugin.test:
        Added test case for bug #32034.
      mysql-test/r/plugin.result:
        Added test case for bug #32034.
      69762c05
  7. 13 Nov, 2007 2 commits