1. 05 Jun, 2007 1 commit
  2. 04 Jun, 2007 8 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.0-engines · 86beef9d
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG27141/mysql-5.1-engines
      
      
      mysys/my_seek.c:
        Auto merged
      86beef9d
    • unknown's avatar
      BUG#27141 - Calling tell(-1) under Windows causes assertion failure in Debug mode · a58ff93e
      unknown authored
      Original problem was fixed by Magnus (see BUG25807).
      
      Currently only windows debug build causes assertion failure. This patch assures
      that my_tell gets correct file descriptor on any platform by DBUG_ASSERT macro.
      
      
      mysys/my_seek.c:
        Added assertion in case my_tell gets wrong file descriptor.
      a58ff93e
    • unknown's avatar
      Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 15d18a98
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      sql/udf_example.c:
        Auto merged
      15d18a98
    • unknown's avatar
      Post-merge fix. · 2bc1bec1
      unknown authored
      2bc1bec1
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · e8cca8c7
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
      
      
      include/thr_lock.h:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/subselect3.test:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/udf_example.c:
        Auto merged
      mysql-test/r/subselect.result:
        Manual merge.
      mysql-test/t/subselect.test:
        Manual merge.
      sql/sql_view.cc:
        Manual merge.
      e8cca8c7
    • unknown's avatar
      Post-merge fix. · 148da401
      unknown authored
      148da401
    • unknown's avatar
      Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · fa3f2e77
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      fa3f2e77
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.1 · 68daddf3
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt-merge
      
      
      mysql-test/r/alter_table.result:
        Auto merged
      mysql-test/r/create.result:
        Auto merged
      mysql-test/r/innodb_mysql.result:
        Auto merged
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/alter_table.test:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/subselect3.test:
        Auto merged
      sql/field.h:
        Auto merged
      sql/handler.h:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      mysql-test/r/ps_2myisam.result:
        Manual merge.
      mysql-test/r/ps_3innodb.result:
        Manual merge.
      mysql-test/r/ps_4heap.result:
        Manual merge.
      mysql-test/r/ps_5merge.result:
        Manual merge.
      mysql-test/r/ps_7ndb.result:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      sql/sql_view.cc:
        Manual merge.
      68daddf3
  3. 03 Jun, 2007 12 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-opt · 24b63262
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
      
      24b63262
    • unknown's avatar
      item_func.h, item_func.cc: · c4a58a68
      unknown authored
        Post merge fix for the bug#28494.
      
      
      sql/item_func.h:
        Post merge fix for the bug#28494.
      sql/item_func.cc:
        Post merge fix for the bug#28494.
      c4a58a68
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · ac9cfa1f
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
      
      ac9cfa1f
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql · db33e92a
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/user_var.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      db33e92a
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 96a92c70
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
      
      96a92c70
    • unknown's avatar
      user_var.result: · a8e7c57a
      unknown authored
        Corrected test case result for the bug#28494.
      item_func.h, item_func.cc:
        Corrected function names after fix for the bug#28494.
      
      
      mysql-test/r/user_var.result:
        Corrected test case result for the bug#28494.
      sql/item_func.h:
        Corrected function names after fix for the bug#28494.
      sql/item_func.cc:
        Corrected function names after fix for the bug#28494.
      a8e7c57a
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 5dfa294b
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
      
      5dfa294b
    • unknown's avatar
      user_var.result, user_var.test: · e3a5404d
      unknown authored
        Extended test case for the bug#28494.
      
      
      mysql-test/t/user_var.test:
        Extended test case for the bug#28494.
      mysql-test/r/user_var.result:
        Extended test case for the bug#28494.
      e3a5404d
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 62806826
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
      
      62806826
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.0-opt · 57b1ab50
      unknown authored
      into  macbook.gmz:/Users/kgeorge/mysql/work/B26162-5.0-opt
      
      
      mysql-test/r/trigger.result:
        Auto merged
      mysql-test/t/trigger.test:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      57b1ab50
    • unknown's avatar
      Bug #26162: Trigger DML ignores low_priority_updates setting · 9d344638
      unknown authored
        
      The value of "low-priority-updates" option and the LOW PRIORITY
      prefix was taken into account at parse time.
      This caused triggers (among others) to ignore this flag (if
      supplied for the DML statement).
      Moved reading of the LOW_PRIORITY flag at run time.
      Fixed an incosistency when handling
      SET GLOBAL LOW_PRIORITY_UPDATES : now it is in effect for
      delayed INSERTs.
      Tested by checking the effect of LOW_PRIORITY flag via a 
      trigger.
      
      
      include/thr_lock.h:
        Bug #26162: moved reading of the LOW PRIORITY flag at run time
      mysql-test/r/trigger.result:
        Bug #26162: test case
      mysql-test/t/trigger.test:
        Bug #26162: test case
      sql/set_var.cc:
        Bug #26162: fixed the handling of the "low-priority-updates" option
      sql/sql_base.cc:
        Bug #26162: moved reading of the LOW PRIORITY flag at run time
      sql/sql_yacc.yy:
        Bug #26162: moved reading of the LOW PRIORITY flag at run time
      9d344638
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql · 833698d1
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      sql/item_func.cc:
        Manually merged
      833698d1
  4. 02 Jun, 2007 10 commits
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 5f4566dc
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
      
      5f4566dc
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 55b14a67
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
      
      55b14a67
    • unknown's avatar
      item_func.cc: · 1a4fb707
      unknown authored
        Post fix for bug#28494.
        The Item_func_set_user_var::check method now silently doesn't use result_field
        if it isn't defined.
      
      
      sql/item_func.cc:
        Post fix for bug#28494.
        The Item_func_set_user_var::check method now silently doesn't use result_field
        if it isn't defined.
      1a4fb707
    • unknown's avatar
      Merge moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql · e7fa7c1f
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      mysql-test/r/user_var.result:
        Manual merge
      mysql-test/t/user_var.test:
        Manual merge
      e7fa7c1f
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 8ff5607d
      unknown authored
      into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug28728
      
      8ff5607d
    • unknown's avatar
      Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7184a592
      unknown authored
      into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
      
      7184a592
    • unknown's avatar
      Bug#28494: Grouping by Item_func_set_user_var produces incorrect result. · 26f38860
      unknown authored
      This is an additional fix.
      Item::val_xxx methods are supposed to use original data source and
      Item::val_xxx_result methods to use the item's result field. But for the
      Item_func_set_user_var class val_xxx_result methods were mapped to val_xxx
      methods. This leads, in particular, to producing bad sort keys and thus
      wrong order of the result set of queries with group by/order by clauses.
      
      The set of val_xxx_result methods is added to the Item_func_set_user_var
      class. It's the same as the val_xxx set of method but uses the result_field
      to return a value.
      
      
      mysql-test/t/user_var.test:
        Corrected test case for hte bug#28494.
      mysql-test/r/user_var.result:
        Corrected test case for hte bug#28494.
      sql/item_func.cc:
        Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
        The set of val_xxx_result methods is added to the Item_func_set_user_var
        class. It's the same as the val_xxx set of method but uses the result_field
        to return a value.
      sql/item_func.h:
        Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
        The set of val_xxx_result methods is added to the Item_func_set_user_var
        class.
      26f38860
    • unknown's avatar
      Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query · b7ce84ad
      unknown authored
      using a derived table over a grouping subselect.
      
      This crash happens only when materialization of the derived tables 
      requires creation of auxiliary temporary table, for example when
      a grouping operation is carried out with usage of a temporary table.
      
      The crash happened because EXPLAIN EXTENDED when printing the query
      expression made an attempt to use the objects created in the mem_root
      of the temporary table which has been already freed by the moment
      when printing is called.
      
      This bug appeared after the method Item_field::print() had been 
      introduced.    
      
      
      mysql-test/r/subselect.result:
        Added a test case for bug #28728.
      mysql-test/t/subselect.test:
        Added a test case for bug #28728.
      sql/sql_select.cc:
        Fixed bug #28728: a crash when executing EXPLAIN EXTENDED for a query
        using a derived table over a grouping subselect.
        The crash happened because EXPLAIN EXTENDED when printing the query
        expression made an attempt to use the objects created in the mem_root
        of the temporary table which has been already freed by the moment
        when printing is accomplished.
        The fix in JOIN::exec() ensures using existing objects when printing 
        subselects for a derived tables by EXPLAIN EXTENDED.
      b7ce84ad
    • unknown's avatar
      BUG#28427: fix typo, s/bool/uint/ · 8bea1cc2
      unknown authored
      8bea1cc2
    • unknown's avatar
      Post-merge fix. · 211cac24
      unknown authored
      211cac24
  5. 01 Jun, 2007 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · bcfe3d30
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
      
      
      mysql-test/r/sp.result:
        Auto merged
      mysql-test/t/sp.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/subselect3.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sp_head.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Manual merge
      bcfe3d30
    • unknown's avatar
      Merge olga.mysql.com:/home/igor/mysql-5.0-opt · 7488faa2
      unknown authored
      into  olga.mysql.com:/home/igor/mysql-5.1-opt
      
      
      sql/mysqld.cc:
        Auto merged
      7488faa2
    • unknown's avatar
      Bug#28427: Columns were renamed instead of moving by ALTER TABLE. · b1676515
      unknown authored
      To avoid unnecessary work the mysql_alter_table function takes the
      list of table fields and applies all changes to it (drops/moves/renames/etc).
      Then this function compares the new list and the old one. If the changes
      require only .frm to be modified then the actual data isn't copied. To detect
      changes all columns attributes but names are compared. When a column has been
      moved and has replaced another column with the same attributes except name
      the mysql_alter_table function wrongly decides that two fields has been just
      renamed. As a result the data from the moved column and from all columns
      after it is not copied.
      
      Now the mysql_alter_table function forces table data copying by setting
      the need_copy_table flag when it finds a moved column. The flag is set at
      the stage when the modified fields are created.
      
      
      
      sql/sql_table.cc:
        Bug#28427: Columns were renamed instead of moving by ALTER TABLE.
        Now the mysql_alter_table function forces table data copying by setting
        the need_copy_table flag when it finds a moved column. The flag is set at
        the stage when the modified fields are created.
      mysql-test/r/alter_table.result:
        Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.
      mysql-test/t/alter_table.test:
        Added a test case for the bug#28427: Columns were renamed instead of moving by ALTER TABLE.
      b1676515
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · f42bcd77
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      mysql-test/t/mysqltest.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      f42bcd77
    • unknown's avatar
      Fix more mysqltest warnings. · 75485dc3
      unknown authored
      75485dc3
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-5.1-opt · e9b9d7ed
      unknown authored
      into  dl145s.mysql.com:/dev/shm/mhansson/my51-bug27741-mpush
      
      
      mysql-test/mysql-test-run.pl:
        Auto merged
      e9b9d7ed
    • unknown's avatar
      Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 8d2119e9
      unknown authored
      into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
      
      
      BitKeeper/etc/ignore:
        auto-union
      mysql-test/t/rpl_loaddata.test:
        Use local.
      mysql-test/r/rpl_loaddata.result:
        Use local.
      8d2119e9
    • unknown's avatar
      106890d0
    • unknown's avatar
      Fix a typo in the test case. · 8c6d82a2
      unknown authored
      
      mysql-test/r/rpl_loaddata.result:
        Update result.
      mysql-test/t/rpl_loaddata.test:
        Fix a typo in the test file.
      8c6d82a2