1. 17 Jan, 2007 2 commits
    • unknown's avatar
      ha_ndbcluster.cc: · 15eebdc0
      unknown authored
        Bug #25668    - corrected patch after test failures
      
      
      sql/ha_ndbcluster.cc:
        Bug #25668    - corrected patch after test failures
      15eebdc0
    • unknown's avatar
      ha_ndbcluster.cc: · 1c24fc31
      unknown authored
          Bug #25668    ndb: mysqld may core if cluster disconnected
          -- pTrans may be NULL, remove not needed usage of handler::ndb_err
      
      
      sql/ha_ndbcluster.cc:
          Bug #25668    ndb: mysqld may core if cluster disconnected
          -- pTrans may be NULL, remove not needed usage of handler::ndb_err
      1c24fc31
  2. 16 Jan, 2007 2 commits
  3. 15 Jan, 2007 1 commit
    • 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
  4. 12 Jan, 2007 9 commits
  5. 11 Jan, 2007 11 commits
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 4a819ce1
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      sql/item_func.cc:
        Auto merged
      4a819ce1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6ab5bdf3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.0-runtime
      
      
      heap/hp_block.c:
        Auto merged
      mysql-test/r/view.result:
        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
      tests/mysql_client_test.c:
        Auto merged
      heap/hp_write.c:
        SCCS merged
      6ab5bdf3
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fcbe66a3
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-4.1-runtime
      
      
      sql/item_func.cc:
        Auto merged
      fcbe66a3
    • unknown's avatar
      Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7f9da471
      unknown authored
      into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt
      
      
      sql/sql_base.cc:
        Auto merged
      7f9da471
    • unknown's avatar
      BUG#25106: A USING clause in combination with a VIEW results in column · 6c41a043
      unknown authored
                 aliases ignored
      When a column reference to a column in JOIN USING is resolved and a new 
      Item is created for this column the user defined name was lost.
      This fix preserves the alias by setting the name of the new Item to the
      original alias.
      
      
      mysql-test/r/join.result:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - test case
      mysql-test/t/join.test:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - test case
      sql/sql_base.cc:
        BUG#25106: A USING clause in combination with a VIEW results in column
                   aliases ignored
         - take the alias of the Item to be replaced and set it into the newly
           allocated Item.
      6c41a043
    • unknown's avatar
      Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build · b139c287
      unknown authored
      into  mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
      
      
      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
      b139c287
    • unknown's avatar
      Many files: · a1566a09
      unknown authored
        Reverted change for bug#13859, applied smaller patch from Marko
      
      
      innobase/buf/buf0buf.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/dict/dict0dict.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/fil/fil0fil.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/ha/ha0ha.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/ha/hash0hash.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/include/hash0hash.h:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/lock/lock0lock.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/log/log0recv.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      innobase/thr/thr0loc.c:
        Reverted change for bug#13859, applied smaller patch from Marko
      a1566a09
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · bfca7902
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      bfca7902
    • unknown's avatar
      Merge trift2.:/MySQL/M41/push-4.1 · 0c715c6f
      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
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Auto merged
      support-files/MySQL-shared-compat.spec.sh:
        Auto merged
      0c715c6f
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0-opt · ce3a76a4
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      sql/mysqld.cc:
        Auto merged
      ce3a76a4
    • unknown's avatar
      Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage · 50361d9a
      unknown authored
      into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0
      
      
      configure.in:
        Auto merged
      mysql-test/install_test_db.sh:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/CMakeLists.txt:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      win/configure.js:
        Auto merged
      50361d9a
  6. 10 Jan, 2007 14 commits
    • unknown's avatar
      Merge trift2.:/MySQL/M40/clone-4.0 · 34d5b84b
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      VC++Files/mysql.dsw:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      VC++Files/libmysqld/libmysqld.dsp:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      VC++Files/mysqldemb/mysqldemb.dsp:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      VC++Files/mysqlserver/mysqlserver.dsp:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      VC++Files/sql/mysqld.dsp:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      VC++Files/sql/mysqldmax.dsp:
        Null-merge: Removal of BerkeleyDB is limited to 4.0
      34d5b84b
    • unknown's avatar
      Merge trift2.:/MySQL/M40/upward-4.0 · 6ee56e41
      unknown authored
      into  trift2.:/MySQL/M41/push-4.1
      
      
      mysys/my_read.c:
        Auto merged
      scripts/make_binary_distribution.sh:
        Null merge, because "--platform" is already a real argument in 4.1
      support-files/MySQL-shared-compat.spec.sh:
        Null merge, because the 4.1 version already uses two digits
        for "version40" and "version41".
      6ee56e41
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 10698df6
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-4.1-opt
      
      
      10698df6
    • unknown's avatar
      configure.in: · a4817ace
      unknown authored
        Corrected default for --disable-grant-options
      
      
      configure.in:
        Corrected default for --disable-grant-options
      a4817ace
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 6943153e
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      sql/item.cc:
        Auto merged
      mysql-test/r/order_by.result:
        Manual merge
      mysql-test/t/order_by.test:
        Manual merge
      6943153e
    • unknown's avatar
      Merge bk@192.168.21.1:mysql-5.0 · c11c3b08
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      c11c3b08
    • unknown's avatar
      configure.in: · 4ffd49d3
      unknown authored
        Removed line accidently inserted when correcting bug#18526
      
      
      configure.in:
        Removed line accidently inserted when correcting bug#18526
      4ffd49d3
    • unknown's avatar
      Merge mysql.com:/d2/hf/common/my50-common · 380ad35c
      unknown authored
      into  mysql.com:/d2/hf/mr10/my50-mr10
      
      
      380ad35c
    • unknown's avatar
      after merge fix · 53c9b0d0
      unknown authored
      53c9b0d0
    • unknown's avatar
      Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · f5005095
      unknown authored
      into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/mysql_priv.h:
        manual merge
      f5005095
    • unknown's avatar
      Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean up · ac71a8fa
      unknown authored
      2nd version
      During tmp tables cleanup we get the handler for temporary table
      and delete table using handler method.
      
      
      sql/mysql_priv.h:
        added function prototype
      sql/mysqld.cc:
        added call of mysql_rm_tmp_tables() function
      sql/sql_base.cc:
        mysql_rm_tmp_tables()
        -removed from table_cache_init
        -During tmp tables cleanup we get the handler for temporary table
         and delete table using handler method. 
         it allows to remove orphan records from data dictionary(InnoDB)
      ac71a8fa
    • unknown's avatar
      Fixed bug #25427. · 6fc17dab
      unknown authored
      In the method Item_field::fix_fields we try to resolve the name of
      the field against the names of the aliases that occur in the select
      list. This is done by a call of the function find_item_in_list.
      When this function finds several occurrences of the field name
      it sends an error message to the error queue and returns 0.
      Yet the code did not take into account that find_item_in_list
      could return 0 and tried to dereference the returned value.
      
      
      mysql-test/r/order_by.result:
        Added a test case for bug #25427.
      mysql-test/t/order_by.test:
        Added a test case for bug #25427.
      sql/item.cc:
        Fixed bug #25427.
        In the method Item_field::fix_fields we try to resolve the name of
        the field against the names of the aliases that occur in the select
        list. This is done by a call of the function find_item_in_list.
        When this function finds several occurrences of the field name 
        it sends an error message to the error queue and returns 0.
        Yet the code did not take into account that find_item_in_list
        could return 0 and tried to dereference the returned value.
      6fc17dab
    • unknown's avatar
      WL #3670: Compile-time option to remove GRANT-related startup options · c2e9a4af
      unknown authored
      - configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
      - configure.js/cmake also updated
      - if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
        --bootstrap
        --init-file
        --skip-grant-tables
      
      Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.
      
      For example:
      
      $ export MYSQLD_BOOTSTRAP
      $ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
      $ mysql_install_db
      $ make test
      
      
      configure.in:
        WL#3670
        
        Add --disable-grant-options
      mysql-test/install_test_db.sh:
        Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      mysql-test/mysql-test-run.pl:
        Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      mysql-test/mysql_test_run_new.c:
        Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option.
      scripts/mysql_install_db.sh:
        Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
      sql/CMakeLists.txt:
        Add DISABLE_GRANT_OPTIONS define
      sql/mysqld.cc:
        Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options
      win/README:
        Document the DISABLE_GRANT_OPTIONS define
      win/configure.js:
        Handle DISABLE_GRANT_OPTIONS
      c2e9a4af
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b04652e2
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.0-opt
      
      
      b04652e2
  7. 09 Jan, 2007 1 commit