List:Commits« Previous MessageNext Message »
From:Marc Alff Date:July 15 2008 4:30pm
Subject:bzr commit into mysql-6.0 tree (marc.alff:2717) Bug#35577, Bug#37669
View as plain text  
#At file:///home/malff/BZR-TREE/mysql-6.0-35577-merge/

------------------------------------------------------------
revno: 2717
revision-id: marc.alff@stripped
parent: gshchepa@stripped
parent: marc.alff@stripped
committer: Marc Alff <marc.alff@stripped>
branch nick: mysql-6.0-35577-merge
timestamp: Tue 2008-07-15 10:29:51 -0600
message:
  Bug#35577, manual merge mysql-5.1-bugteam -> mysql-6.0-bugteam
added:
  mysql-test/r/parser_stack.result parser_stack.result-20080710213555-qr1nm5k011b23116-1
  mysql-test/t/parser_stack.test parser_stack.test-20080710213601-cvl5jef5im7hzzbl-1
modified:
  sql/event_data_objects.cc      sp1f-event_timed.cc-20051205104456-ckd2gzuwhr4u5umqbncmt43nvv45pxmf
  sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
  sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
  sql/sp_head.cc                 sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd
  sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
  sql/sql_lex.cc                 sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph
  sql/sql_lex.h                  sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
  sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
  sql/sql_partition.cc           sp1f-sql_partition.cc-20050718113038-57h5bzswps6cel2y7k7qideue3ghbg3u
  sql/sql_plugin.cc              sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2
  sql/sql_prepare.cc             sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli
  sql/sql_trigger.cc             sp1f-sql_trigger.cc-20040907122911-35k3wamrp6g7qsupxe7hisftpobcwin5
  sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
  sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
    ------------------------------------------------------------
    revno: 2497.345.3
    revision-id: marc.alff@stripped
    parent: ramil@stripped
    parent: marc.alff@stripped
    committer: Marc Alff <marc.alff@stripped>
    branch nick: mysql-5.1-35577-merge
    timestamp: Mon 2008-07-14 19:43:12 -0600
    message:
      Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
    added:
      mysql-test/r/parser_stack.result parser_stack.result-20080710213555-qr1nm5k011b23116-1
      mysql-test/t/parser_stack.test parser_stack.test-20080710213601-cvl5jef5im7hzzbl-1
    modified:
      sql/event_data_objects.cc      sp1f-event_timed.cc-20051205104456-ckd2gzuwhr4u5umqbncmt43nvv45pxmf
      sql/mysql_priv.h               sp1f-mysql_priv.h-19700101030959-4fl65tqpop5zfgxaxkqotu2fa2ree5ci
      sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
      sql/sp_head.cc                 sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd
      sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
      sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
      sql/sql_lex.cc                 sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph
      sql/sql_lex.h                  sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
      sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
      sql/sql_partition.cc           sp1f-sql_partition.cc-20050718113038-57h5bzswps6cel2y7k7qideue3ghbg3u
      sql/sql_prepare.cc             sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli
      sql/sql_trigger.cc             sp1f-sql_trigger.cc-20040907122911-35k3wamrp6g7qsupxe7hisftpobcwin5
      sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
      sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
        ------------------------------------------------------------
        revno: 1810.3752.2
        revision-id: marc.alff@stripped
        parent: marc.alff@stripped
        parent: gshchepa@stripped
        committer: Marc Alff <marc.alff@stripped>
        branch nick: mysql-5.0-35577-merge
        timestamp: Mon 2008-07-14 15:47:34 -0600
        message:
          Merge
        modified:
          sql/item_strfunc.cc            sp1f-item_strfunc.cc-19700101030959-yl2pwnrngmla3nmlgiuiwrztx3iu4ffl
        ------------------------------------------------------------
        revno: 1810.3752.1
        revision-id: marc.alff@stripped
        parent: azundris@stripped
        committer: Marc Alff <marc.alff@stripped>
        branch nick: mysql-5.0-35577-merge
        timestamp: Mon 2008-07-14 15:41:30 -0600
        message:
          Bug#35577 (CREATE PROCEDURE causes either crash or syntax error depending on
          build)
          
          The crash was caused by freeing the internal parser stack during the parser
          execution.
          This occured only for complex stored procedures, after reallocating the parser
          stack using my_yyoverflow(), with the following C call stack:
          - MYSQLparse()
          - any rule calling sp_head::restore_lex()
          - lex_end()
          - x_free(lex->yacc_yyss), xfree(lex->yacc_yyvs)
          
          The root cause is the implementation of stored procedures, which breaks the
          assumption from 4.1 that there is only one LEX structure per parser call.
          
          The solution is to separate the LEX structure into:
          - attributes that represent a statement (the current LEX structure),
          - attributes that relate to the syntax parser itself (Yacc_state),
          so that parsing multiple statements in stored programs can create multiple
          LEX structures while not changing the unique Yacc_state.
          
          Now, Yacc_state and the existing Lex_input_stream are aggregated into
          Parser_state, a structure that represent the complete state of the (Lexical +
          Syntax) parser.
        added:
          mysql-test/r/parser_stack.result parser_stack.result-20080710213555-qr1nm5k011b23116-1
          mysql-test/t/parser_stack.test parser_stack.test-20080710213601-cvl5jef5im7hzzbl-1
        modified:
          sql/sp.cc                      sp1f-sp.cc-20021212121421-6xwuvxq5bku2b4yv655kp2e5gsvautd5
          sql/sp_head.cc                 sp1f-sp_head.cc-20021208185920-jtgc5wvyqdnu2gvcdus3gazrfhxbofxd
          sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
          sql/sql_class.h                sp1f-sql_class.h-19700101030959-jnqnbrjyqsvgncsibnumsmg3lyi7pa5s
          sql/sql_lex.cc                 sp1f-sql_lex.cc-19700101030959-4pizwlu5rqkti27gcwsvxkawq6bc2kph
          sql/sql_lex.h                  sp1f-sql_lex.h-19700101030959-sgldb2sooc7twtw5q7pgjx7qzqiaa3sn
          sql/sql_parse.cc               sp1f-sql_parse.cc-19700101030959-ehcre3rwhv5l3mlxqhaxg36ujenxnrcd
          sql/sql_prepare.cc             sp1f-sql_prepare.cc-20020612210720-gtqjjiu7vpmfxb5xct2qke7urmqcabli
          sql/sql_trigger.cc             sp1f-sql_trigger.cc-20040907122911-35k3wamrp6g7qsupxe7hisftpobcwin5
          sql/sql_view.cc                sp1f-sql_view.cc-20040715221517-nw4p4mja6nzzlvwwhzfgfqb4umxqobe4
          sql/sql_yacc.yy                sp1f-sql_yacc.yy-19700101030959-wvn4qyy2drpmge7kaq3dysprbhlrv27j
    ------------------------------------------------------------
    revno: 2497.345.2
    revision-id: ramil@stripped
    parent: ramil@stripped
    parent: gshchepa@stripped
    committer: Ramil Kalimullin <ramil@stripped>
    branch nick: b37669.5.1
    timestamp: Mon 2008-07-14 15:57:56 +0500
    message:
      auto-merge
    modified:
      client/mysqltest.c             sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
      configure.in                   sp1f-configure.in-19700101030959-mgdpoxtnh2ewmvusvfpkreuhwvffkcjw
      libmysqld/emb_qcache.cc        sp1f-emb_qcache.cc-20031201131847-myynfuq6x72jc2677yvwpv5prufpnvxa
      mysql-test/r/func_in.result    sp1f-func_in.result-20001228015633-taucsvp7ggm45m64jbcfu6nyfgdhosnc
      mysql-test/r/func_misc.result  sp1f-func_misc.result-20001228015633-4sy6dzzt7xcs4ubzcxloyguc7zhougbr
      mysql-test/r/max_user_connections_func.result sp1f-max_user_connections-20080410131337-xnqivtwdj7e4yub53fr3ci6bnioqsabo
      mysql-test/r/mysqltest.result  sp1f-mysqltest.result-20041022024801-dfor5httbrm4yhbhqtfjzpkst5hoejym
      mysql-test/suite/funcs_1/datadict/charset_collation.inc sp1f-charset_collation.in-20080307163305-edrudf23pcobanheiax4mtuw42llel37
      mysql-test/suite/funcs_1/t/charset_collation_1.test sp1f-charset_collation_1.-20080307163303-xoj2pleizxk54stjeffsheamxhopuxni
      mysql-test/suite/funcs_1/t/charset_collation_3.test sp1f-charset_collation_3.-20080307163303-wvj3wrresuqmlxzn3dvqppaajsi2ajdp
      mysql-test/suite/funcs_2/charset/charset_master.test sp1f-charset_master.test-20070206175440-sgefy4i6nwwi43svr5asovdpgvmycuvr
      mysql-test/suite/funcs_2/t/innodb_charset.test sp1f-innodb_charset.test-20070206180358-jwznkkalaqtecydoobuidk436pokqmvc
      mysql-test/suite/funcs_2/t/memory_charset.test sp1f-memory_charset.test-20070206180358-5uoxm3xp5xysaoi3lql7pj3vous7wi6k
      mysql-test/suite/funcs_2/t/myisam_charset.test sp1f-myisam_charset.test-20070206180358-4ddnsur4zeb2tsnsl24l2b4pm463jajn
      mysql-test/suite/funcs_2/t/ndb_charset.test sp1f-ndb_charset.test-20070206180358-jzvzee7vehbt3ze2rsdpfbms3xbnqoha
      mysql-test/suite/parts/inc/partition_check_drop.inc sp1f-partition_check_drop-20070206122150-msiad4yh2rpz5rw4mvio2uhtkeugbsfx
      mysql-test/suite/parts/inc/partition_layout.inc sp1f-partition_layout.inc-20060117062739-bl3wqlg6o3we423funhz77o77spxqykx
      mysql-test/suite/parts/inc/partition_layout_check1.inc sp1f-partition_layout_che-20070206122235-d5cge7vx544iv42gnrlln4yigezn4tq2
      mysql-test/suite/parts/inc/partition_layout_check2.inc sp1f-partition_layout_che-20070206122235-e5lxxz4xjjgth6tesls4x7hxdzhydp5m
      mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result sp1f-partition_alter1_1_2-20080513231048-ibvqvplo53vrvjs2wzrkrh5vaxmodixm
      mysql-test/suite/parts/r/partition_alter1_1_myisam.result sp1f-partition_alter1_1_m-20080513231048-c6i674jghn6f4qszjht76lxfxtfshxxp
      mysql-test/suite/parts/r/partition_alter1_2_myisam.result sp1f-partition_alter1_2_m-20080513231048-js52yzqp26p7455im7swficligsnnaki
      mysql-test/suite/parts/r/partition_alter2_myisam.result sp1f-partition_alter2_myi-20070206122236-jpkrr2v2pgpksws5xs3ecgy3jjd5od6c
      mysql-test/suite/parts/r/partition_alter3_innodb.result sp1f-partition_alter3_inn-20070206122236-wzwsaoeagleydj364f2u2pt2lslwqwwb
      mysql-test/suite/parts/r/partition_alter3_myisam.result sp1f-partition_alter3_myi-20070206122236-yu3lt72hpugp3xt5bnd2lspl35fg6eit
      mysql-test/suite/parts/r/partition_basic_innodb.result sp1f-partition_basic_inno-20070206122237-pzpy2hvit34fxpvkxic73muh7h66lqhm
      mysql-test/suite/parts/r/partition_basic_myisam.result sp1f-partition_basic_myis-20070206122237-ra3v2mwwwyd2tuddpu2ahvjvhg6wipqy
      mysql-test/suite/parts/r/partition_basic_symlink_myisam.result sp1f-partition_basic_syml-20080206141352-wwg6qk37quijmoqlubhbsgrkvybphmoc
      mysql-test/suite/parts/r/partition_engine_myisam.result sp1f-partition_engine_myi-20070206122237-2dovgbiyyvkmhmgarswhz3lgwi3awwq4
      mysql-test/suite/parts/r/partition_syntax_myisam.result sp1f-partition_syntax_myi-20070206122237-kr377sndti562n6qtkc5s52iqnptrigq
      mysql-test/t/func_in.test      sp1f-func_in.test-20001228015635-dykb2qebuowolk7cf6gpa4brezc4m5gk
      mysql-test/t/func_misc.test    sp1f-func_misc.test-20001228015635-kayguwcdgtjnekzavvdzbsnqcdwfm36c
      mysql-test/t/max_user_connections_func.test sp1f-max_user_connections-20080410131402-7hd5q3zzxki2pkvu5ungk3ealjczqpch
      mysql-test/t/mysqltest.test    sp1f-mysqltest.test-20041022024800-v3hvkzs4236l6rpunai7xttdltot7rvz
      sql/item_cmpfunc.cc            sp1f-item_cmpfunc.cc-19700101030959-hrk7pi2n6qpwxauufnkizirsoucdcx2e
      sql/item_strfunc.cc            sp1f-item_strfunc.cc-19700101030959-yl2pwnrngmla3nmlgiuiwrztx3iu4ffl
    ------------------------------------------------------------
    revno: 2497.345.1
    revision-id: ramil@stripped
    parent: marc.alff@stripped
    committer: Ramil Kalimullin <ramil@stripped>
    branch nick: b37669.5.1
    timestamp: Wed 2008-07-09 16:52:26 +0500
    message:
      Fix for bug#37669: Server crash by setting "@@session.innodb_table_locks"
      
      Problem: reading/writing data from/to an address without proper
      alignment leads to SIGBUS on some platforms.
      
      Fix: use the correct data type when dereferencing variable values.
    modified:
      sql/sql_plugin.cc              sp1f-sql_plugin.cc-20051105112032-hrm64p6xfjq33ud6zy3uivpo7azm75a2

Attachment: [text/text/x-diff] patch-2717.diff
Thread
bzr commit into mysql-6.0 tree (marc.alff:2717) Bug#35577, Bug#37669Marc Alff15 Jul