1. 19 Jan, 2005 1 commit
  2. 18 Jan, 2005 24 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · d2778647
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      d2778647
    • unknown's avatar
      Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 · b697b6c0
      unknown authored
      into sinisa.nasamreza.org:/mnt/work/mysql-4.1
      
      
      b697b6c0
    • unknown's avatar
      fixing wrong value for "examined rows" when UNION's are used. · 59ef5bed
      unknown authored
      
      mysql-test/r/union.result:
        result for a test case for the wrong examined rows with UNION's
      mysql-test/t/union.test:
        test case for the wrong examined rows with UNION's
      sql/sql_union.cc:
        a patch for the wrong examined rows with UNION's
      59ef5bed
    • unknown's avatar
      Update type_float test results after merge. · 08ea4df6
      unknown authored
      
      mysql-test/r/type_float.result:
        Update test results (4.1 produces a warning that 4.0 did not,
        and they were merged into the wrong position).
      08ea4df6
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.1-6913 · 34eff3c4
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      34eff3c4
    • unknown's avatar
      Merge changed tests · 8e5a74a6
      unknown authored
      
      sql/field_conv.cc:
        Auto merged
      mysql-test/r/type_float.result:
        Merge
      mysql-test/t/type_float.test:
        Merge
      8e5a74a6
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-4.0-7700 · 80377495
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.0-clean
      
      
      80377495
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ca252acb
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.1-merges
      
      
      ca252acb
    • unknown's avatar
      Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP · e2c869f2
      unknown authored
      prefix", which roots were fixed in 4.0 tree.
      
      
      mysql-test/r/alter_table.result:
        Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
        prefix".
      mysql-test/t/alter_table.test:
        Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
        prefix".
      e2c869f2
    • unknown's avatar
      Cleanups in Makefile.ams · e46d235a
      unknown authored
      
      client/Makefile.am:
        Remove  explicit _DEPENDENCIES, they are not needed with automatic
         dependency tracking wich we started using several months ago.
        Don't use relative paths in makefiles.
      regex/Makefile.am:
        Remove  explicit _DEPENDENCIES, they are not needed with automatic
         dependency tracking wich we started using several months ago.
        Don't use relative paths.
      strings/Makefile.am:
        Remove dead rule.
      e46d235a
    • unknown's avatar
      Manual merge of fix for bug #7884 "Able to add invalid unique index on · 9474fed7
      unknown authored
      TIMESTAMP prefix" into 4.1 tree.
      
      
      sql/field.h:
        Manual merge.
      9474fed7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.0 · 9ed0d855
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
      
      
      9ed0d855
    • unknown's avatar
      Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum() · b1a0f67a
      unknown authored
      macros.
      
      It does not fixes any bugs in 4.0. But it prevents from future error in
      any bugfixes that may use these macros. Also after merging into 4.1 tree
      this cleanup will fix bug #7884 "Able to add invalid unique index on
      TIMESTAMP prefix".
      
      
      sql/field.h:
        Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and
        FIELDFLAG_GEOM flags occupy the same space as number of decimals for
        FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type
        macros that we have non-number field, like we already do in f_is_blob()
        macro.
      b1a0f67a
    • unknown's avatar
      1. Item now uses my_charset_bin by default, · cd89ed9a
      unknown authored
      not default_charset_into. It fixes the
      problem that in some cases numbers where
      treated as CHAR(N), not as BINARY(N), e.g.
      wrong 'charsetnr' when sent to the client side.
      2. IFNULL didn't aggregate argument charsets
      and collations, so IFNULL(1,'a') produced
      a CHAR(N). Now produces a BINARY(N).
      3. SELECT PROCEDURE ANALIZE now returns
      BINARY columns, which is much better than it worked
      previously: CHAR with the default character set.
      But in the future it's worth to fix the fields
      'Field_name' and 'Optimal_fieldtype' to use UTF8,
      and 'Min_value' and 'Max_value' to inherit their charsets
      from the original items. But it is not important,
      and BINARY(N) is OK for now.
      4. Tests were fixed accordingly. No new tests were
      made, as the old onces cover everything.
      
      
      mysql-test/r/analyse.result:
        SELECT PROCEDURE ANALIZE now returns
        BINARY columns, which is much better than it worked
        previously: CHAR with the default character set.
        But in the future it's worth to fix the fields
        'Field_name' and 'Optimal_fieldtype' to use UTF8,
        and 'Min_value' and 'Max_value' to inherit their charsets
        from the original items. But it is not important,
        and BINARY(N) is OK for now.
      mysql-test/r/case.result:
        Test fix according to the changes
      mysql-test/r/metadata.result:
        Test fix according to the changes
      mysql-test/r/ps_1general.result:
        Test fix according to the changes
      mysql-test/r/ps_2myisam.result:
        Test fix according to the changes
      mysql-test/r/ps_3innodb.result:
        Test fix according to the changes
      mysql-test/r/ps_4heap.result:
        Test fix according to the changes
      mysql-test/r/ps_5merge.result:
        Test fix according to the changes
      mysql-test/r/ps_6bdb.result:
        Test fix according to the changes
      mysql-test/r/ps_7ndb.result:
        Test fix according to the changes
      mysql-test/r/union.result:
        Test fix according to the changes
      sql/item.cc:
        Item is now BINARY by default
      sql/item_cmpfunc.cc:
        IFNULL now collects arguments collations/charsets
        like other functions do.
      cd89ed9a
    • unknown's avatar
      Fix 'make distclean' goal. · 1457163c
      unknown authored
      1457163c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 381659ff
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      381659ff
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0 · 7f4bb64a
      unknown authored
      into mysql.com:/space/my/mysql-4.0
      
      
      7f4bb64a
    • unknown's avatar
      Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2c6b02ca
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      
      2c6b02ca
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 · 813e748d
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-clean
      
      
      813e748d
    • unknown's avatar
      #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals · ec0daa74
      unknown authored
      We should not overwrite res if it is returned from a const item.
      
      
      ec0daa74
    • unknown's avatar
      Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 · 985805ce
      unknown authored
      
      sql/filesort.cc:
        Auto merged
      985805ce
    • unknown's avatar
      Fixed new bug that caused symlink test to fail · 96f64b44
      unknown authored
      
      mysys/my_symlink.c:
        More debugging
      96f64b44
    • unknown's avatar
      Fix over-optimization that could result in an unsigned double field being · dd683854
      unknown authored
      set to a negative value. (Bug #7700)
      
      
      sql/field_conv.cc:
        Don't treat real fields as identical when destination is unsigned and
        the source is not.
      mysql-test/t/type_float.test:
        Add test for setting double unsigned to a negative value from a signed double
      mysql-test/r/type_float.result:
        Add test results
      dd683854
    • unknown's avatar
      Anoter fix for moved IO_CACHE object · 896cdbe5
      unknown authored
      896cdbe5
  3. 17 Jan, 2005 15 commits