An error occurred fetching the project authors.
  1. 18 Jan, 2007 1 commit
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 8ca95b84
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
      
      
      configure.in:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/buf/buf0flu.c:
        Auto merged
      storage/innobase/buf/buf0lru.c:
        Auto merged
      storage/innobase/include/buf0buf.h:
        Auto merged
      storage/innobase/include/buf0buf.ic:
        Auto merged
      storage/innobase/include/sync0arr.h:
        Auto merged
      storage/innobase/include/sync0rw.h:
        Auto merged
      storage/innobase/include/sync0rw.ic:
        Auto merged
      storage/innobase/include/sync0sync.h:
        Auto merged
      storage/innobase/os/os0sync.c:
        Auto merged
      storage/innobase/sync/sync0arr.c:
        Auto merged
      storage/innobase/sync/sync0rw.c:
        Auto merged
      storage/innobase/sync/sync0sync.c:
        Auto merged
      8ca95b84
  2. 17 Jan, 2007 11 commits
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · e7eb4aa5
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
      
      
      configure.in:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/buf/buf0flu.c:
        Auto merged
      innobase/buf/buf0lru.c:
        Auto merged
      innobase/include/buf0buf.h:
        Auto merged
      innobase/include/buf0buf.ic:
        Auto merged
      innobase/include/sync0arr.h:
        Auto merged
      innobase/include/sync0rw.h:
        Auto merged
      innobase/include/sync0rw.ic:
        Auto merged
      innobase/include/sync0sync.h:
        Auto merged
      innobase/os/os0sync.c:
        Auto merged
      innobase/sync/sync0arr.c:
        Auto merged
      innobase/sync/sync0rw.c:
        Auto merged
      innobase/sync/sync0sync.c:
        Auto merged
      e7eb4aa5
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 26010833
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      26010833
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 7d274c05
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      configure.in:
        Use local
      7d274c05
    • unknown's avatar
      Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · bbacca83
      unknown authored
      into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
      
      
      innobase/buf/buf0buf.c:
        Use local
      innobase/buf/buf0flu.c:
        Use local
      innobase/buf/buf0lru.c:
        Use local
      innobase/include/buf0buf.h:
        Use local
      innobase/include/buf0buf.ic:
        Use local
      innobase/include/sync0arr.h:
        Use local
      innobase/include/sync0rw.h:
        Use local
      innobase/include/sync0rw.ic:
        Use local
      innobase/include/sync0sync.h:
        Use local
      innobase/os/os0sync.c:
        Use local
      innobase/sync/sync0arr.c:
        Use local
      innobase/sync/sync0rw.c:
        Use local
      innobase/sync/sync0sync.c:
        Use local
      bbacca83
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 5d92d2d7
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/mysqld.cc:
        Auto merged
      5d92d2d7
    • unknown's avatar
      Disable symlinks under valgrind builds (again), with a comment. · c9078c40
      unknown authored
      sql/mysqld.cc:
        Once again, disable symlink.test under valgrind builds. symlink.test
        fails deep in mi_repair - the result of this having been disabled
        for almost 5 years.
      c9078c40
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · c9bd73df
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_parse.cc:
        Use local.
      c9bd73df
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · eeaf11b2
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
      
      
      sql/sql_parse.cc:
        SCCS merged
      eeaf11b2
    • unknown's avatar
      Fix a failure of lowercase_tables2 test on powermacg5, introduced · f7e41bae
      unknown authored
      by the patch for Bug#4968
      
      
      sql/sql_parse.cc:
        Fix lowercase_tables2 test failure on powermacg5: table_case_name()
        function needed create_info.alias if lowercase_table_names=2, which
        was not set for the stack copy of HA_CREATE_INFO. Move the
        update of create_info.alias from create_table_precheck to 
        mysql_execute_command, so that it is done on the right object.
      f7e41bae
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max · 3cdad08c
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/mysqld.cc:
        Auto merged
      mysql-test/r/ps.result:
        SCCS merged
      mysql-test/t/ps.test:
        Use local
      3cdad08c
    • unknown's avatar
      Fix a ps.test failure in 5.0-runtime tree. · 06bc6836
      unknown authored
      mysql-test/r/ps.result:
        Update result files.
      mysql-test/t/ps.test:
        Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
        may be present or absent from the output depending on the build
        otpions and the operating system, so the output is not consistent
        across supported platforms.
      sql/mysqld.cc:
        Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
        added in 2002: DEBUG options should not influence server functionality.
        This backfired by producing different output of SHOW CREATE TABLE
        depending on the build options (see also Bug#25677 "With 
        --skip-symbolic-links option on, DATA DIRECTORY clause
        is silently ignored".
      06bc6836
  3. 16 Jan, 2007 8 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · b1cd0571
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/ps.test:
        Use local.
      mysql-test/t/backup.test:
        SCCS merged
      b1cd0571
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 329f6ba1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      mysql-test/t/backup.test:
        Auto merged
      mysql-test/t/ps.test:
        Manual merge.
      329f6ba1
    • unknown's avatar
      A fix for the broken 4.1-runtime tree. · 9cff68bb
      unknown authored
      mysql-test/t/backup.test:
        Backport a patch for sporadically failing myisam.test (and now ps.test)
        from 5.0. The cause was in backup.test not cleaning up tables in
        mysqltest-vardir/tmp after itself.
      mysql-test/t/ps.test:
        Add additional protection against possible failure in the middle of
        backup.test
      9cff68bb
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 4f4385d6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_select.cc:
        Auto merged
      4f4385d6
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 3634cce7
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        Auto merged
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      mysql-test/r/ps.result:
        Auto merged
      mysql-test/r/select.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      configure.in:
        Use local
      sql/sql_parse.cc:
        Use local
      sql/sql_table.cc:
        Use local
      mysql-test/t/ps.test:
        SCCS merged
      3634cce7
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.1-root · 7017cb07
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      7017cb07
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 22f62e8a
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
      
      
      22f62e8a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 061ea692
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      
      061ea692
  4. 15 Jan, 2007 18 commits
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · f71b6a84
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
      
      
      f71b6a84
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · c8fccee6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-root
      
      
      BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
        Auto merged
      mysql-test/r/view.result:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      server-tools/instance-manager/listener.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_string.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      storage/heap/hp_block.c:
        Auto merged
      storage/heap/hp_write.c:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/dict/dict0dict.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      tests/mysql_client_test.c:
        Auto merged
      BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
        SCCS merged
      mysql-test/t/view.test:
        Manual merge.
      c8fccee6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 095e2527
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      095e2527
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ce3a483d
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      ce3a483d
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 2ba119c6
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/sql_parse.cc:
        Auto merged
      2ba119c6
    • unknown's avatar
      A post-merge fix. · 15c83425
      unknown authored
      sql/sql_parse.cc:
        A post-merge fix (broken alter_table.test): restore Svoj's fix
        for Bug#23404 lost during merge.
      15c83425
    • unknown's avatar
      Raise version number after cloning 5.0.34 · 7118b2c3
      unknown authored
      7118b2c3
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 60348574
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/mysql.dsw:
        Auto merged
      VC++Files/mysqldemb/mysqldemb.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      VC++Files/sql/mysqldmax.dsp:
        Auto merged
      innobase/buf/buf0buf.c:
        Auto merged
      innobase/dict/dict0dict.c:
        Auto merged
      innobase/fil/fil0fil.c:
        Auto merged
      innobase/ha/ha0ha.c:
        Auto merged
      innobase/include/hash0hash.h:
        Auto merged
      innobase/lock/lock0lock.c:
        Auto merged
      innobase/log/log0recv.c:
        Auto merged
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      60348574
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 54df7b90
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      
      54df7b90
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 96e5be8c
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
      
      
      sql/sql_select.cc:
        Auto merged
      96e5be8c
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push · 30393ec4
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_table.cc:
        Use local
      30393ec4
    • unknown's avatar
      Manual merge. · 408d7752
      unknown authored
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_list.h:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      408d7752
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d470c233
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      d470c233
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1 · d099d94e
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge
      
      
      mysql-test/r/ps.result:
        Use local.
      mysql-test/r/sp.result:
        Use local
      mysql-test/t/ps.test:
        Use local
      mysql-test/t/sp.test:
        Use local
      sql/mysql_priv.h:
        Use local
      sql/sql_class.h:
        Use local
      sql/sql_insert.cc:
        Use local
      sql/sql_lex.cc:
        Use local
      sql/sql_lex.h:
        Use local
      sql/sql_list.h:
        Use local
      sql/sql_parse.cc:
        Use local
      sql/sql_show.cc:
        Use local
      sql/sql_table.cc:
        Use local
      sql/sql_yacc.yy:
        Use local
      d099d94e
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 · b523c895
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
      
      
      mysql-test/t/ndb_lock.test:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Manual merge.
      b523c895
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build · ffbb896b
      unknown authored
      into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
      
      
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
        Auto merged
      BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
        Auto merged
      BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
        Auto merged
      storage/innobase/buf/buf0buf.c:
        Auto merged
      storage/innobase/fil/fil0fil.c:
        Auto merged
      storage/innobase/ha/ha0ha.c:
        Auto merged
      storage/innobase/ha/hash0hash.c:
        Auto merged
      storage/innobase/include/hash0hash.h:
        Auto merged
      storage/innobase/lock/lock0lock.c:
        Auto merged
      storage/innobase/log/log0recv.c:
        Auto merged
      storage/innobase/thr/thr0loc.c:
        Auto merged
      ffbb896b
    • unknown's avatar
      Fix for bug#20390 "SELECT FOR UPDATE does not release locks · 810fc001
      unknown authored
      of untouched rows in full table scans".
      
      SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
      UPDATE/DELETE statements which were executed using full table
      scan were not releasing locks on rows which didn't satisfy
      WHERE condition.
      This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
      intentionally don't support such unlocking in default mode).
      
      This problem occured because code implementing join didn't call
      handler::unlock_row() for rows which didn't satisfy part of condition
      attached to this particular table/level of nested loop. So we solve
      the problem adding this call.
      Note that we already had this call in place in 4.1 but it was lost
      (actually not quite correctly placed) when we have introduced nested 
      joins.
      
      Also note that additional QA should be requested once this patch is
      pushed as interaction between handler::unlock_row() and many recent
      MySQL features such as subqueries, unions, views is not tested enough.
      
      
      mysql-test/r/ndb_lock.result:
        Enabled back part of the test that covers bug #20390 "SELECT FOR
        UPDATE does not release locks of untouched rows in full table scans".
        Adjusted test in such way that it now covers both execution paths
        in which we unlock non-matching rows inspected during table scan.
      mysql-test/t/ndb_lock.test:
        Enabled back part of the test that covers bug #20390 "SELECT FOR
        UPDATE does not release locks of untouched rows in full table scans".
        Adjusted test in such way that it now covers both execution paths
        in which we unlock non-matching rows inspected during table scan.
      sql/sql_select.cc:
        evaluate_join_record() should call handler::unlock_row() for records
        which don't satisfy condition which was pushed-down to this table/level
        of nested loop.
        We just put back the thing that we already have in 4.1 and which was lost
        when we have introduced nested joins.
      810fc001
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 32b01395
      unknown authored
      into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
      
      
      configure.in:
        Auto merged
      32b01395
  5. 14 Jan, 2007 1 commit
  6. 12 Jan, 2007 1 commit
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 68bd8af2
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/csv.test:
        Auto merged
      server-tools/instance-manager/guardian.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      68bd8af2