lab.nexedi.com will be down from Thursday, 20 March 2025, 07:30:00 UTC for a duration of approximately 2 hours

  1. 22 May, 2006 13 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 1933c842
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1
      
      1933c842
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ba5ff73b
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      ba5ff73b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-new · 7daaa0ad
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/mysql-5.1
      
      7daaa0ad
    • unknown's avatar
      Merge mysql.com:/home/kgeorge/mysql/5.0/B18745 · 595a4450
      unknown authored
      into  mysql.com:/home/kgeorge/mysql/5.1/B18745
      
      
      mysql-test/r/func_group.result:
        Auto merged
      595a4450
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main · 53c84338
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
      
      
      storage/ndb/src/kernel/vm/Configuration.cpp:
        Auto merged
      53c84338
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 2ef88795
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      2ef88795
    • unknown's avatar
      7965cdcb
    • unknown's avatar
      Merge jonas@perch:src/mysql-5.0 · 09eb3763
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
      
      09eb3763
    • unknown's avatar
      Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import · 41c74180
      unknown authored
      into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
      
      41c74180
    • unknown's avatar
      Import from yaSSL · 5e1b6209
      unknown authored
      Fixes for HPUX etc. 
      Don't define exceptions operator new on hpux as the linker will look for the function
      
      
      extra/yassl/examples/echoserver/echoserver.cpp:
        Import patch yassl.diff
      extra/yassl/include/openssl/ssl.h:
        Import patch yassl.diff
      extra/yassl/include/socket_wrapper.hpp:
        Import patch yassl.diff
      extra/yassl/src/handshake.cpp:
        Import patch yassl.diff
      extra/yassl/src/socket_wrapper.cpp:
        Import patch yassl.diff
      extra/yassl/src/ssl.cpp:
        Import patch yassl.diff
      extra/yassl/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/src/timer.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_error.cpp:
        Import patch yassl.diff
      extra/yassl/src/yassl_int.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/block.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/md4.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/include/runtime.hpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/md4.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/src/template_instnt.cpp:
        Import patch yassl.diff
      extra/yassl/taocrypt/taocrypt.dsp:
        Import patch yassl.diff
      extra/yassl/taocrypt/test/test.cpp:
        Import patch yassl.diff
      extra/yassl/testsuite/test.hpp:
        Import patch yassl.diff
      extra/yassl/mySTL/stdexcept.hpp:
        Don't define exceptions operator new on hpux as the linker will look for the function
      extra/yassl/taocrypt/src/Makefile.am:
        Add md4.cpp to Makefile.am
      5e1b6209
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 2b600259
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.1/new
      
      
      storage/ndb/src/common/util/socket_io.cpp:
        Auto merged
      2b600259
    • unknown's avatar
      Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987 · d8b05e0b
      unknown authored
      into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
      
      d8b05e0b
    • unknown's avatar
      Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration · f09e3e94
      unknown authored
      Moved the InnoDB related test from func_group.test to innodb_mysql.test
      
      
      mysql-test/r/func_group.result:
        Moved a test to innodb_mysql
      mysql-test/r/innodb_mysql.result:
        moved a test to innodb_mysql
      mysql-test/t/func_group.test:
        Moved a test to innodb_mysql
      mysql-test/t/innodb_mysql.test:
        Moved a test to innodb_mysql
      f09e3e94
  2. 21 May, 2006 6 commits
  3. 20 May, 2006 8 commits
    • unknown's avatar
      Merge · ef523c08
      unknown authored
      ef523c08
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5199c9d9
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      5199c9d9
    • unknown's avatar
      Merge · 3d590258
      unknown authored
      
      support-files/mysql.spec.sh:
        SCCS merged
      3d590258
    • unknown's avatar
      mysql.spec.sh: · 16b027ee
      unknown authored
        Always compile position independent
      
      
      support-files/mysql.spec.sh:
        Always compile position independent
      16b027ee
    • unknown's avatar
      Makefile.am: · e020aed4
      unknown authored
        Specify yaSSL .a file, not .la (bug#19966)
        Don't use Mac OS X "__.SYMDEF SORTED" file in archives
      
      
      libmysqld/Makefile.am:
        Specify yaSSL .a file, not .la (bug#19966)
        Don't use Mac OS X "__.SYMDEF SORTED" file in archives
      e020aed4
    • unknown's avatar
      Many files: · 0f01fd3b
      unknown authored
        Change mode to -rw-rw-r--
      
      
      mysql-test/r/archive_bitfield.result:
        Change mode to -rw-rw-r--
      mysql-test/r/binlog_row_binlog.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ctype_cp932_binlog_row.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_bugs.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_logs_tests.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_microsec.result:
        Change mode to -rw-rw-r--
      mysql-test/r/events_stress.result:
        Change mode to -rw-rw-r--
      mysql-test/r/federated_transactions.result:
        Change mode to -rw-rw-r--
      mysql-test/r/myisam-system.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_config2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_dd_ddl.result:
        Change mode to -rw-rw-r--
      mysql-test/r/ndb_dd_disk2memory.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_insert_id_pk.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_2innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_2myisam.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_blob.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_blob2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_charset.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_dd_advance.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_func003.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_log.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_multi_update2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_multi_update3.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_relayrotate.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_row_001.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_sp006.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_UUID.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_ndb_trig004.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_relay_space_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_blob_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_blob_myisam.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_log_innodb.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_row_mysqlbinlog.result:
        Change mode to -rw-rw-r--
      mysql-test/r/rpl_stm_EE_err2.result:
        Change mode to -rw-rw-r--
      mysql-test/r/type_newdecimal-big.result:
        Change mode to -rw-rw-r--
      mysql-test/t/binlog_row_mix_innodb_myisam-master.opt:
        Change mode to -rw-rw-r--
      mysql-test/t/events_logs_tests-master.opt:
        Change mode to -rw-rw-r--
      mysql-test/t/rpl_ndb_commit_afterflush.test:
        Change mode to -rw-rw-r--
      mysql-test/t/rpl_ndb_insert_ignore.test:
        Change mode to -rw-rw-r--
      plugin/fulltext/AUTHORS:
        Change mode to -rw-rw-r--
      plugin/fulltext/ChangeLog:
        Change mode to -rw-rw-r--
      plugin/fulltext/NEWS:
        Change mode to -rw-rw-r--
      plugin/fulltext/README:
        Change mode to -rw-rw-r--
      plugin/fulltext/configure.in:
        Change mode to -rw-rw-r--
      storage/archive/plug.in:
        Change mode to -rw-rw-r--
      storage/example/plug.in:
        Change mode to -rw-rw-r--
      0f01fd3b
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d094c8d
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      7d094c8d
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 328fa1ff
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.1-clean
      
      
      include/my_pthread.h:
        Auto merged
      mysql-test/r/func_str.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/variables.result:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      mysql-test/t/rpl_temporary.test:
        Auto merged
      mysql-test/t/variables.test:
        Auto merged
      mysql-test/t/view.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      storage/ndb/test/ndbapi/Makefile.am:
        Auto merged
      storage/ndb/test/ndbapi/testInterpreter.cpp:
        Auto merged
      sql/set_var.cc:
        Resolve conflict
      storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
        Resolve conflict
      328fa1ff
  4. 19 May, 2006 13 commits