List:Commits« Previous MessageNext Message »
From:Matthias Leich Date:August 28 2008 2:18pm
Subject:bzr commit into mysql-5.0 tree (mleich:2673) Bug#32167, Bug#36579, Bug#36639,
Bug#37277, Bug#37428, Bug#38195
View as plain text  
#At file:///work2/5.0/mysql-5.0-bugteam-1/

------------------------------------------------------------
revno: 2673
revision-id: mleich@stripped
parent: mleich@stripped
parent: kgeorge@stripped
committer: Matthias Leich <mleich@stripped>
branch nick: mysql-5.0-bugteam-1
timestamp: Do 2008-08-28 14:18:40 +0200
message:
  Merge actual 5.0-bugteam into local tree
modified:
  include/my_sys.h              
sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
  include/myisam.h              
sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
  myisam/mi_check.c             
sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
  myisam/mi_create.c            
sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
  myisam/mi_open.c              
sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
  myisam/mi_static.c            
sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
  myisam/myisamchk.c            
sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
  myisam/myisamdef.h            
sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
  myisam/rt_index.c             
sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
  mysql-test/r/group_min_max.result
sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
  mysql-test/r/myisam.result    
sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
  mysql-test/r/symlink.result   
sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
  mysql-test/r/type_bit.result  
sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
  mysql-test/r/udf.result       
sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
  mysql-test/t/group_min_max.test
sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
  mysql-test/t/myisam.test      
sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
  mysql-test/t/symlink.test     
sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
  mysql-test/t/type_bit.test    
sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
  mysys/my_symlink.c            
sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
  mysys/thr_lock.c              
sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
  sql/field.h                   
sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
  sql/mysql_priv.h              
sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
  sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/opt_range.cc              
sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
  sql/opt_range.h               
sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
  sql/set_var.cc                
sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
  sql/sql_parse.cc              
sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_select.cc             
sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
  sql/sql_udf.cc                
sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
  sql/unireg.h                  
sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
    ------------------------------------------------------------
    revno: 2671.1.9
    revision-id: kgeorge@stripped
    parent: gshchepa@stripped
    parent: davi.arnaut@stripped
    committer: Georgi Kodinov <kgeorge@stripped>
    branch nick: merge-5.0-bugteam
    timestamp: Do 2008-08-28 12:18:35 +0300
    message:
      merge 5.0-main -> 5.0-bugteam
        ------------------------------------------------------------
        revno: 2671.3.1
        revision-id: davi.arnaut@stripped
        parent: gluh@stripped
        parent: ramil@stripped
        committer: Davi Arnaut <Davi.Arnaut@stripped>
        branch nick: mysql-5.0
        timestamp: Di 2008-08-26 15:27:04 -0300
        message:
          Merge of mysql-5.0-bugteam branch. 
        modified:
          include/my_sys.h              
sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
          include/myisam.h              
sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
          myisam/mi_check.c             
sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
          myisam/mi_create.c            
sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
          myisam/mi_open.c              
sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
          myisam/mi_static.c            
sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
          myisam/myisamchk.c            
sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
          myisam/myisamdef.h            
sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
          myisam/rt_index.c             
sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
          mysql-test/r/myisam.result    
sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
          mysql-test/r/symlink.result   
sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
          mysql-test/r/udf.result       
sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
          mysql-test/t/myisam.test      
sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
          mysql-test/t/symlink.test     
sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
          mysys/my_symlink.c            
sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
          mysys/thr_lock.c              
sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
          sql/mysql_priv.h              
sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
          sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
          sql/set_var.cc                
sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
          sql/sql_parse.cc              
sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
          sql/sql_udf.cc                
sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
          sql/unireg.h                  
sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
    ------------------------------------------------------------
    revno: 2671.1.8
    revision-id: gshchepa@stripped
    parent: epotemkin@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-5.0-bugteam
    timestamp: Do 2008-08-28 02:10:37 +0500
    message:
      Bug #37799: SELECT with a BIT column in WHERE clause
                  returns unexpected result
      
      If:
        1. a table has a not nullable BIT column c1 with a length
           shorter than 8 bits and some additional not nullable
           columns c2 etc, and
        2. the WHERE clause is like: (c1 = constant) AND c2 ...,
      the SELECT query returns unexpected result set.
      
      
      The server stores BIT columns in a tricky way to save disk
      space: if column's bit length is not divisible by 8, the
      server places reminder bits among the null bits at the start
      of a record. The rest bytes are stored in the record itself,
      and Field::ptr points to these rest bytes.
      
      However if a bit length of the whole column is less than 8,
      there are no remaining bytes, and there is nothing to store in
      the record at its regular place. In this case Field::ptr points
      to bytes actually occupied by the next column in a record.
      If both columns (BIT and the next column) are NOT NULL,
      the Field::eq function incorrectly deduces that this is the
      same column, so query transformation/equal item elimination
      code (see build_equal_items_for_cond) may mix these columns
      and damage conditions containing references to them.
    modified:
      mysql-test/r/type_bit.result  
sp1f-type_bit.result-20041217140559-ppf6bkjkl3r4tbmlt7ngn46zm6tapa46
      mysql-test/t/type_bit.test    
sp1f-type_bit.test-20041217140559-tzpygypzmjyjiukpq75swmn6zq4ytqe4
      sql/field.h                   
sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
    ------------------------------------------------------------
    revno: 2671.1.7
    revision-id: epotemkin@stripped
    parent: sergefp@stripped
    committer: Evgeny Potemkin <epotemkin@stripped>
    branch nick: 38195-bug-5.0-bugteam
    timestamp: Mi 2008-08-27 17:03:17 +0400
    message:
      Bug#38195: Incorrect handling of aggregate functions when loose index scan is
      used causes server crash.
            
      When the loose index scan access method is used values of aggregated functions
      are precomputed by it. Aggregation of such functions shouldn't be performed
      in this case and functions should be treated as normal ones.
      The create_tmp_table function wasn't taking this into account and this led to
      a crash if a query has MIN/MAX aggregate functions and employs temporary table
      and loose index scan.
      Now the JOIN::exec and the create_tmp_table functions treat MIN/MAX aggregate
      functions as normal ones when the loose index scan is used.
    modified:
      mysql-test/r/group_min_max.result
sp1f-group_min_max.result-20040827133611-aqzadxttbw23mkanmvdsiaambv2pcy27
      mysql-test/t/group_min_max.test
sp1f-group_min_max.test-20040827133612-bbe7hj6l7byvtyxsg4iicylzflsgy6vj
      sql/sql_select.cc             
sp1f-sql_select.cc-19700101030959-egb7whpkh76zzvikycs5nsnuviu4fdlb
    ------------------------------------------------------------
    revno: 2671.1.6
    revision-id: sergefp@stripped
    parent: ramil@stripped
    committer: Sergey Petrunia <sergefp@stripped>
    branch nick: mysql-5.0-bugteam-bug36639
    timestamp: Mo 2008-08-25 21:02:54 +0400
    message:
      BUG#36639: subselect.test crashes on 64 bit pentium4 when compiled for valgrind,
commit into 5.0
      - Use the compiler's default copy constructor for QUICK_RANGE_SELECT. 
        bcopy(this, copy, ...) call caused some odd action on gcc-4.1.2 on x86_64
    modified:
      sql/opt_range.cc              
sp1f-opt_range.cc-19700101030959-afe3wtevb7zwrg4xyibt35uamov5r7ds
      sql/opt_range.h               
sp1f-opt_range.h-19700101030959-c2qbh5kplyvzfgawblxt4md4ubdpxfdy
    ------------------------------------------------------------
    revno: 2671.1.5
    revision-id: ramil@stripped
    parent: ramil@stripped
    committer: Ramil Kalimullin <ramil@stripped>
    branch nick: mysql-5.0-bugteam
    timestamp: Di 2008-08-26 18:51:06 +0500
    message:
      Fix for bug#37277: Potential crash when a spatial index isn't the first key
      
      Typo fixed.
      No test case as we actually don't use rtree_get_first() 
      and rtree_get_next() at present.
    modified:
      myisam/rt_index.c             
