1. 28 Feb, 2007 1 commit
    • unknown's avatar
      Merge mysql.com:/home/ram/work/b26038/b26038.4.1 · 6842f6b1
      unknown authored
      into  mysql.com:/home/ram/work/b26038/b26038.5.0
      
      
      sql/item_geofunc.cc:
        Auto merged
      sql/spatial.cc:
        Auto merged
      sql/spatial.h:
        Auto merged
      mysql-test/r/gis.result:
        will be fixed after the merging.
      mysql-test/t/gis.test:
        merging, the result will be fixed in an after-merge fix CS
      sql/item_geofunc.h:
        merging
      6842f6b1
  2. 21 Feb, 2007 1 commit
    • unknown's avatar
      Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL · cbb38476
      unknown authored
      Having maybe_null flag unset for geometry/spatial functions leads to
      wrong Item_func_isnull::val_int()'s results.
      Fix: set maybe_null flag and add is_null() methods.
      
      
      mysql-test/r/gis.result:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - test result.
      mysql-test/t/gis.test:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - test case.
      sql/item_geofunc.cc:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - set maybe_null flag for Item_geometry_func and Item_func_as_wkt.
          - moved length check to the beginnig of the 
            Item_func_spatial_collection::val_str() to affect geometry 
            collection objects at once.
          - changed Item_func_isempty::val_int() and Item_func_issimple::val_int()
            to properly handle null_value.
      sql/item_geofunc.h:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - set maybe_null flag for geometry/spatial functions.
          - added is_null() to Item_geometry_func and Item_func_spatial_rel
            classes.
      sql/spatial.cc:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - changed return type of Geometry::create_from_wkb() to be 
            consistent with Geometry::create_from_wkt(), now it returns
            Geometry object or NULL in case of error.
      sql/spatial.h:
        Fix for bug #26038: X() value of empty NOT NULL POINT is neither NULL nor NOT NULL
          - changed return type of Geometry::create_from_wkb() to be 
            consistent with Geometry::create_from_wkt(), now it returns
            Geometry object or NULL in case of error.
      cbb38476
  3. 15 Feb, 2007 3 commits
  4. 14 Feb, 2007 7 commits
    • unknown's avatar
      Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 · 48be0a2f
      unknown authored
      into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/order_by.result:
        Manual merge.
      mysql-test/t/order_by.test:
        Manual merge.
      48be0a2f
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 1d549b95
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      client/mysqltest.c:
        Auto merged
      1d549b95
    • unknown's avatar
      Use my_vsnprintf instead of vsnprintf · 557f6169
      unknown authored
      557f6169
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 9d66be72
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
      
      
      sql/mysql_priv.h:
        Auto merged
      9d66be72
    • unknown's avatar
      Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 · 555aed64
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      555aed64
    • unknown's avatar
      Bug#18628 mysql-test-run: security problem(part1) · c4ae01e6
      unknown authored
       - Implement --secure-file-priv=<dir> option that limits
        "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
        with files in specified dir.
       - Use above option for mysqld in mysql-test-run.pl 
      
      
      mysql-test/mysql-test-run.pl:
        Add usage of --secure-file-priv=vardir when starting mysqld
      mysql-test/r/loaddata.result:
        Update test result after adding test to check that secure-file-priv
        works for "load data" and "load_file"
      mysql-test/r/outfile.result:
        Update result
      mysql-test/r/query_cache.result:
        Can't load from outside of vardir anymore
      mysql-test/r/type_blob.result:
        Can't load from outside of vardir anymore
      mysql-test/t/loaddata.test:
        Update test result after adding test to check that secure-file-priv 
        works for "load data" and "load_file"
      mysql-test/t/outfile.test:
        Update test result after adding test to check that secure-file-priv
        works for "SELECT .. INTO OUTFILE"
      mysql-test/t/query_cache.test:
        Can't load from outside of vardir anymore
      mysql-test/t/type_blob.test:
        Can't load from outside of vardir anymore
      sql/item_strfunc.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/mysql_priv.h:
        Add secure_file_priv
      sql/mysqld.cc:
        Add "--secure_file_priv"
      sql/set_var.cc:
        Add variable "secure_file_priv" to "show variables"
      sql/sql_class.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/sql_class.h:
        Fix spelling error
      sql/sql_load.cc:
        Check that the path "load_file" uses for the file is within 
        what's specified with --secure-file-priv
      sql/share/errmsg.txt:
        Fix swedish error message for ER_OPTION_PREVENTS_STATMENT wich was hardcoded
        to --skip-grant-tables
      c4ae01e6
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-maint · 12d6c6eb
      unknown authored
      into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
      
      
      12d6c6eb
  5. 13 Feb, 2007 11 commits
  6. 12 Feb, 2007 16 commits
    • unknown's avatar
      Merge mysql.com:/home/hf/work/20691/my50-20691 · 4c2bc81a
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      
      sql/item.cc:
        Auto merged
      4c2bc81a
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · e7e25506
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      
      e7e25506
    • unknown's avatar
      Merge mysql.com:/home/hf/work/25492/my41-25492 · 04b64f00
      unknown authored
      into  mysql.com:/home/hf/work/25492/my50-25492
      
      
      libmysqld/lib_sql.cc:
        merging
      04b64f00
    • unknown's avatar
      bug #25492 (Invalid deallocation in mysql_stmt_fetch) · fd76e148
      unknown authored
      
      libmysqld/lib_sql.cc:
        code modified to prevent freeing of memory that wasn't malloc-ed.
        Now we check if MYSQL_STMT::result was used.
      fd76e148
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · dfe66b93
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      dfe66b93
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5e84eb56
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      5e84eb56
    • unknown's avatar
      valgrind error fix · 7ca34a79
      unknown authored
      7ca34a79
    • unknown's avatar
      Fixed MacOSX/Intel linking problem · e307a46c
      unknown authored
       Common symbols with and without initialization
       cause the apple linker to exclude then from the
       list of global symbols.
      
      
      e307a46c
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1c285489
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/50-24660
      
      
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      1c285489
    • unknown's avatar
      Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · 8a34c4bb
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/41-24660
      
      
      sql/table.cc:
        Auto merged
      8a34c4bb
    • unknown's avatar
      Merge mysql.com:/home/tnurnberg/24660/41-24660 · 91f684a5
      unknown authored
      into  mysql.com:/home/tnurnberg/24660/50-24660
      
      
      mysql-test/r/type_enum.result:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/unireg.cc:
        Auto merged
      91f684a5
    • unknown's avatar
      Bug#24660: "enum" field type definition problem · 4dc7c1aa
      unknown authored
      ENUMs weren't allowed to have character 0xff, a perfectly good character in some locales.
      This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
      being used. Now if 0xff makes an appearance, we find a character not used in the enum and
      use that as a separator. If no such character exists, we throw an error.
      
      Any solution would have broken some sort of existing behaviour. This solution should
      serve both fractions (those with 0xff and those with ',' in their enums), but
      WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
      That is, mysqldump with their current server, and restore when upgrading to one with
      this patch.
      
      
      mysql-test/r/type_enum.result:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      mysql-test/t/type_enum.test:
        Bug#24660: "enum" field type definition problem
        
        Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
        char in some locales), or ',', or both.
      sql/table.cc:
        Bug#24660: "enum" field type definition problem
        
        Revert fix for Bug#20922.
      sql/unireg.cc:
        Bug#24660: "enum" field type definition problem
        
        Use a field-separator for ENUM-values that is not part of those values. If impossible,
        throw error.
      4dc7c1aa
    • unknown's avatar
      Bug#24630 Subselect query crashes mysqld · 2572c826
      unknown authored
      The crash happens because second filling of the same I_S table happens in
      case of subselect with order by. table->sort.io_cache previously allocated
      in create_sort_index() is deleted during second filling
      (function get_schema_tables_result). There are two places where
      I_S table can be filled: JOIN::exec and create_sort_index().
      To fix the bug we should check if the table was already filled
      in one of these places and skip processing of the table in second.
      
      
      mysql-test/r/information_schema.result:
        test case
      mysql-test/t/information_schema.test:
        test case
      sql/mysql_priv.h:
        added new parameter 'executed_place' to function get_schema_tables_result()
      sql/sql_select.cc:
        added new parameter 'executed_place' to function get_schema_tables_result()
      sql/sql_show.cc:
        added more accurate check for cases when we need to refresh I_S table
      sql/table.cc:
        added more accurate check for cases when we need to refresh I_S table
      sql/table.h:
        added more accurate check for cases when we need to refresh I_S table
      2572c826
    • unknown's avatar
      bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field) · 07f36668
      unknown authored
      Some fields (GEOMETRY first of all) can't be handled properly in this
      case at all. So we return an error in this case
      
      
      mysql-test/r/default.result:
        result fixed
      mysql-test/r/gis.result:
        result fixed
      mysql-test/t/default.test:
        VIEW test added
      mysql-test/t/gis.test:
        testcase added
      sql/item.cc:
        set_defaults() changed with the 'reset()'
      07f36668
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 1932ac9a
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26159
      
      
      1932ac9a
    • unknown's avatar
      Fixed bug #26209. · ac8e0293
      unknown authored
      The function make_unireg_sortorder ignored the fact that any
      view field is represented by a 'ref' object.
      This could lead to wrong results for the queries containing
      both GROUP BY and ORDER BY clauses.
      
      
      mysql-test/r/view.result:
        Added a test case for bug #26209.
      mysql-test/t/view.test:
        Added a test case for bug #26209.
      ac8e0293
  7. 11 Feb, 2007 1 commit
    • unknown's avatar
      sql_view.cc: · 5e42c0de
      unknown authored
        Post fix for bug#12122.
      information_schema.result:
        Corrected test case after fixing bug#12122.
      
      
      sql/sql_view.cc:
        Post fix for bug#12122.
      mysql-test/r/information_schema.result:
        Corrected test case after fixing bug#12122.
      5e42c0de