1. 12 Nov, 2007 2 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug30069/mysql-4.1-build · fc71ff89
      unknown authored
      into  mysql.com:/home/kent/bk/bug30069/mysql-5.0-build
      
      
      mysql-test/t/bigint.test:
        Auto merged
      strings/ctype-simple.c:
        Auto merged
      mysql-test/r/bigint.result:
        SCCS merged
      fc71ff89
    • unknown's avatar
      bigint.test, bigint.result: · 568f6244
      unknown authored
        Test case for Bug#30069
      
      
      mysql-test/r/bigint.result:
        Test case for Bug#30069
      mysql-test/t/bigint.test:
        Test case for Bug#30069
      568f6244
  2. 10 Nov, 2007 2 commits
  3. 08 Nov, 2007 2 commits
  4. 07 Nov, 2007 2 commits
    • unknown's avatar
      Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 · 3a7e070f
      unknown authored
      into  ramayana.hindu.god:/home/tsmith/m/bk/build/b20748/50
      
      
      include/my_sys.h:
        Auto merged
      3a7e070f
    • unknown's avatar
      Bug #20748: Configuration files should not be read more than once · 707f42a6
      unknown authored
      A user could not override system-wide settings in their ~/.my.cnf,
      because the DEFAULT_SYSCONFDIR was being searched last.  Also, in
      some configurations (especially when the --sysconfdir compile-time
      option is set to /etc or /etc/mysql), the system-wide my.cnf file
      was read multiple times, causing confusion and potential problems.
      
      Rearrange default directories to conform to the manual and logic.
      Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
      directory to the middle of the list.  $HOME/.my.cnf should be last,
      so the user is able to override the system-wide settings.
      
      Change init_default_directories() to remove duplicates from the
      list.
      
      
      include/my_sys.h:
        Add array_append_string_unique(), from mf_arr_appstr.c
      libmysql/Makefile.shared:
        Add new mf_arr_appstr.lo object
      mysys/CMakeLists.txt:
        Add new mf_arr_appstr.c source.
      mysys/Makefile.am:
        Add new mf_arr_appstr.c source.
      mysys/default.c:
        Change order in which defaults files are added to default_directories,
        in order to conform to the manual (and to common sense).  This fixes
        a particularly bad problem on Unix, where ~/.my.cnf was read before
        /usr/local/etc/my.cnf.
        
        Also, don't add duplicate entries; move the existing entry to the
        end of the list instead.
        
        
        Here is a comparison of the order of defaults files, BEFORE and AFTER
        this patch.
        
        On Windows:
        
        BEFORE:  C:\, GetWindowsDirectory(), GetSystemWindowsDirectory(),
                 $MYSQL_HOME, defaults-extra-file, INSTALLDIR
        
        AFTER:  GetSystemWindowsDirectory(), GetWindowsDirectory(), C:\,
                INSTALLDIR, $MYSQL_HOME, defaults-extra-file
        
        GetSystemWindowsDirectory() is moved before GetWindowsDirectory() because
        the former is shared by all Terminal Services users, while the latter is
        private for each user.
        
        
        On Netware (no change):
        
        BEFORE:  sys:/etc/, $MYSQL_HOME, defaults-extra-file
        
        AFTER:  sys:/etc, $MYSQL_HOME, defaults-extra-file
        
        
        On OS/2:
        
        BEFORE:  $ETC, /etc, $MYSQL_HOME, defaults-extra-file
        
        AFTER:  /etc, $ETC, $MYSQL_HOME, defaults-extra-file
        
        
        On everything else (general Unix):
        
        BEFORE:  /etc, $MYSQL_HOME, defaults-extra-file, ~/, --sysconfdir
        
        AFTER:  /etc/, --sysconfdir, $MYSQL_HOME, defaults-extra-file, ~/
        
        The BEFORE code added --sysconfdir on all systems, but only the
        Unix build system actually defined a value for it.
      mysys/mf_arr_appstr.c:
        BitKeeper file /home/tsmith/m/bk/build/50-b20748/mysys/mf_arr_appstr.c
      707f42a6
  5. 05 Nov, 2007 2 commits
  6. 02 Nov, 2007 12 commits
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 082bdc7e
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
      
      
      ndb/include/ndbapi/Ndb.hpp:
        Auto merged
      082bdc7e
    • unknown's avatar
      Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e308ad70
      unknown authored
      into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      e308ad70
    • unknown's avatar
      Bug#31319 CMake build does not check for minimum required version · ffb12753
      unknown authored
      - Add check
      
      
      ffb12753
    • unknown's avatar
      Makefile.am: · ae53002e
      unknown authored
        Removed place holder for 'manual.chm'
      .del-manual.chm:
        Delete: Docs/manual.chm
      
      
      BitKeeper/deleted/.del-manual.chm:
        Delete: Docs/manual.chm
      Docs/Makefile.am:
        Removed place holder for 'manual.chm'
      ae53002e
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build · 8e51ade9
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
      
      
      8e51ade9
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 · 49472b07
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
      
      
      49472b07
    • unknown's avatar
      Makefile.am: · d6c83016
      unknown authored
        Don't install INSTALL-BINARY, handled by build scripts
      
      
      Docs/Makefile.am:
        Don't install INSTALL-BINARY, handled by build scripts
      d6c83016
    • unknown's avatar
      Makefile.am: · c8a757db
      unknown authored
        Added manual.chm to EXTRA_DIST
        Removed install of INSTALL-BINARY, handled
        by install scripts.
      ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
        Updated links to version 5.0 of the manual
      
      
      Docs/INSTALL-BINARY:
        Updated links to version 5.0 of the manual
      INSTALL-SOURCE:
        Updated links to version 5.0 of the manual
      INSTALL-WIN-SOURCE:
        Updated links to version 5.0 of the manual
      support-files/MacOSX/ReadMe.txt:
        Updated links to version 5.0 of the manual
      Docs/Makefile.am:
        Added manual.chm to EXTRA_DIST
        Removed install of INSTALL-BINARY, handled
        by install scripts.
      c8a757db
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build · 9dc02827
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
      
      
      BitKeeper/deleted/.del-generate-text-files.pl:
        SCCS merged
      Docs/Makefile.am:
        SCCS merged
      9dc02827
    • unknown's avatar
      INSTALL-WIN-SOURCE: · 8f040941
      unknown authored
        BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE
      
      
      INSTALL-WIN-SOURCE:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.1-build/INSTALL-WIN-SOURCE
      8f040941
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 · acea5f18
      unknown authored
      into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
      
      
      acea5f18
    • unknown's avatar
      mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am: · 5ee36c1d
      unknown authored
        Let place holders for real documentation have text that
        makes sense to the user (Bug#25205)
      
      
      BitKeeper/deleted/.del-generate-text-files.pl:
        Delete: Docs/Support/generate-text-files.pl
      Docs/INSTALL-BINARY:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY
      INSTALL-SOURCE:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE
      support-files/MacOSX/ReadMe.txt:
        BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt
      Docs/mysql.info:
        More of a end-user text
      Docs/Makefile.am:
        Don't generate text files from the documentation
      5ee36c1d
  7. 01 Nov, 2007 3 commits
  8. 31 Oct, 2007 3 commits
    • unknown's avatar
      Fix for · 6224001c
      unknown authored
         Bug#29290 type_datetime.test failure in 5.1
      
      
      mysql-test/t/type_datetime.test:
        - If we are too close to midnight sleep till we reach 
          at least midnight + 1 second.
        - Replace error numbers with error names.
      6224001c
    • unknown's avatar
      Merge adventure.(none):/home/thek/Development/cpp/bug31347/my50-bug31347 · 2ace967a
      unknown authored
      into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
      
      
      sql/sql_acl.cc:
        Auto merged
      2ace967a
    • unknown's avatar
      Bug#31347 Increase in memory usage after many DROP USER statements · 8d69dd39
      unknown authored
      Dropping users causes huge increase in memory usage because field values were
      allocated on the server memory root for temporary usage but never deallocated.
      
      This patch changes the target memory root to be that of the thread handler
      instead since this root is cleared between each statement.
      
      
      sql/sql_acl.cc:
        Changed memory root from server life time memory to thread life time memory.
      8d69dd39
  9. 30 Oct, 2007 4 commits
    • unknown's avatar
      Makefile.am: · 1de7e5c0
      unknown authored
        Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
        work around for problem with automake 1.10 (bug#24809)
      
      
      cmd-line-utils/libedit/Makefile.am:
        Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
        work around for problem with automake 1.10 (bug#24809)
      1de7e5c0
    • unknown's avatar
      Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e3b246d6
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
      
      
      e3b246d6
    • unknown's avatar
      bug#30630 · b0bc908c
      unknown authored
      b0bc908c
    • unknown's avatar
      Merge moksha.local:/Users/davi/mysql/bugs/31669-5.0 · 157645f4
      unknown authored
      into  moksha.local:/Users/davi/mysql/mysql-5.0-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      157645f4
  10. 29 Oct, 2007 5 commits
    • unknown's avatar
      Merge lambda.weblab:/home/malff/TREE/mysql-5.0-base · 24ede323
      unknown authored
      into  lambda.weblab:/home/malff/TREE/mysql-5.0-rt-merge
      
      
      sql/sql_table.cc:
        Auto merged
      24ede323
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · a2f5911b
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      a2f5911b
    • unknown's avatar
      Merge trift2.:/MySQL/M50/clone-5.0 · b63ae73d
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      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/ps_6bdb.result:
        Auto merged
      mysql-test/r/ps_7ndb.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/t/derived.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      mysql-test/r/type_date.result:
        Null-merge 5.0.50 build clone:
        The test for bug#31221 is already in the receiving tree.
      mysql-test/t/type_date.test:
        Null-merge 5.0.50 build clone:
        The test for bug#31221 is already in the receiving tree.
      b63ae73d
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 93265192
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      93265192
    • unknown's avatar
      Merge trift2.:/MySQL/M41/mysql-4.1 · afa5d5a6
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      afa5d5a6
  11. 25 Oct, 2007 3 commits