1. 29 Nov, 2006 7 commits
  2. 28 Nov, 2006 10 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 15584161
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/t/func_str.test:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      mysql-test/t/wait_for_socket.sh:
        Manual merge.
      sql/sql_cache.cc:
        Manual merge.
      15584161
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 760bd9d1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      libmysql/libmysql.c:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      760bd9d1
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 00fec63a
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      00fec63a
    • unknown's avatar
      Merge trift2.:/M50/mysql-5.0 · fa26de19
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      fa26de19
    • unknown's avatar
      netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. · 5be953f8
      unknown authored
      
      netware/BUILD/nwbootstrap:
        Editing "mwenv" is now obsolete,
        as this file gets its variable settings from the environment already;
        and it is even plain wrong,
        because the assignments to those variables are written in such a way that
        replacing the variables by values (as tried here) yields invalid shell lines.
      5be953f8
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · d41b660b
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      d41b660b
    • unknown's avatar
      Makefile.am: · 89a71063
      unknown authored
        Handle the case "sql_yacc.cc" is pregenerated or not, and that the
        case where the source and build tree is the same or not.
      
      
      sql/Makefile.am:
        Handle the case "sql_yacc.cc" is pregenerated or not, and that the
        case where the source and build tree is the same or not.
      89a71063
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 4d08b747
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      Docs/Makefile.am:
        Auto merged
      4d08b747
    • unknown's avatar
      Makefile.am: · 0fb76499
      unknown authored
        If using \$(srcdir)/mysql.info in action, use same in rule.
      
      
      Docs/Makefile.am:
        If using \$(srcdir)/mysql.info in action, use same in rule.
      0fb76499
    • unknown's avatar
      Merge trift2.:/M50/mysql-5.0 · c8b23c37
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      extra/yassl/taocrypt/taocrypt.dsp:
        Auto merged
      extra/yassl/yassl.dsp:
        Auto merged
      extra/yassl/yassl.vcproj:
        Auto merged
      extra/yassl/taocrypt/taocrypt.vcproj:
        Auto merged
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        Auto merged
      extra/yassl/taocrypt/test.dsp:
        Auto merged
      extra/yassl/testsuite/testsuite.dsp:
        Auto merged
      c8b23c37
  3. 27 Nov, 2006 11 commits
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · 344db8ab
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      344db8ab
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 048dfce0
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-merge
      
      
      sql-common/my_time.c:
        Auto merged
      048dfce0
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · eb63927c
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-4.1-merge
      
      
      eb63927c
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build · e9c502b3
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0
      
      
      e9c502b3
    • unknown's avatar
      ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: · 16918343
      unknown authored
        Reenabled build outside source tree
      
      
      config/ac-macros/ha_berkeley.m4:
        Reenabled build outside source tree
      config/ac-macros/ha_innodb.m4:
        Reenabled build outside source tree
      config/ac-macros/ha_ndbcluster.m4:
        Reenabled build outside source tree
      extra/yassl/src/Makefile.am:
        Reenabled build outside source tree
      extra/yassl/taocrypt/benchmark/Makefile.am:
        Reenabled build outside source tree
      extra/yassl/taocrypt/src/Makefile.am:
        Reenabled build outside source tree
      extra/yassl/taocrypt/test/Makefile.am:
        Reenabled build outside source tree
      extra/yassl/testsuite/Makefile.am:
        Reenabled build outside source tree
      libmysql/Makefile.shared:
        Reenabled build outside source tree
      ndb/src/mgmsrv/Makefile.am:
        Reenabled build outside source tree
      16918343
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 4ab2a016
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      4ab2a016
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1 · cae25b0c
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0
      
      
      cae25b0c
    • unknown's avatar
      Makefile.am: · f53733db
      unknown authored
        BSD compatibility
      
      
      Docs/Makefile.am:
        BSD compatibility
      f53733db
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1 · 14ba2178
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0
      
      
      BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
        Auto merged
      bdb/dist/gen_rec.awk:
        Auto merged
      libmysql_r/Makefile.am:
        Auto merged
      ndb/config/type_ndbapitools.mk.am:
        Auto merged
      ndb/src/kernel/Makefile.am:
        Auto merged
      14ba2178
    • unknown's avatar
      gen_rec.awk: · 8d6f67f3
      unknown authored
        Fix undefined behaviour.
      Many files:
        Reenabled build outside ource tree
      
      
      bdb/dist/gen_rec.awk:
        Fix undefined behaviour.
      acinclude.m4:
        Reenabled build outside ource tree
      configure.in:
        Reenabled build outside ource tree
      libmysql_r/Makefile.am:
        Reenabled build outside ource tree
      libmysqld/Makefile.am:
        Reenabled build outside ource tree
      ndb/config/common.mk.am:
        Reenabled build outside ource tree
      ndb/config/type_kernel.mk.am:
        Reenabled build outside ource tree
      ndb/config/type_ndbapi.mk.am:
        Reenabled build outside ource tree
      ndb/config/type_ndbapitest.mk.am:
        Reenabled build outside ource tree
      ndb/config/type_ndbapitools.mk.am:
        Reenabled build outside ource tree
      ndb/config/type_util.mk.am:
        Reenabled build outside ource tree
      ndb/src/kernel/Makefile.am:
        Reenabled build outside ource tree
      8d6f67f3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0 · 880b3d84
      unknown authored
      into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
      
      
      libmysql/libmysql.c:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/filesort.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      strings/decimal.c:
        Auto merged
      880b3d84
  4. 24 Nov, 2006 3 commits
    • unknown's avatar
      mysql-test-run.pl: · f47d5500
      unknown authored
        Removed "use diagnostics", reduces Perl speed significantly. Can be
        enabled with "perl -Mdiagnostics mysql-test-run.pl".
      mtr_report.pl:
        Don't try output "skipped" comment if there is none (bug#24471)
      
      
      mysql-test/mysql-test-run.pl:
        Removed "use diagnostics", reduces Perl speed significantly. Can be
        enabled with "perl -Mdiagnostics mysql-test-run.pl".
      mysql-test/lib/mtr_report.pl:
        Don't try output "skipped" comment if there is none (bug#24471)
      f47d5500
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 23003bfa
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      23003bfa
    • unknown's avatar
      fixes for mtr_unique.pl · 6de6b97e
      unknown authored
      
      mysql-test/lib/mtr_unique.pl:
        - add info message to mtr_require_unique_id_and_wait as suggested
        - fix for security issue
        - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected
      6de6b97e
  5. 23 Nov, 2006 8 commits
    • unknown's avatar
      Fix for BUG##24415: Instance manager test im_daemon_life_cycle · cf9038e9
      unknown authored
      fails randomly.
      
      The problem was that the test case used command line tool (mysql)
      without specifying connect_timeout argument. In some cases,
      this lead to hanging of the test case.
      
      The fix is to specify --connect_timeout=1 when starting mysql.
      
      Also, the patch contains polishing and various cleanups to simplify
      analyzing of the problems further.
      
      The patch affects only test suite, no server codebase has been
      touched.
      
      
      mysql-test/lib/mtr_im.pl:
        Remember PID of the IM-spawner -- a process, that is
        used to fork IM-angel.
      mysql-test/lib/mtr_io.pl:
        Trim \n from the PID.
      mysql-test/lib/mtr_process.pl:
        Don't complain if it was IM-spawner, who died.
      mysql-test/r/im_daemon_life_cycle.result:
        Update the result file.
      mysql-test/r/im_life_cycle.result:
        Update the result file.
      mysql-test/t/im_daemon_life_cycle.imtest:
        Polishing: add more comments, be more verbose.
      mysql-test/t/im_life_cycle.imtest:
        Polishing: be more verbose.
      mysql-test/t/im_utils.imtest:
        Polishing: be more verbose.
      mysql-test/t/kill_n_check.sh:
        Log messages to the extrenal file so that they can be analyzed
        if test case failed.
      mysql-test/t/wait_for_process.sh:
        Log messages to the extrenal file so that they can be analyzed
        if test case failed.
      mysql-test/t/wait_for_socket.sh:
        Log messages to the extrenal file so that they can be analyzed
        if test case failed.
      mysql-test/t/log.sh:
        Dummy script to facilitate logging from test-scripts.
      mysql-test/t/utils.sh:
        A bunch of auxilary functions to facilitate logging.
      cf9038e9
    • unknown's avatar
      Merge mysqldev@production.mysql.com:my/mysql-5.0-release · 3d033fb3
      unknown authored
      into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
      
      
      3d033fb3
    • unknown's avatar
      Many files: · e09f0cb9
      unknown authored
        Adjuster project files to reflect move of "mySTL" directory
      
      
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/taocrypt/taocrypt.dsp:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/taocrypt/taocrypt.vcproj:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/taocrypt/test.dsp:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/testsuite/testsuite.dsp:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/yassl.dsp:
        Adjuster project files to reflect move of "mySTL" directory
      extra/yassl/yassl.vcproj:
        Adjuster project files to reflect move of "mySTL" directory
      e09f0cb9
    • unknown's avatar
      Added option --mtr-build-thread to mysql-test-run.pl · 52fc261b
      unknown authored
      Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
      Added connect timeout to test to make im_daemon_life_cycle more predictable
      
      
      mysql-test/mysql-test-run.pl:
        Added option --mtr-build-thread
        Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
      mysql-test/t/wait_for_socket.sh:
        Added connect timeout (to make test predictable)
      52fc261b
    • unknown's avatar
      Added some missing DBUG_RETURN · 42f6fd5f
      unknown authored
      Fixed that --valgrind works again with mysql-test-run.sh
      Extended error messages when loosing connection during mysql_real_connect()
      
      
      client/mysqldump.c:
        Added some missing DBUG_RETURN
      include/errmsg.h:
        Extended error messages when loosing connection during mysql_real_connect()
      libmysql/errmsg.c:
        Extended error messages when loosing connection during mysql_real_connect()
      mysql-test/mysql-test-run.pl:
        Don't remove .reject files at startup
      mysql-test/mysql-test-run.sh:
        Fixed that --valgrind works again
        Don't give warnings for directores in var/tmp
      sql-common/client.c:
        Extended error messages when loosing connection during mysql_real_connect()
      42f6fd5f
    • unknown's avatar
      46721030
    • unknown's avatar
      Build fixes for NetWare · 63512802
      unknown authored
      63512802
    • unknown's avatar
      Fix my_system_gmt_sec function declaration to be same as definition · c9cc82f2
      unknown authored
      
      sql-common/my_time.c:
        Function declaration must be same as definition
      c9cc82f2
  6. 22 Nov, 2006 1 commit