1. 28 Nov, 2006 1 commit
    • 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
  2. 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
  3. 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
  4. 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
  5. 21 Nov, 2006 2 commits
  6. 20 Nov, 2006 3 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 88696530
      unknown authored
      into  mysql.com:/home/my/mysql-5.0
      
      
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_repl.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      88696530
    • unknown's avatar
      Remove compiler warnings · 14decc4f
      unknown authored
      (Mostly in DBUG_PRINT() and unused arguments)
      Fixed bug in query cache when used with traceing (--with-debug)
      Fixed memory leak in mysqldump
      Removed warnings from mysqltest scripts (replaced -- with #)
      
      
      BitKeeper/etc/ignore:
        added mysql-test/r/*.warnings
      BUILD/SETUP.sh:
        Don't build with BDB as default
      client/client_priv.h:
        Added OPT_DEBUG_INFO
      client/mysqlbinlog.cc:
        Fixed compiler warning
      client/mysqldump.c:
        Removed compiler warnings
        Added option --debug-info to detect memory leaks
        Fixed memory leak
        Don't backup cluster replication tables (if used with 5.1)
      cmd-line-utils/readline/bind.c:
        Fixed compiler warning
      cmd-line-utils/readline/chardefs.h:
        Fixed compiler warning
      cmd-line-utils/readline/complete.c:
        Fixed compiler warning
      cmd-line-utils/readline/display.c:
        Fixed compiler warning
      cmd-line-utils/readline/histexpand.c:
        Fixed compiler warning
      cmd-line-utils/readline/input.c:
        Fixed compiler warning
      cmd-line-utils/readline/isearch.c:
        Fixed compiler warning
      cmd-line-utils/readline/kill.c:
        Fixed compiler warning
      cmd-line-utils/readline/macro.c:
        Fixed compiler warning
      cmd-line-utils/readline/misc.c:
        Fixed compiler warning
      cmd-line-utils/readline/nls.c:
        Fixed compiler warning
      cmd-line-utils/readline/readline.c:
        Fixed compiler warning
      cmd-line-utils/readline/rltty.c:
        Fixed compiler warning
      cmd-line-utils/readline/search.c:
        Fixed compiler warning
      cmd-line-utils/readline/terminal.c:
        Fixed compiler warning
      cmd-line-utils/readline/text.c:
        Fixed compiler warning
      cmd-line-utils/readline/tilde.c:
        Fixed compiler warning
      cmd-line-utils/readline/undo.c:
        Fixed compiler warning
      cmd-line-utils/readline/util.c:
        Fixed compiler warning
      cmd-line-utils/readline/vi_mode.c:
        Fixed compiler warning
      dbug/dbug_analyze.c:
        Fixed compiler warning
      extra/yassl/src/ssl.cpp:
        Fixed compiler warning
      extra/yassl/testsuite/testsuite.cpp:
        Fixed compiler warning
      heap/_check.c:
        Fixed compiler warning
      heap/hp_delete.c:
        Fixed compiler warning
      heap/hp_hash.c:
        Fixed compiler warning
      heap/hp_open.c:
        Fixed compiler warning
      heap/hp_rkey.c:
        Fixed compiler warning
      heap/hp_rrnd.c:
        Fixed compiler warning
      heap/hp_write.c:
        Fixed compiler warning
      libmysql/libmysql.c:
        Fixed compiler warning
      libmysqld/libmysqld.c:
        Fixed compiler warning
      myisam/mi_close.c:
        Fixed compiler warning
      myisam/mi_delete.c:
        Fixed compiler warning
      myisam/mi_dynrec.c:
        Fixed compiler warning
      myisam/mi_keycache.c:
        Fixed compiler warning
      myisam/mi_page.c:
        Fixed compiler warning
      myisam/mi_statrec.c:
        Fixed compiler warning
      myisam/mi_test2.c:
        Fixed compiler warning
      myisam/mi_write.c:
        Fixed compiler warning
      myisam/myisampack.c:
        Fixed compiler warning
      myisammrg/myrg_extra.c:
        Fixed compiler warning
      mysql-test/mysql-test-run.pl:
        Remove .reject, .progress, .log and .warnings flag at start
        cluster -> mysql database (for 5.1)
      mysql-test/include/federated.inc:
        Remove mysqltest warnings
      mysql-test/include/sp-vars.inc:
        Remove mysqltest warnings
      mysql-test/mysql-test-run.sh:
        Fix so that 'make test' works again
        Remove .reject, .progress .log and .warnings files at startup
      mysql-test/r/ctype_cp1250_ch.result:
        Drop used tables at startup
      mysql-test/t/create.test:
        Remove mysqltest warnings
      mysql-test/t/csv.test:
        Remove mysqltest warnings
      mysql-test/t/ctype_collate.test:
        Remove mysqltest warnings
      mysql-test/t/ctype_cp1250_ch.test:
        Drop used tables at startup
      mysql-test/t/ctype_ucs.test:
        Remove mysqltest warnings
      mysql-test/t/func_sapdb.test:
        Remove mysqltest warnings
      mysql-test/t/func_str.test:
        Remove mysqltest warnings
      mysql-test/t/grant.test:
        Remove mysqltest warnings
      mysql-test/t/greedy_optimizer.test:
        Remove mysqltest warnings
      mysql-test/t/group_min_max.test:
        Remove mysqltest warnings
      mysql-test/t/innodb.test:
        Remove mysqltest warnings
      mysql-test/t/join.test:
        Remove mysqltest warnings
      mysql-test/t/limit.test:
        Remove mysqltest warnings
      mysql-test/t/null.test:
        Remove mysqltest warnings
      mysql-test/t/select.test:
        Remove mysqltest warnings
      mysql-test/t/sp-prelocking.test:
        Remove mysqltest warnings
      mysql-test/t/strict.test:
        Remove mysqltest warnings
      mysql-test/t/subselect.test:
        Remove mysqltest warnings
      mysql-test/t/type_newdecimal.test:
        Remove mysqltest warnings
      mysql-test/t/view_grant.test:
        Remove mysqltest warnings
      mysys/default.c:
        Fixed compiler warning
      mysys/hash.c:
        Fixed compiler warning
      mysys/list.c:
        Fixed compiler warning
      mysys/mf_iocache.c:
        Fixed compiler warning
      mysys/mf_keycache.c:
        Fixed compiler warning
      mysys/mf_keycaches.c:
        Fixed compiler warning
      mysys/my_alloc.c:
        Fixed compiler warning
      mysys/my_dup.c:
        Fixed compiler warning
      mysys/my_fopen.c:
        Fixed compiler warning
      mysys/my_fstream.c:
        Fixed compiler warning
      mysys/my_getwd.c:
        Fixed compiler warning
      mysys/my_handler.c:
        Fixed compiler warning
        Added missing enums in switch
      mysys/my_lib.c:
        Fixed compiler warning
      mysys/my_lread.c:
        Fixed compiler warning
      mysys/my_lwrite.c:
        Fixed compiler warning
      mysys/my_malloc.c:
        Fixed compiler warning
      mysys/my_pread.c:
        Fixed compiler warning
      mysys/my_read.c:
        Fixed compiler warning
      mysys/my_realloc.c:
        Fixed compiler warning
      mysys/my_seek.c:
        Fixed compiler warning
      mysys/my_write.c:
        Fixed compiler warning
      mysys/safemalloc.c:
        Fixed compiler warning
      mysys/thr_lock.c:
        Fixed compiler warning
      mysys/tree.c:
        Fixed compiler warning
      mysys/typelib.c:
        Fixed compiler warning
      ndb/include/logger/LogHandler.hpp:
        Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
      ndb/include/ndb_global.h.in:
        Added LINT_SET_PTR macro to be able to remove some compiler warnings
      ndb/include/util/InputStream.hpp:
        Fixed compiler warning
      ndb/include/util/OutputStream.hpp:
        Fixed compiler warning
      ndb/include/util/SimpleProperties.hpp:
        Fixed compiler warning
      ndb/src/common/debugger/EventLogger.cpp:
        remove if on 'signal' as this is a function pointer and is always true
      ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
        Add missing enums
      ndb/src/common/logger/LogHandler.cpp:
        Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
      ndb/src/common/portlib/NdbMutex.c:
        Fixed compiler warning
      ndb/src/common/portlib/NdbThread.c:
        Fixed compiler warning
      ndb/src/common/transporter/Transporter.cpp:
        Swapped arguments to remove compiler warnings
      ndb/src/cw/cpcd/CPCD.hpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/backup/Backup.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
        Fixed compiler warning
      ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
        Added missing enums
      ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
        Fixed compiler warning
      ndb/src/kernel/error/ErrorReporter.cpp:
        Fixed compiler warning
      ndb/src/kernel/error/ErrorReporter.hpp:
        Fixed compiler warning
      ndb/src/kernel/error/ndbd_exit_codes.c:
        Fixed compiler warning
      ndb/src/kernel/vm/TransporterCallback.cpp:
        Fixed compiler warning
      ndb/src/mgmapi/mgmapi.cpp:
        Fixed compiler warning
      ndb/src/mgmclient/CommandInterpreter.cpp:
        Fixed compiler warning
      ndb/src/mgmsrv/MgmtSrvr.cpp:
        Fixed compiler warning
      ndb/src/mgmsrv/Services.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/ClusterMgr.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/DictCache.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndb.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationDefine.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationExec.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationInt.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbOperationSearch.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/NdbTransaction.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndbif.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/Ndbinit.cpp:
        Fixed compiler warning
      ndb/src/ndbapi/ndb_cluster_connection.cpp:
        Fixed compiler warning
      ndb/tools/drop_index.cpp:
        Fixed compiler warning
      ndb/tools/drop_tab.cpp:
        Fixed compiler warning
      ndb/tools/ndb_config.cpp:
        Fixed compiler warning
      regex/regexec.c:
        Fixed compiler warning
      server-tools/instance-manager/mysql_connection.cc:
        Fixed compiler warning
      sql/Makefile.am:
        Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse
      sql/filesort.cc:
        Fixed compiler warning
      sql/ha_archive.cc:
        Fixed compiler warning
      sql/ha_federated.cc:
        Fixed compiler warning
      sql/ha_federated.h:
        Fixed compiler warning
      sql/ha_innodb.cc:
        Fixed compiler warning
      sql/ha_myisam.cc:
        Fixed compiler warning
      sql/ha_myisammrg.cc:
        Fixed compiler warning
      sql/ha_ndbcluster.cc:
        Fixed compiler warning
      sql/handler.cc:
        Fixed compiler warning
      sql/item_cmpfunc.cc:
        Fixed compiler warning
      sql/item_subselect.cc:
        Fixed compiler warning
      sql/item_timefunc.cc:
        Fixed compiler warning
      sql/log_event.cc:
        Fixed compiler warning
      sql/mysqld.cc:
        Fixed compiler warning
      sql/net_serv.cc:
        Fixed compiler warning
      sql/opt_range.cc:
        Fixed compiler warning
        Formated DBUG statements to be as rest of code
      sql/slave.cc:
        Fixed compiler warning
      sql/sql_acl.cc:
        Fixed compiler warning
      sql/sql_cache.cc:
        Fixed compiler warning
        Fixed bug in query cache when used with DBUG traceing
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_class.h:
        Fixed compiler warning
      sql/sql_delete.cc:
        Fixed compiler warning
      sql/sql_parse.cc:
        Fixed compiler warning
        Hack to fix my_sprintf() strings with %b
      sql/sql_prepare.cc:
        Fixed compiler warning
        Hack to fix my_sprintf() strings with %b
      sql/sql_repl.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Fixed compiler warning
      sql/sql_update.cc:
        Fixed compiler warning
      sql/sql_view.cc:
        Fixed compiler warning
      sql/strfunc.cc:
        Fixed compiler warning
      sql-common/client.c:
        Fixed compiler warning
      sql-common/my_time.c:
        Fixed compiler warning
      sql/table.cc:
        Fixed compiler warning
      sql/tztime.cc:
        Fixed compiler warning
      sql/unireg.cc:
        Fixed compiler warning
      strings/decimal.c:
        Fixed compiler warning
      tests/mysql_client_test.c:
        Fixed compiler warning
      vio/viosocket.c:
        Fixed compiler warning
      vio/viossl.c:
        Fixed compiler warning
      vio/viosslfactories.c:
        Fixed compiler warning
      14decc4f
    • unknown's avatar
      mysql_client_test not found when running from binary dist · 6eaed857
      unknown authored
      Look in bin for myql_client_test executable
      
      
      6eaed857
  7. 19 Nov, 2006 2 commits
  8. 17 Nov, 2006 8 commits
    • unknown's avatar
      adaption from 4.1 · 880b4e87
      unknown authored
      880b4e87
    • unknown's avatar
      MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690) · c3d6927d
      unknown authored
      
      mysql-test/lib/mtr_unique.pl:
        Library file used by mysql-test-run.pl to determine unique test run identifiers.
      c3d6927d
    • unknown's avatar
      Merge trift2.:/MySQL/M50/yassl-win-5.0 · 94d7389b
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      94d7389b
    • unknown's avatar
      Maintain the (old) VC project files, ehere yaSSL is concerned: · 26dee875
      unknown authored
      "mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
      
      
      extra/yassl/taocrypt/benchmark/benchmark.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/taocrypt.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/taocrypt.vcproj:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/taocrypt/test.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/testsuite/testsuite.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/yassl.dsp:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      extra/yassl/yassl.vcproj:
        "mySTL" has become a subdirectory of "taocrypt", was a sibling previously - adapt.
      26dee875
    • unknown's avatar
      ABI fix · a3d04155
      unknown authored
      
      include/mysql_h.ic:
        this one should actually be removed from the ABI
      a3d04155
    • unknown's avatar
      merging · 3ebdcee5
      unknown authored
      3ebdcee5
    • unknown's avatar
      merging · bde03bce
      unknown authored
      bde03bce
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · 96ad04de
      unknown authored
      into  mysql.com:/home/hf/work/mysql-5.0-0mrg
      
      
      BitKeeper/deleted/.del-mysql_client.test:
        Auto merged
      include/mysql.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      mysql-test/r/order_by.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/type_newdecimal.result:
        Auto merged
      mysql-test/t/flush.test:
        Auto merged
      mysql-test/t/flush_block_commit.test:
        Auto merged
      mysql-test/t/innodb-deadlock.test:
        Auto merged
      mysql-test/t/innodb-lock.test:
        Auto merged
      mysql-test/t/lock_multi.test:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/rename.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      mysql-test/t/status.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      mysql-test/t/type_newdecimal.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/item_sum.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/item_timefunc.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/protocol.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      Makefile.am:
        merging
      client/mysqltest.c:
        merging
      include/my_time.h:
        merging
      libmysql/libmysql.c:
        merging
      mysql-test/t/order_by.test:
        merging
      96ad04de
  9. 16 Nov, 2006 3 commits