1. 30 May, 2006 1 commit
  2. 22 May, 2006 9 commits
  3. 21 May, 2006 6 commits
  4. 20 May, 2006 8 commits
    • unknown's avatar
      Merge · f3de1b85
      unknown authored
      f3de1b85
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ed7e869b
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
      
      
      ed7e869b
    • unknown's avatar
      Merge · ddd9fbac
      unknown authored
      
      support-files/mysql.spec.sh:
        SCCS merged
      ddd9fbac
    • unknown's avatar
      mysql.spec.sh: · 65fcdee5
      unknown authored
        Always compile position independent
      
      
      support-files/mysql.spec.sh:
        Always compile position independent
      65fcdee5
    • unknown's avatar
      Makefile.am: · b0b60840
      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
      b0b60840
    • unknown's avatar
      Many files: · ce3dc8ba
      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--
      ce3dc8ba
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6609b5be
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      6609b5be
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-clean · 650fea23
      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
      650fea23
  5. 19 May, 2006 16 commits