1. 23 May, 2005 5 commits
    • unknown's avatar
      BUG#10687 - Merge engine fails under Windows · 67c5514b
      unknown authored
      This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
      It also adds a check in has_path to avoid a possible redundant comparison.
      
      ha_myisammrg.cc:
        Replaced missing / in format string
      my_getwd.c:
        Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
      
      
      mysys/my_getwd.c:
        Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
      sql/ha_myisammrg.cc:
        Replaced missing / in format string
      67c5514b
    • unknown's avatar
      Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1b2a2c86
      unknown authored
      into mdk10.(none):/home/reggie/bk/mysql-4.1
      
      
      1b2a2c86
    • unknown's avatar
      BUG# 10687: Merge engine fails under Windows · 36b3f0a0
      unknown authored
      This cset is to roll out the cset applied earlier from Ingo.
      This bug has been fixed with a different cset.
      
      
      
      sql/ha_myisammrg.cc:
        removed the patch applied earlier
      strings/my_vsnprintf.c:
        removed the patch applied earlier.  The patch was to add %c ability.  
        Monty has already done this.
      36b3f0a0
    • unknown's avatar
      Build fixes for icc, compile _without_ "-no-gnu" · 3ca4caef
      unknown authored
      
      include/my_global.h:
        icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.
      ndb/src/cw/cpcd/Process.cpp:
        Remove rlimit64
      ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
        Remove dirent64
      3ca4caef
    • unknown's avatar
      BUG# 10687: MERGE Engine fails on Windows · 6b964f0f
      unknown authored
      This is a replacement for the original patch given by Ingo.  This one comes
      from Monty.
      The problem is that merge files now use unix style pathnames on all 
      platforms.  The merge file open code was not properly converting those
      pathnames back to non-unix when necessary.
      
      
      myisammrg/myrg_open.c:
        use fn_format to convert pathnames if the files in the merge file have a pathname
      mysys/my_getwd.c:
        add a test for '/' in the code that determines if a string inlucdes a pathname
      6b964f0f
  2. 20 May, 2005 4 commits
    • unknown's avatar
      9b8e0274
    • unknown's avatar
      BUG# 9148: Denial of service · c1ae672a
      unknown authored
      The problem was that on Windows the access method indicates that access to file 
      such as "com1" and "lpt1" is allowed (since they are device names) and
      this causes mysql to attempt to open them as databases or tables.
      
      The fix was to write our own my_access method that uses other Win32 functions
      to determine if the given argument is indeed a file and has to requested
      mode.
      
      
      VC++Files/mysys/mysys.dsp:
        added my_access
      VC++Files/mysys/mysys_ia64.dsp:
        added my_access.c
      include/my_sys.h:
        if on windows, we use my_access.
        if not on windows, then my_access points to the native access method
      mysys/Makefile.am:
        added my_access to mysys build file
      mysys/mf_pack.c:
        changed call to access to my_access
      sql/sql_db.cc:
        changed call to access to my_access
      c1ae672a
    • unknown's avatar
      Merge mysql.com:/usr/home/ram/work/mysql-4.1-build · 25d661ad
      unknown authored
      into mysql.com:/usr/home/ram/work/mysql-4.1
      
      
      25d661ad
    • unknown's avatar
      a fix (bug #10757: gis-rtree.test fails) · 2ef41d3d
      unknown authored
      
      
      myisam/sp_key.c:
        a fix (bug #10757: gis-rtree.test fails)
        float8get() doesn't properly work with local variables sometimes.
      2ef41d3d
  3. 19 May, 2005 6 commits
  4. 18 May, 2005 20 commits
    • unknown's avatar
      merged · 7e507270
      unknown authored
      
      sql/unireg.cc:
        Auto merged
      7e507270
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 · 9e8cad1d
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
      
      
      9e8cad1d
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.0/ · dae940d1
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.0
      
      
      dae940d1
    • unknown's avatar
      udf: when banning paths from soname in CREATE FUNCTION, check for \ on windows. · e507f6a1
      unknown authored
      when reporting an error, use an appropriate buffer for udf->name
      
      
      e507f6a1
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-4.1 · 7a223fe8
      unknown authored
      into mysql.com:/home/mydev/mysql-4.1-4100
      
      
      7a223fe8
    • unknown's avatar
      Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE · 0461b482
      unknown authored
      After review version.
      Added a condition for MERGE tables. These do not have unique
      indexes. But every key could be a unique key on the underlying
      MyISAM table. So get the maximum key length for MERGE tables
      instead of the maximum unique key length. This is used for
      buffer allocation in write_record().
      
      
      mysql-test/r/merge.result:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        The test result.
      mysql-test/t/merge.test:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        The test case does not in all cases show the problem
        without the bugfix. The improper memory allocation
        might get through undetected in many cases.
      sql/ha_myisammrg.h:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Set a table_flag for the MERGE engine telling that any index
        might be unique without being specified as such.
      sql/handler.h:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Added a new table_flag telling that any index
        might be unique without being specified as such.
      sql/sql_insert.cc:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Changed the freeing of the memory to be symmetric to its
        allocation (my_safe_alloc -> my_safe_afree).
        This is not directly related to the bug.
      sql/table.cc:
        Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
        Added a condition for MERGE tables. These do not have unique
        indexes. But every key could be a unique key on the underlying
        MyISAM table. So get the maximum key length for MERGE tables
        instead of the maximum unique key length. This is used for
        buffer allocation in write_record().
      0461b482
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · d104149c
      unknown authored
      into mysql.com:/home/jimw/my/mysql-4.1-clean
      
      
      d104149c
    • unknown's avatar
      Update mysqldump test and results · 53af474b
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Fix test to not include version number in results
      53af474b
    • unknown's avatar
      Resolve bugfix merge · 0f02da9f
      unknown authored
      
      client/mysqldump.c:
        Merge bug fix
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/t/mysqldump.test:
        Merge bug fix
      0f02da9f
    • unknown's avatar
      Small optimization to bug fix, from Monty. · eff871bd
      unknown authored
      
      client/mysqldump.c:
        Optimize away a call to strend() by using return value of my_snprintf()
      eff871bd
    • unknown's avatar
      Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · ada80876
      unknown authored
      into mysql.com:/space/pekka/ndb/version/my41
      
      
      ada80876
    • unknown's avatar
      ndb - allow upgrade 4.1.10->4.1.12 · fed9e191
      unknown authored
      
      ndb/src/common/util/version.c:
        allow upgrade 4.1.10->4.1.12
      fed9e191
    • unknown's avatar
      Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1 · 57ba8d3e
      unknown authored
      into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
      
      
      57ba8d3e
    • unknown's avatar
      reduced 1 server reloding during test · 8c4e2860
      unknown authored
      
      BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
        Delete: mysql-test/t/grant_cache-master.opt
      mysql-test/r/grant_cache.result:
        query cache management moved inside test
      mysql-test/t/grant_cache.test:
        query cache management moved inside test to privent server reloading during test
      8c4e2860
    • unknown's avatar
      olap.result, olap.test: · 0a2b0725
      unknown authored
        Added test cases for bug #7914.
      sql_select.cc:
        Fixed bug #7914: rollup over expresssions such as sum(a)+1.
      
      
      sql/sql_select.cc:
        Fixed bug #7914: rollup over expresssions such as sum(a)+1.
      mysql-test/t/olap.test:
        Added test cases for bug #7914.
      mysql-test/r/olap.result:
        Added test cases for bug #7914.
      0a2b0725
    • unknown's avatar
      sql_yacc.yy: · fce15210
      unknown authored
        Added missing ';'.
      
      
      sql/sql_yacc.yy:
        Added missing ';'.
      fce15210
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · afc94dfb
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      mysql-test/t/range.test:
        Auto merged
      afc94dfb
    • unknown's avatar
      test fixes · afe67793
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        always use --no-defaults
      mysql-test/t/range.test:
        range.test does not requires innodb
      afe67793
    • unknown's avatar
      ndberror.c: · 26b619b3
      unknown authored
        updated error message for ndb
      
      
      ndb/src/ndbapi/ndberror.c:
        updated error message for ndb
      BitKeeper/etc/logging_ok:
        Logging to logging@openlogging.org accepted
      26b619b3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1 · 0c11874d
      unknown authored
      into mysql.com:/data0/mysqldev/my/mysql-4.1-build
      
      
      configure.in:
        Auto merged
      mysql-test/t/range.test:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      0c11874d
  5. 17 May, 2005 1 commit
  6. 16 May, 2005 4 commits