sp1f-rt_index.c-20020220101115-g73ue5aednwitjcl3kv42tqfijyn3454
    ------------------------------------------------------------
    revno: 2671.1.4
    revision-id: ramil@stripped
    parent: holyfoot@stripped
    committer: Ramil Kalimullin <ramil@stripped>
    branch nick: mysql-5.0-bugteam
    timestamp: Di 2008-08-26 18:48:50 +0500
    message:
      Fix for bug #37310: 'on update CURRENT_TIMESTAMP' option crashes the table
      
      Problem: data consistency check (maximum record length) for a correct
      MyISAM table with CHECKSUM=1 and ROW_FORMAT=DYNAMIC option 
      may fail due to wrong inner MyISAM parameter. In result we may 
      have the table marked as 'corrupted'. 
      
      Fix: properly set MyISAM maximum record length parameter.
    modified:
      myisam/mi_create.c            
sp1f-mi_create.c-19700101030959-i6lazhpsyf7ggr2yjukf6xxybhraxup3
      mysql-test/r/myisam.result    
sp1f-myisam.result-20010411215653-pgxkk2xg4lh3nxresmfnsuszf5h3nont
      mysql-test/t/myisam.test      
sp1f-myisam.test-20010411215653-cdmhjqbeu3xtipkauwbbirystludnac3
    ------------------------------------------------------------
    revno: 2671.1.3
    revision-id: holyfoot@stripped
    parent: holyfoot@stripped
    committer: Alexey Botchkov <holyfoot@stripped>
    branch nick: 50mrg
    timestamp: Di 2008-08-26 14:21:07 +0500
    message:
      merging fixes
    modified:
      mysql-test/r/symlink.result   
sp1f-symlink.result-20010605003810-qspjjr4hwq7gpdhzyictx52ddrlmxaco
      mysql-test/t/symlink.test     
sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
    ------------------------------------------------------------
    revno: 2671.1.2
    revision-id: holyfoot@stripped
    parent: holyfoot@stripped
    parent: davi.arnaut@stripped
    committer: Alexey Botchkov <holyfoot@stripped>
    branch nick: 50mrg
    timestamp: Di 2008-08-26 13:32:43 +0500
    message:
      merging fix
    modified:
      myisam/mi_static.c            
sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
      mysql-test/r/udf.result       
sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
      mysys/my_symlink.c            
sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
      mysys/thr_lock.c              
sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
      sql/mysql_priv.h              
sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
      sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
      sql/set_var.cc                
sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
      sql/sql_parse.cc              
sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
      sql/sql_udf.cc                
sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
      sql/unireg.h                  
sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
        ------------------------------------------------------------
        revno: 2671.2.2
        revision-id: davi.arnaut@stripped
        parent: gluh@stripped
        committer: Davi Arnaut <Davi.Arnaut@stripped>
        branch nick: 36579-5.0
        timestamp: Mo 2008-08-25 10:18:52 -0300
        message:
          Bug#36579 Dumping information about locks in use may lead to a server crash
          
          Dumping information about locks in use by sending a SIGHUP signal
          to the server or by invoking the "mysqladmin debug" command may
          lead to a server crash in debug builds or to undefined behavior in
          production builds.
          
          The problem was that a mutex that protects a lock object (THR_LOCK)
          might have been destroyed before the lock object was actually removed
          from the list of locks in use, causing a race condition with other
          threads iterating over the list. The solution is to destroy the mutex
          only after removing lock object from the list.
        modified:
          mysys/thr_lock.c              
sp1f-thr_lock.c-19700101030959-igvxgo25qd7i2moc4pgo5eoth3xp34mh
        ------------------------------------------------------------
        revno: 2671.2.1
        revision-id: gluh@stripped
        parent: gluh@stripped
        committer: Sergey Glukhov <gluh@stripped>
        branch nick: mysql-5.0-bugteam
        timestamp: Mo 2008-08-25 17:11:59 +0500
        message:
          Bug#37428 Potential security issue with UDFs - linux shellcode execution.
          plugin_dir option backported from 5.1
        modified:
          mysql-test/r/udf.result       
