1. 10 Mar, 2005 7 commits
    • unknown's avatar
      Correct "make_win_src_distribution" to not introduce additional directory layers, · 33f9d926
      unknown authored
      adapt the Windows build files accordingly.
      
      
      VC++Files/tests/mysql_client_test.dsp:
        As the directory structure on Windows now resembles that on Unix (no more
        "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
        of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
      VC++Files/tests/mysql_client_test_ia64.dsp:
        As the directory structure on Windows now resembles that on Unix (no more
        "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
        of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
      scripts/make_win_src_distribution.sh:
        1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
        By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
        from the source for each "$i" that already existed as a target directory.
        This is now prevented by checking the existence and adapting the command.
        
        2) Comment where "$BASE" (the target directory) comes into existence.
        
        3) Introduce an "abort" function as a start point for more sanity checks, use it.
      33f9d926
    • unknown's avatar
      Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 · 20ab3dc9
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      mysql-test/mysql-test-run.sh:
        Auto merged
      20ab3dc9
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425 · dd843ee4
      unknown authored
      into mysql.com:/home/timka/mysql/src/4.1-dbg
      
      
      dd843ee4
    • unknown's avatar
      Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 · 16103a01
      unknown authored
      into hundin.mysql.fi:/home/heikki/mysql-4.1
      
      
      16103a01
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/fix · d357dba8
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/trix/Trix.cpp:
        Auto merged
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      d357dba8
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 62174867
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      62174867
    • unknown's avatar
      bug#9089 · 4b5c3e6e
      unknown authored
      ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
      
      
      ndb/include/mgmapi/mgmapi_config_parameters.h:
        Reenable MAX_OPEN_FILES to enable LCP in some situations
      ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
        Reenable MAX_OPEN_FILES to enable LCP in some situations
      ndb/src/mgmsrv/ConfigInfo.cpp:
        Reenable MAX_OPEN_FILES to enable LCP in some situations
      4b5c3e6e
  2. 09 Mar, 2005 15 commits
    • unknown's avatar
      Merge rurik.mysql.com:/home/igor/mysql-4.1 · e1d3524d
      unknown authored
      into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
      
      
      e1d3524d
    • unknown's avatar
      func_str.result: · 4c536135
      unknown authored
        Correction after manual merge.
      
      
      mysql-test/r/func_str.result:
        Correction after manual merge.
      4c536135
    • unknown's avatar
      Manual merge · 85be2e57
      unknown authored
      
      sql/item_strfunc.cc:
        Auto merged
      85be2e57
    • unknown's avatar
      log0recv.c: · 36873154
      unknown authored
        Better ibbackup message
        Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith
      
      
      innobase/log/log0recv.c:
        Better ibbackup message
      36873154
    • unknown's avatar
    • unknown's avatar
      Fix to make mysql-test-run.pl work with new system tables definitions · 9d839a14
      unknown authored
      
      mysql-test/lib/init_db.sql:
        Fixed mysql-test-run.pl's system tables to correspond to the real ones.
      9d839a14
    • unknown's avatar
      Fix for BUG#7425. · 146df30f
      unknown authored
      The reported problems were due to two completely unrelated omissions.
      1) The file sort procedure didn't correctly create the sort key in
         make_sortkey when the sortkey was an unsigned integer.
      2) The name resolution procedure for column references inside a HAVING
         clause did not propagate the unsigned_flag of the resolved references.
      This patch corrects both problems.
      
      
      mysql-test/r/select.result:
        Added test result for BUG#7425.
      mysql-test/t/select.test:
        Added test for BUG#7425.
      sql/filesort.cc:
        Take into account whether 'item' represents a signed or an unsigned integer.
      sql/item.cc:
        Once an Item_ref is resolved, propagate the unsigned_flag to the resolved item.
      146df30f
    • unknown's avatar
      mysqldumpslow.sh: · 914afabd
      unknown authored
        bug#4914 added --help and usage information
      
      
      scripts/mysqldumpslow.sh:
        bug#4914 added --help and usage information
      914afabd
    • unknown's avatar
      sql/mysqld.cc · 4387d327
      unknown authored
          preserve backward compatibility
      
      
      sql/mysqld.cc:
        preserve backward compatibility
      4387d327
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · ad019543
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ad019543
    • unknown's avatar
      myisam/myisam_ftdump.c · 5d7c76aa
      unknown authored
          recalculate stats/gws for the last word in the index too
          remove unused code
      
      
      myisam/myisam_ftdump.c:
        recalculate stats/gws for the last word in the index too
        remove unused code
      5d7c76aa
    • unknown's avatar
      func_str.result, func_str.test: · 44d66d26
      unknown authored
        Added a test case for bug #8669.
      item_strfunc.cc:
        Fixed bug #8669.
        Function AES_DECRYPT can return NULL value.
      
      
      sql/item_strfunc.cc:
        Fixed bug #8669.
        Function AES_DECRYPT can return NULL value.
      mysql-test/t/func_str.test:
        Added a test case for bug #8669.
      mysql-test/r/func_str.result:
        Added a test case for bug #8669.
      44d66d26
    • unknown's avatar
      bug#9052 - ndb - Use correct length during unique index build · 6f4a99a1
      unknown authored
      (recommit as 4.1->5.0 merge is not possible)
      
      
      ndb/src/kernel/blocks/trix/Trix.cpp:
        Use correct length during unique index build
      6f4a99a1
    • unknown's avatar
      configure.in: · ef0e1c05
      unknown authored
        bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
      
      
      configure.in:
        bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
      ef0e1c05
    • unknown's avatar
      mysql-test-run.pl: · f2cfb6ef
      unknown authored
        Removed -c from /bin/sh call
      make_win_src_distribution.sh:
        Copy all content in mysql-test
      make_win_binary_distribution.sh, make_binary_distribution.sh:
        Add Perl version of mysql-test-run to package
      s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      
      
      bdb/dist/s_javah:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_java:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_readme:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_test:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_vxworks:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_win32:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      bdb/dist/s_win32_dsp:
        Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
      scripts/make_binary_distribution.sh:
        Add Perl version of mysql-test-run to package
      scripts/make_win_binary_distribution.sh:
        Add Perl version of mysql-test-run to package
      scripts/make_win_src_distribution.sh:
        Copy all content in mysql-test
      mysql-test/mysql-test-run.pl:
        Removed -c from /bin/sh call
      f2cfb6ef
  3. 08 Mar, 2005 18 commits