bzr commit into mysql-5.1 tree (MatthiasLeichmleich:2668) Bug#33873, Bug#37003

[MatthiasLeichmleich]

#At file:///work2/5.1/mysql-5.1-bugteam-funcs_1/

------------------------------------------------------------
revno: 2668
revision-id: mleich@stripped
parent: mleich@stripped
parent: davi@stripped
committer: Matthias Leich mleich@stripped
branch nick: mysql-5.1-bugteam-funcs_1
timestamp: Fr 2008-06-20 13:29:01 +0200
message:
  Automatic merge
renamed:
  sql/stacktrace.c => mysys/stacktrace.c
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
  sql/stacktrace.h => include/my_stacktrace.h
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
modified:
  client/CMakeLists.txt         
sp1f-cmakelists.txt-20060831175236-tdyayhfqw2zme3vhwbn6l2lno4em3u3t
  client/Makefile.am            
sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
  client/mysqltest.c            
sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
  configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
  include/Makefile.am           
sp1f-makefile.am-19700101030959-42ptynoryou25hajenjryzqyuvicbucw
  libmysqld/CMakeLists.txt      
sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
  libmysqld/Makefile.am         
sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
  libmysqld/lib_sql.cc          
sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
  mysql-test/extra/rpl_tests/rpl_row_basic.test
sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
  mysql-test/include/mix1.inc   
sp1f-innodb_mysql.test-20060426055153-mgtahdmgajg7vffqbq4xrmkzbhvanlaz
  mysql-test/r/alter_table.result
sp1f-alter_table.result-20001228015632-hk5kqhiea33uxdjhnqa2vnagoypjqbi3
  mysql-test/r/innodb_mysql.result
sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
  mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
  mysql-test/t/alter_table.test 
sp1f-alter_table.test-20001228015635-ibytgjjpm4y57rzxqoascmr2hqujnjge
  mysql-test/t/sql_low_priority_updates_func.test
sp1f-sql_low_priority_upd-20080410131408-eqzq6h4x5mufb23pfu3wucvqrgy7732d
  mysys/CMakeLists.txt          
sp1f-cmakelists.txt-20060831175237-shgpjtu5x7rmyswxjiriviagwnm5kvpd
  mysys/Makefile.am             
sp1f-makefile.am-19700101030959-36zaboyabq4ooqfc2jpion3pic7yhpgb
  sql/CMakeLists.txt            
sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
  sql/Makefile.am               
sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
  sql/field.h                   
sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
  sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
  sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu
  mysys/stacktrace.c            
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
  include/my_stacktrace.h       
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
    ------------------------------------------------------------
    revno: 2666.1.5
    revision-id: davi@stripped
    parent: gshchepa@stripped
    committer: Davi Arnaut <davi@stripped>
    branch nick: 37003-5.1
    timestamp: Do 2008-06-19 13:00:53 -0300
    message:
      Silence unused variable warning by printing the variables value.
    modified:
      mysys/stacktrace.c            
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
    ------------------------------------------------------------
    revno: 2666.1.4
    revision-id: gshchepa@stripped
    parent: gshchepa@stripped
    parent: davi@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-5.1-bugteam
    timestamp: Do 2008-06-19 19:26:00 +0500
    message:
      auto merge
    modified:
      client/mysqltest.c            
sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
      configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
      include/my_stacktrace.h       
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
      mysys/stacktrace.c            
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
      sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
        ------------------------------------------------------------
        revno: 2666.3.1
        revision-id: davi@stripped
        parent: davi@stripped
        committer: Davi Arnaut <davi@stripped>
        branch nick: 37003-5.1
        timestamp: Do 2008-06-19 11:02:32 -0300
        message:
          Bug#37003 Tests sporadically crashes with embedded server
          
          Another problem is that the backtrace facility wasn't being
          enabled for non-Linux targets even if the target OS has the
          backtrace functions. Also, the stacktrace functions inside
          mysqltest were being used without proper checks for their
          presence in the build.
        modified:
          client/mysqltest.c            
sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
          configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
          include/my_stacktrace.h       
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
          mysys/stacktrace.c            
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
          sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
    ------------------------------------------------------------
    revno: 2666.1.3
    revision-id: gshchepa@stripped
    parent: davi@stripped
    parent: gshchepa@stripped
    committer: Gleb Shchepa <gshchepa@stripped>
    branch nick: mysql-5.1-bugteam
    timestamp: Do 2008-06-19 18:32:14 +0500
    message:
      auto merge with local tree (bug #37076)
    modified:
      mysql-test/extra/rpl_tests/rpl_row_basic.test
sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
      mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
      mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
      mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
      sql/field.h                   
sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
        ------------------------------------------------------------
        revno: 2666.2.1
        revision-id: gshchepa@stripped
        parent: mattiasj@stripped
        committer: Gleb Shchepa <gshchepa@stripped>
        branch nick: 5.1-bugteam-37076
        timestamp: Do 2008-06-19 18:02:04 +0500
        message:
          Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are not
                            replicated correctly between machines with
                            mixed endiannes
        modified:
          mysql-test/extra/rpl_tests/rpl_row_basic.test
sp1f-rpl_row_basic.inc-20051222053451-qbja3f3vz3mf5ikwca7eeqkxutnnzlbi
          mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
sp1f-rpl_row_basic_2myisa-20051222053452-4mwybeg7asrg6l6usde7gfdw6u4cmx2h
          mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
sp1f-rpl_row_basic_3innod-20051222053452-vbynyu35bdhjizxhznism7jalbzil7l2
          mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result
sp1f-rpl_row_basic_7ndb.r-20060112185042-qnln6taptlwuulawjqhqz4q3noofqdfa
          sql/field.h                   
sp1f-field.h-19700101030959-3n6smzxcwkjl7bikm3wg4hfkjn66uvvp
    ------------------------------------------------------------
    revno: 2666.1.2
    revision-id: davi@stripped
    parent: davi@stripped
    committer: Davi Arnaut <davi@stripped>
    branch nick: 37003-5.1
    timestamp: Mi 2008-06-18 13:17:15 -0300
    message:
      Bug#37003 Tests sporadically crashes with embedded server
      
      The problem was that when a embedded linked version of mysqltest
      crashed there was no way to obtain a stack trace if no core file
      is available. Another problem is that the embedded version of
      libmysql was not behaving (crash) the same as the non-embedded with
      respect to sending commands to a explicitly closed connection.
      
      The solution is to generate a mysqltest's stack trace on crash
      and to enable "reconnect" if the connection handle was explicitly
      closed so the behavior matches the non-embedded one.
    renamed:
      sql/stacktrace.c => mysys/stacktrace.c
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
      sql/stacktrace.h => include/my_stacktrace.h
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
    modified:
      client/CMakeLists.txt         
sp1f-cmakelists.txt-20060831175236-tdyayhfqw2zme3vhwbn6l2lno4em3u3t
      client/Makefile.am            
sp1f-makefile.am-19700101030959-zpaig4zjwqhmsob3ypilmrcrkq7pu6gf
      client/mysqltest.c            
sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
      configure.in                  
sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
      include/Makefile.am           
sp1f-makefile.am-19700101030959-42ptynoryou25hajenjryzqyuvicbucw
      libmysqld/CMakeLists.txt      
sp1f-cmakelists.txt-20060403082523-x3vxka3k56u2wpzwcrlpykznlz2akpxd
      libmysqld/Makefile.am         
sp1f-makefile.am-20010411110351-26htpk3ynkyh7pkfvnshztqrxx3few4g
      libmysqld/lib_sql.cc          
sp1f-lib_sql.cc-20010411110351-gt5febleap73tqvapkesopvqtuht5sf5
      mysql-test/t/sql_low_priority_updates_func.test
sp1f-sql_low_priority_upd-20080410131408-eqzq6h4x5mufb23pfu3wucvqrgy7732d
      mysys/CMakeLists.txt          
sp1f-cmakelists.txt-20060831175237-shgpjtu5x7rmyswxjiriviagwnm5kvpd
      mysys/Makefile.am             
sp1f-makefile.am-19700101030959-36zaboyabq4ooqfc2jpion3pic7yhpgb
      sql/CMakeLists.txt            
sp1f-cmakelists.txt-20060831175237-esoeu5kpdtwjvehkghwy6fzbleniq2wy
      sql/Makefile.am               
sp1f-makefile.am-19700101030959-xsjdiakci3nqcdd4xl4yomwdl5eo2f3q
      sql/mysqld.cc                 
sp1f-mysqld.cc-19700101030959-zpswdvekpvixxzxf7gdtofzel7nywtfj
      mysys/stacktrace.c            
sp1f-stacktrace.c-20010513221240-wwmyzt4dneecpsyuor3g7w3zacc6u4mq
      include/my_stacktrace.h       
sp1f-stacktrace.h-20010513221240-cbiiu5humlsaar4gwejtppmg4trxkj47
    ------------------------------------------------------------
    revno: 2666.1.1
    revision-id: davi@stripped
    parent: mattiasj@stripped
    committer: Davi Arnaut <davi@stripped>
    branch nick: 33873-5.1
    timestamp: Di 2008-06-17 11:12:21 -0300
    message:
      Bug#33873: Fast ALTER TABLE doesn't work with multibyte character sets
      
      The problem was that when comparing tables for a possible
      fast alter table, the comparison was being performed using
      the parsed information and not the final definition.
            
      The solution is to use the possible final table layout to
      compare if a fast alter is possible or not.
    modified:
      mysql-test/include/mix1.inc   
sp1f-innodb_mysql.test-20060426055153-mgtahdmgajg7vffqbq4xrmkzbhvanlaz
      mysql-test/r/alter_table.result
sp1f-alter_table.result-20001228015632-hk5kqhiea33uxdjhnqa2vnagoypjqbi3
      mysql-test/r/innodb_mysql.result
sp1f-innodb_mysql.result-20060426055153-bychbbfnqtvmvrwccwhn24i6yi46uqjv
      mysql-test/t/alter_table.test 
sp1f-alter_table.test-20001228015635-ibytgjjpm4y57rzxqoascmr2hqujnjge
      sql/sql_table.cc              
sp1f-sql_table.cc-19700101030959-tzdkvgigezpuaxnldqh3fx2h7h2ggslu

Attachment: [text/text/x-diff] patch-2668.diff