sp1f-udf.result-20060215161120-pm5l3nyny5gbznc2egfu4bhwgxbuc6wz
          sql/mysql_priv.h              
sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
          sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
          sql/set_var.cc                
sp1f-set_var.cc-20020723153119-nwbpg2pwpz55pfw7yfzaxt7hsszzy7y3
          sql/sql_udf.cc                
sp1f-sql_udf.cc-19700101030959-tk7ysmv4dpwkfhtdovfbqe5i6uvq67ft
          sql/unireg.h                  
sp1f-unireg.h-19700101030959-6vhptb2vfyo4mcjkgdm3n5uw6u64czfo
    ------------------------------------------------------------
    revno: 2671.1.1
    revision-id: holyfoot@stripped
    parent: gluh@stripped
    committer: Alexey Botchkov <holyfoot@stripped>
    branch nick: 50mrg
    timestamp: Fr 2008-08-22 17:31:53 +0500
    message:
      Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                  
                  test_if_data_home_dir fixed to look into real path.
                  Checks added to mi_open for symlinks into data home directory.
      
      per-file messages:
              include/my_sys.h
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                my_is_symlink interface added
              include/myisam.h
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                myisam_test_invalid_symlink interface added
              myisam/mi_check.c
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                mi_open_datafile calls modified
              myisam/mi_open.c
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                code added to mi_open to check for symlinks into data home directory.
                mi_open_datafile now accepts 'original' file path to check if it's
                an allowed symlink.
              myisam/mi_static.c
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                myisam_test_invlaid_symlink defined
              myisam/myisamchk.c
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                mi_open_datafile call modified
              myisam/myisamdef.h
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                mi_open_datafile interface modified - 'real_path' parameter added
              mysql-test/r/symlink.test
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                error codes corrected as some patch now rejected pointing inside datahome
              mysql-test/r/symlink.result
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                error messages corrected in the result
              mysys/my_symlink.c
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                my_is_symlink() implementsd
                my_realpath() now returns the 'realpath' even if a file isn't a symlink
              sql/mysql_priv.h
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                test_if_data_home_dir interface
              sql/mysqld.cc
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                myisam_test_invalid_symlik set with the 'test_if_data_home_dir'
              sql/sql_parse.cc
                Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.
                
                error messages corrected
                test_if_data_home_dir code fixed
    modified:
      include/my_sys.h              
sp1f-my_sys.h-19700101030959-lyllvna5vzqfcjnmlcrutgqocylhtb54
      include/myisam.h              
sp1f-myisam.h-19700101030959-2zv2wn7kuuvbyktuyfsitra6cl37h3mm
      myisam/mi_check.c             
sp1f-mi_check.c-19700101030959-yzbhnjgzcmqdyj4zz5codhkkw5eedp6f
      myisam/mi_open.c              
sp1f-mi_open.c-19700101030959-2q2rxowhivdg4hjkjxyf2wtczsod5d6a
      myisam/mi_static.c            
sp1f-mi_static.c-19700101030959-tdmnpz55hlrequ6y4hc3azz6hpxqfv75
      myisam/myisamchk.c            
sp1f-myisamchk.c-19700101030959-hdnrqowbdb3ujo3qgjtzs6lgogwckvgc
      myisam/myisamdef.h            
sp1f-myisamdef.h-19700101030959-fzrxvpmzhzqfn5w2clasmcw7af4kanoa
      mysql-test/t/symlink.test     
sp1f-symlink.test-20010605003810-7slktyzeszzfljtnmdbque4ow3azjqty
      mysys/my_symlink.c            
sp1f-my_symlink.c-20010531091851-nnlz7igptpjfrbgf6sspd6vtv2hv63ab
      sql/mysql_priv.h              
sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
      sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
      sql/sql_parse.cc              
sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd

Attachment: [text/text/x-diff] patch-2673.diff
Thread
bzr commit into mysql-5.0 tree (mleich:2673) Bug#32167, Bug#36579, Bug#36639,Bug#37277, Bug#37428, Bug#38195Matthias Leich28 Aug