An error occurred fetching the project authors.
  1. 12 Feb, 2006 12 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0dbf883a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
      
      
      mysql-test/lib/mtr_process.pl:
        Auto merged
      0dbf883a
    • unknown's avatar
      disabled.def: · 53e07945
      unknown authored
        Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved
      
      
      mysql-test/t/disabled.def:
        Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved
      53e07945
    • unknown's avatar
      Merge · bd56dd7e
      unknown authored
      VC++Files/libmysqld/libmysqld.vcproj:
        Auto merged
      bd56dd7e
    • unknown's avatar
      disabled.def: · 5baf17fe
      unknown authored
        Disabled 'rpl_until' until 15886 is solved
      libmysqld.vcproj:
        Added "my_user.c"
      
      
      VC++Files/libmysqld/libmysqld.vcproj:
        Added "my_user.c"
      mysql-test/t/disabled.def:
        Disabled 'rpl_until' until 15886 is solved
      5baf17fe
    • unknown's avatar
      fix race condition in the log_tables test · 98344710
      unknown authored
      mysql-test/t/log_tables.test:
        fix race condidtion
      98344710
    • unknown's avatar
      Merge · 11ba97eb
      unknown authored
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      11ba97eb
    • unknown's avatar
      Merge · 4e8f2a12
      unknown authored
      mysql-test/lib/mtr_cases.pl:
        Auto merged
      mysql-test/lib/mtr_process.pl:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/spatial.cc:
        Auto merged
      4e8f2a12
    • unknown's avatar
      spatial.cc: · 0f3d8813
      unknown authored
        Added { ... } around float8get() macro, avoids VC7 error
        message "illegal else without matching if"
      mtr_report.pl:
        Parse error logs to create "warnings" file
      mtr_cases.pl:
        Added optoion --ignore-disabled-def
        Windows build now let TZ pass, removed
        work around
      mysql-test-run.pl, mtr_process.pl:
        Back port of changes from 5.0
      
      
      mysql-test/lib/mtr_process.pl:
        Back port of changes from 5.0
      mysql-test/mysql-test-run.pl:
        Back port of changes from 5.0
      mysql-test/lib/mtr_cases.pl:
        Added optoion --ignore-disabled-def
        Windows build now let TZ pass, removed
        work around
      mysql-test/lib/mtr_report.pl:
        Parse error logs to create "warnings" file
      sql/spatial.cc:
        Added { ... } around float8get() macro, avoids VC7 error
        message "illegal else without matching if"
      0f3d8813
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new · dc11d498
      unknown authored
      into  zim.tangent.org:/home/brian/raid/mysql-5.1-new
      
      
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_partition.cc:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/lex.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/sql_yacc.yy:
        SCCS merged
      dc11d498
    • unknown's avatar
      This patch is to further remove the RAID code. We removed support for people... · 88aa9b13
      unknown authored
      This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 
      
      
      sql/ha_myisam.cc:
        Remove RAID code
      sql/ha_partition.cc:
        Remove RAID code.
      sql/handler.h:
        Remove RAID code
      sql/lex.h:
        Remove RAID code.
      sql/mysqld.cc:
        Remove RAID code.
      sql/set_var.cc:
        Remove RAID code.
      sql/sql_show.cc:
        Remove RAID code
      sql/sql_yacc.yy:
        Remove more of the RAID code
      sql/table.cc:
        Remove RAID code.
      88aa9b13
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 · e1474218
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      scripts/make_binary_distribution.sh:
        Auto merged
      e1474218
    • unknown's avatar
      make_binary_distribution.sh: · cd93a5aa
      unknown authored
        print => echo in shell script
      
      
      scripts/make_binary_distribution.sh:
        print => echo in shell script
      cd93a5aa
  2. 11 Feb, 2006 9 commits
  3. 10 Feb, 2006 19 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 0ced4fdd
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      0ced4fdd
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · b5236ea7
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
      
      
      b5236ea7
    • unknown's avatar
      WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX · 5e68e501
      unknown authored
      After merge fix.
      
      
      5e68e501
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 0e470acb
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      0e470acb
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1 · 9ed7a2f3
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      9ed7a2f3
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.1 · f6f615b3
      unknown authored
      into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
      
      
      mysql-test/r/create_select_tmp.result:
        Auto merged
      mysql-test/r/heap_hash.result:
        Auto merged
      mysql-test/r/innodb.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/r/ndb_index_unique.result:
        Auto merged
      mysql-test/r/rpl_loaddata.result:
        Auto merged
      mysql-test/r/sp-error.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/sp_trans.result:
        Auto merged
      mysql-test/r/type_bit.result:
        Auto merged
      mysql-test/r/type_varchar.result:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/share/errmsg.txt:
        Auto merged
      mysql-test/r/heap.result:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Manual merge
      mysql-test/r/rpl_err_ignoredtable.result:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Manual merge
      mysql-test/r/rpl_insert_id.result:
        WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
        Manual merge
      f6f615b3
    • unknown's avatar
      mysql-test-run.pl: · 8824fd1c
      unknown authored
        Display instance manager port
      mysql-test-run.sh:
        Give port space for more than one slave
      
      
      mysql-test/mysql-test-run.sh:
        Give port space for more than one slave
      mysql-test/mysql-test-run.pl:
        Display instance manager port
      8824fd1c
    • unknown's avatar
      Merge · a183a425
      unknown authored
      mysql-test/mysql-test-run.sh:
        Auto merged
      ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Rearranged the port numbers to fit into the range
      a183a425
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · 34d8502a
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-4.1
      
      
      34d8502a
    • unknown's avatar
      Merge mysql.com:/home/cps/mysql/devel/5.0-mike · 2449ef8f
      unknown authored
      into  mysql.com:/home/cps/mysql/devel/5.1-merge
      
      
      mysql-test/r/im_life_cycle.result:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      server-tools/instance-manager/commands.cc:
        Auto merged
      2449ef8f
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2b4e18f
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      b2b4e18f
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 3e97cc95
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      3e97cc95
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 36bfd749
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/ndb_basic.result:
        Auto merged
      mysql-test/t/ndb_basic.test:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
        Auto merged
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      sql/ha_ndbcluster.cc:
        SCCS merged
      sql/ha_ndbcluster.h:
        SCCS merged
      36bfd749
    • unknown's avatar
      manual merge · a45c39e7
      unknown authored
      a45c39e7
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9a68ba18
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
      
      
      9a68ba18
    • unknown's avatar
      Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 76d98963
      unknown authored
      into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      sql/ha_ndbcluster.h:
        Auto merged
      mysql-test/r/ndb_basic.result:
        manual merge
      mysql-test/t/ndb_basic.test:
        manual merge
      sql/ha_ndbcluster.cc:
        manual merge
      76d98963
    • unknown's avatar
      Bug #17249 ndb, delete statement with join where clause fails when table do not have pk · 26287714
      unknown authored
      Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key
      
      change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      
      
      mysql-test/r/ndb_basic.result:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      mysql-test/t/ndb_basic.test:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
      sql/ha_ndbcluster.cc:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      sql/ha_ndbcluster.h:
        Bug #17249 delete statement with join where clause fails when table do not have pk
        Bug #17257 update fails for inner joins if tables do not have Primary Key
        
        change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
      26287714
    • unknown's avatar
      fix test of bug 12744 on OSX · 2a098077
      unknown authored
      2a098077
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 553750f6
      unknown authored
      into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      553750f6