1. 23 Oct, 2007 11 commits
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 5c7c4141
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
      
      5c7c4141
    • unknown's avatar
      merge 5.0-opt -> 5.1-opt for bug 30825 · 3579cdfc
      unknown authored
      3579cdfc
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 97d42ff3
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
      
      97d42ff3
    • unknown's avatar
      merging · 63a90767
      unknown authored
      63a90767
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 894def5a
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      894def5a
    • unknown's avatar
      Merge mysql.com:/home/hf/work/30638/my50-30638 · cbe55306
      unknown authored
      into  mysql.com:/home/hf/work/30638/my51-30638
      
      
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      storage/myisam/ha_myisam.cc:
        Auto merged
      storage/myisam/mi_write.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      sql/opt_range.cc:
        merging
      sql/sql_map.cc:
        merging
      storage/federated/ha_federated.cc:
        merging
      storage/heap/ha_heap.cc:
        merging
      cbe55306
    • unknown's avatar
      type conversions fixed to avoid warnings on Windows · c44daa8e
      unknown authored
      
      myisam/mi_write.c:
        type conversion fixed
      myisam/sort.c:
        type conversion fixed
      sql/ha_federated.cc:
        type conversion fixed
      sql/ha_heap.cc:
        type conversion fixed
      sql/ha_innodb.cc:
        type conversion fixed
      sql/ha_myisam.cc:
        type conversion fixed
      sql/opt_range.cc:
        type conversion fixed
      sql/sql_map.cc:
        type conversion fixed
      sql/sql_select.cc:
        type conversion fixed
      sql/sql_update.cc:
        type conversion fixed
      c44daa8e
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt · f3b35fbf
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
      
      
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/t/gis.test:
        Auto merged
      BitKeeper/deleted/.del-bdb_gis.result:
        Auto merged
      BitKeeper/deleted/.del-bdb_gis.test:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/innodb_gis.result:
        merged 5.0-opt -> 5.1-opt
      mysql-test/t/innodb_gis.test:
        merged 5.0-opt -> 5.1-opt
      sql/field.cc:
        merged 5.0-opt -> 5.1-opt
      sql/field.h:
        merged 5.0-opt -> 5.1-opt
      sql/sql_select.h:
        merged 5.0-opt -> 5.1-opt
      sql/sql_yacc.yy:
        merged 5.0-opt -> 5.1-opt
      sql/table.cc:
        merged 5.0-opt -> 5.1-opt
      f3b35fbf
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 241ede38
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
      
      
      sql/field.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      241ede38
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt · a4ab3bbe
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
      
      
      mysql-test/t/type_date.test:
        Auto merged
      mysql-test/r/type_date.result:
        merge 5.0-opt -> 5.1-opt
      sql/item.cc:
        merge 5.0-opt -> 5.1-opt
      a4ab3bbe
    • unknown's avatar
      Bug#31633 Information schema = NULL queries crash the server · b5603c29
      unknown authored
      added correct handling of NULL values for lookup fields
      
      
      mysql-test/r/information_schema.result:
        test result
      mysql-test/t/information_schema.test:
        test case
      sql/sql_show.cc:
        added correct handling of NULL values for lookup fields
      b5603c29
  2. 22 Oct, 2007 8 commits
  3. 21 Oct, 2007 7 commits
  4. 20 Oct, 2007 1 commit
  5. 19 Oct, 2007 2 commits
  6. 18 Oct, 2007 10 commits
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1de2823a
      unknown authored
      into  mysql.com:/scratch/tnurnberg/31588/50-31588
      
      1de2823a
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt · a74eb142
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.1-opt
      
      
      mysql-test/r/derived.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/type_datetime.result:
        Auto merged
      mysql-test/t/type_date.test:
        Auto merged
      BitKeeper/deleted/.del-ps_6bdb.result:
        Auto merged
      mysql-test/suite/ndb/r/ps_7ndb.result:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/type_date.result:
        merge 5.0-opt -> 5.1-opt
      a74eb142
    • unknown's avatar
      Merge magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-opt · 093d32a8
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/work/B31221-5.0-gca-opt
      
      093d32a8
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b6b71948
      unknown authored
      into  magare.gmz:/home/kgeorge/mysql/autopush/B31221-5.0-opt
      
      b6b71948
    • unknown's avatar
      Bug #31221: Optimizer incorrectly identifies impossible WHERE clause · 78fa5c3a
      unknown authored
       No warning was generated when a TIMESTAMP with a non-zero time part
       was converted to a DATE value. This caused index lookup to assume
       that this is a valid conversion and was returning rows that match 
       a comparison between a TIMESTAMP value and a DATE keypart.
       Fixed by generating a warning on such a truncation.
      
      
      mysql-test/r/derived.result:
        Bug #31221: fixed an existing not-precise test case
      mysql-test/r/ps_2myisam.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/ps_3innodb.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/ps_4heap.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/ps_5merge.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/ps_6bdb.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/ps_7ndb.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/type_date.result:
        Bug #31221: Warnings cased by existing tests
      mysql-test/r/type_datetime.result:
        Bug #31221: test case
      mysql-test/t/derived.test:
        Bug #31221: fixed an existing not-precise test case
      mysql-test/t/type_date.test:
        Bug #31221: test case
      sql/field.cc:
        Bug #31221: 
         - Upgraded fix for bug 29729
         - issue a warning only if the hh:mm:ss.msec is not zero consistently 
           for all the Field_newdate::store function
      sql/item_timefunc.cc:
        Bug #31221: don't ignore the errors when storing data
      78fa5c3a
    • unknown's avatar
      Bug #30638 why doesn't > 4294967295 rows work in myisam on windows. · f42094c0
      unknown authored
      The BIG_TABLES define wasn't enabled on Windows.
      #define added
      
      
      include/config-win.h:
        Bug #30638 why doesn't > 4294967295 rows work in myisam on windows.
        
        BIG_TABLES enabled on Windows
      f42094c0
    • unknown's avatar
      Bug#31588: buffer overrun when setting variables · b095a1a2
      unknown authored
      post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output
      
      
      mysql-test/r/variables.result:
        post-merge fixes: format string was changed 5.0 -> 5.1, resulting in longer output
      b095a1a2
    • unknown's avatar
      Merge sin.intern.azundris.com:/misc/mysql/31588/50-31588 · 1e2f2560
      unknown authored
      into  sin.intern.azundris.com:/misc/mysql/31588/51-31588
      
      
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      sql/set_var.cc:
        Auto merged
      1e2f2560
    • unknown's avatar
      Merge sin.intern.azundris.com:/misc/mysql/31588/41-31588 · e72a5397
      unknown authored
      into  sin.intern.azundris.com:/misc/mysql/31588/50-31588
      
      
      sql/set_var.cc:
        Auto merged
      mysql-test/r/variables.result:
        SCCS merged
      mysql-test/t/variables.test:
        SCCS merged
      e72a5397
    • unknown's avatar
      Bug#31588: buffer overrun when setting variables · 52162bd3
      unknown authored
      Buffer used when setting variables was not dimensioned to accomodate
      trailing '\0'. An overflow by one character was therefore possible.
      CS corrects limits to prevent such overflows.
      
      
      mysql-test/r/variables.result:
        Try to overflow buffer used for setting system variables.
        Unpatched server should throw a valgrind warning here.
        Actual value and error message irrelevant, only length counts.
      mysql-test/t/variables.test:
        Try to overflow buffer used for setting system variables.
      sql/set_var.cc:
        Adjust maximum number of characters we can store in 'buff' by one
        as strmake() will write a terminating '\0'.
      52162bd3
  7. 17 Oct, 2007 1 commit