1. 30 Nov, 2006 1 commit
    • unknown's avatar
      Fixed portability issue in my_thr_init.c (was added in my last push) · 7191e775
      unknown authored
      Fixed compiler warnings (detected by VC++):
      - Removed not used variables
      - Added casts
      - Fixed wrong assignments to bool
      - Fixed wrong calls with bool arguments
      - Added missing argument to store(longlong), which caused wrong store method to be called.
      
      
      
      client/mysqldump.c:
        Removed compiler warning
      heap/hp_clear.c:
        Removed compiler warning
      include/my_global.h:
        Removed compiler warning
      include/my_tree.h:
        Changed memory limits from int to ulong
        (Allowed me to get rid of some compiler warnings)
      myisam/mi_create.c:
        Removed compiler warning
      myisam/myisampack.c:
        Removed compiler warning
      mysys/base64.c:
        Removed compiler warning
      mysys/my_thr_init.c:
        Fixed portability issue (detected on windows)
        Added DBUG_ASSERT to detect if we call my_thread_end() too many times
        Don't wait if THR_thread_count == -1 (error condition)
      mysys/tree.c:
        Removed compiler warning
      sql/field.cc:
        Removed compiler warning
        Fixed wrong parameter to check_date()
        Added missing argument to store(longlong)
      sql/ha_archive.cc:
        Removed compiler warning
      sql/ha_federated.cc:
        Removed compiler warning
      sql/ha_innodb.cc:
        Removed not used variable
      sql/handler.cc:
        Removed not used variable
        Fixed wrong if (we didn't detect if rollback or commit failed). Not critical as value is not yet used
      sql/item.cc:
        Removed compiler warning
      sql/item_func.cc:
        Removed compiler warning
      sql/item_strfunc.cc:
        Removed compiler warning
      sql/item_timefunc.cc:
        Removed compiler warning
      sql/log.cc:
        Removed compiler warning
      sql/mysql_priv.h:
        Removed compiler warning
      sql/opt_range.cc:
        Removed compiler warning
      sql/password.c:
        Removed compiler warning
      sql/set_var.cc:
        Removed compiler warning
      sql/slave.cc:
        Removed compiler warning
      sql/sp.cc:
        Removed compiler warning
      sql/sp_cache.cc:
        Removed compiler warning
      sql/sp_head.cc:
        Removed compiler warning
        Adjusted argument to reserve() to not use up too much memory that we are probably not going to need
      sql/sql_acl.cc:
        Added missing argument to store(longlong)
      sql/sql_base.cc:
        Removed compiler warning
      sql/sql_db.cc:
        Removed compiler warning
      sql/sql_delete.cc:
        Removed compiler warning
      sql/sql_handler.cc:
        Removed not used variable
      sql/sql_lex.h:
        Removed not used variable
      sql/sql_prepare.cc:
        Removed not used variable
      sql/sql_rename.cc:
        Removed not used variable
      sql/sql_select.cc:
        Fixed that select_options are not 'cut'
        Removed some not used variables
        Removed compiler warnings by adding cast
      sql/sql_show.cc:
        Removed not used variables
        Added missing argument to store(longlong)
        Removed compiler warnings
      sql/sql_trigger.cc:
        Removed not used variables
        Added cast to remove compiler warnings
      sql/sql_update.cc:
        Fixed wrong set of bool variable
      sql/sql_view.cc:
        Removed not used variables
        Added cast to get rid of compiler warnings
      sql-common/client.c:
        Fixed compiler warning
      sql-common/my_time.c:
        Fixed wrong argument to check_date()
        Added casts to get rid of compiler warnings
      sql/sql_yacc.yy:
        Removed not used variable
      sql/uniques.cc:
        Changes memory size from uint to ulong
        Added casts to get rid of compiler warnings
      strings/ctype-simple.c:
        Fixed cast to get rid of compiler warnings
      7191e775
  2. 29 Nov, 2006 7 commits
    • unknown's avatar
      Ignore some generated files · 42fd48da
      unknown authored
      Don't return from my_thread_global_end() until all threads have called my_thread_end()
      Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
      
      
      BitKeeper/etc/ignore:
        added *.gcda *.gcno
      include/my_pthread.h:
        Added my_thread_end_wait_time
        Removed not used thread variables
      mysys/my_thr_init.c:
        Add thread counters.
        Don't return from my_thread_global_end() until all threads have called my_thread_end()
        (Or a timeout (5 seconds) has elapsed)
        This fixed some valgrind warnings
        Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
      42fd48da
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ae9e9a5
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      sql/item_sum.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      6ae9e9a5
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/mysql-4.1-build · ea7559ce
      unknown authored
      into  mysql.com:/home/kent/bk/mysql-5.0-build
      
      
      ea7559ce
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · d765ed0c
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
      
      
      d765ed0c
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · e0bf8da9
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      e0bf8da9
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · abb3dfc4
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      abb3dfc4
    • unknown's avatar
      minor fix · 3344298d
      unknown authored
      
      mysql-test/mysql-test-run.pl:
        remove dependency on Data::Dumper, it's not used anywhere
      3344298d
  3. 28 Nov, 2006 8 commits
    • 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
  4. 27 Nov, 2006 12 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
      Increased heap max length to > 4G for 64 bit machines · 129a48b0
      unknown authored
      Initialize key_part->type on open. This caused key_copy() to fail for bit_fields. (key_copy is used in HANDLER and opt_range)
      
      
      include/heap.h:
        Increased heap max length to > 4G for 64 bit machines
      mysql-test/r/show_check.result:
        Updated results after heap size change
      mysql-test/r/type_bit.result:
        Added test for bug in bit field handling (in handler and opt_range.cc)
      mysql-test/t/type_bit.test:
        Added test for bug in bit field handling (in handler and opt_range.cc)
      sql/ha_heap.cc:
        Increased heap max length to > 4G for 64 bit machines
      sql/item_sum.cc:
        Increased heap max length to > 4G for 64 bit machines
      sql/mysqld.cc:
        Increased heap max length to > 4G for 64 bit machines
      sql/set_var.cc:
        Increased heap max length to > 4G for 64 bit machines
      sql/sql_class.h:
        Increased heap max length to > 4G for 64 bit machines
      sql/sql_select.cc:
        Increased heap max length to > 4G for 64 bit machines
      sql/table.cc:
        Initialize key_part->type ; This was used for bit fields but only set in temporary tables
      sql/uniques.cc:
        Increased heap max length to > 4G for 64 bit machines
      129a48b0
    • 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
  5. 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
  6. 23 Nov, 2006 7 commits
    • 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
  7. 21 Nov, 2006 2 commits