1. 27 Mar, 2008 21 commits
    • unknown's avatar
      Merge mysql.com:/misc/mysql/mysql-5.1 · 938e0817
      unknown authored
      into  mysql.com:/misc/mysql/mysql-5.1-opt
      
      
      CMakeLists.txt:
        Auto merged
      configure.in:
        Auto merged
      include/config-win.h:
        Auto merged
      include/my_global.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_db.cc:
        Auto merged
      storage/innobase/handler/ha_innodb.cc:
        Auto merged
      938e0817
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt · 50f2f20c
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      configure.in:
        Auto merged
      sql/item.cc:
        Auto merged
      50f2f20c
    • unknown's avatar
      Merge host.loc:/home/uchum/work/mysql-5.0 · abd0aeb8
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      configure.in:
        Auto merged
      sql/item.cc:
        Auto merged
      abd0aeb8
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · f1af4839
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      f1af4839
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a02f8c67
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      a02f8c67
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · afc05e63
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      afc05e63
    • unknown's avatar
      Merge trift2.:/MySQL/M51/ndb-decl-5.1 · 2e79d50b
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      2e79d50b
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt · 764e03ee
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      sql/sql_delete.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      configure.in:
        SCCS merged
      764e03ee
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 948da163
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      948da163
    • unknown's avatar
      BUG#25340 · b68bddae
      unknown authored
      b68bddae
    • unknown's avatar
      Merge host.loc:/home/uchum/work/4.1-opt · 9f8619d7
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      configure.in:
        Merge with 4.1-opt.
      9f8619d7
    • unknown's avatar
      Merge host.loc:/home/uchum/work/mysql-5.1 · 494b6f86
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      client/mysqltest.c:
        Auto merged
      mysql-test/r/information_schema.result:
        Auto merged
      mysql-test/t/information_schema.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      494b6f86
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 3890079a
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      3890079a
    • unknown's avatar
      Merge host.loc:/home/uchum/work/mysql-5.0 · 15b8b221
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      
      sql/sql_delete.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      15b8b221
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 216abda6
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      216abda6
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 774bd919
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      774bd919
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 · 6af7b853
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      6af7b853
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 288394f5
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
      
      288394f5
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 · d08e8faf
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      d08e8faf
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6b4a1d3c
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      sql/mysqld.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/r/drop.result:
        SCCS merged
      mysql-test/t/drop.test:
        SCCS merged
      6b4a1d3c
    • unknown's avatar
      Apply innodb-5.1-ss2360 snapshot · e4548830
      unknown authored
      Fixes:
      - Bug #34920: auto_increment resets to 1 on foreign key creation
        We need to use/inherit the passed in autoinc counter for ALTER TABLE
        statements too.
      
      
      mysql-test/r/innodb.result:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      mysql-test/t/innodb.test:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/dict/dict0dict.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/handler/ha_innodb.cc:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
        
        
        Revision r2345:
        branches/5.1: Fix Bug# 34920. We need to use/inherit the passed in autoinc
        counter for ALTER TABLE statements too.
      storage/innobase/handler/ha_innodb.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0dict.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/dict0mem.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/row0sel.h:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/include/univ.i:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      storage/innobase/row/row0sel.c:
        Apply innodb-5.1-ss2360 snapshot
        
        Revision r2353:
        branches/5.1: Change the InnoDB autoinc type to ulint64. For this added a
        new typedef to univ.i (ib_ulonglong). Added checks for overflow and removed
        the assertion where it crashed previously, since the type has now changed
        to unsigned, it doesn't make sense to check for < 0. Added new tests, to
        check for overflow, for the different INT types supported for both
        signed and unsigned.
      e4548830
  2. 26 Mar, 2008 19 commits
    • unknown's avatar
      view.result: · 908256b5
      unknown authored
        Post-merge fix (bug #35193).
      
      
      mysql-test/r/view.result:
        Post-merge fix (bug #35193).
      908256b5
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt · 73b659ad
      unknown authored
      into  host.loc:/home/uchum/work/5.1-opt
      
      
      mysql-test/r/view.result:
        Merge with 5.0-opt (bug#35193).
      mysql-test/t/view.test:
        Merge with 5.0-opt (bug#35193).
      sql/sql_select.cc:
        Merge with 5.0-opt (bug#35193).
      73b659ad
    • unknown's avatar
      Merge host.loc:/home/uchum/work/5.0-opt-35193 · e7efc8b9
      unknown authored
      into  host.loc:/home/uchum/work/5.0-opt
      
      e7efc8b9
    • unknown's avatar
      Post-merge fix. · 9bd13302
      unknown authored
      Query cache does now work with concurrent_insert=0. See
      Bug 33756 - query cache with concurrent_insert=0 appears broken
      
      9bd13302
    • unknown's avatar
      Fixed bug #35193. · b6bf896b
      unknown authored
      View definition as SELECT ... FROM DUAL WHERE ... has
      valid syntax, but use of such view in SELECT or
      SHOW CREATE VIEW syntax causes unexpected syntax error.
      
      Server omits FROM DUAL clause when storing view body
      string in a .frm file for further evaluation.
      However, syntax of SELECT-witout-FROM query is more
      restrictive than SELECT FROM DUAL syntax, and doesn't
      allow the WHERE clause.
      
      NOTE: this syntax difference is not documented.
      
      
      View registration procedure has been modified to
      preserve original structure of view's body.
      
      
      
      mysql-test/r/view.result:
        Added test case for bug #35193.
      mysql-test/t/view.test:
        Added test case for bug #35193.
      sql/sql_select.cc:
        Fixed bug #35193.
        The st_select_lex::print function always omits FROM DUAL clause,
        even if original SELECT query has the WHERE clause.
        
        The mysql_register_view function uses this function to reconstruct
        a body of view's AS clause for further evaluation and stores that
        reconstructed clause in a .frm file.
        
        SELECT without FROM syntax is more restrictive than 
        SELECT FROM DUAL syntax: second one allows
        the WHERE clause, but first one is not.
        
        Use of this view in SELECT or SHOW CREATE VIEW queries
        causes unexpected syntax errors.
        
        
        The st_select_lex::print function has been modified to
        reconstruct FROM DUAL clause in queries when needed.
        
        
        TODO: Syntax difference is not documented and should be
        eliminated, however improvement of
        the SELECT-without-FROM syntax is not trivial and leads to
        significant modification of grammar file because of additional
        shift/reduce conflicts.
      b6bf896b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · 13c3814f
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
      
      13c3814f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · 41d23a04
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      41d23a04
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build · 9c86d7b2
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      support-files/mysql.server.sh:
        Auto merged
      9c86d7b2
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 192fe25b
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      192fe25b
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 8b8c0762
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/t/query_cache.test:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      mysql-test/r/query_cache.result:
        SCCS merged
      8b8c0762
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 20cf640c
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      20cf640c
    • unknown's avatar
      Post-merge fix · 285de696
      unknown authored
      285de696
    • unknown's avatar
      Dummy change to force PushBuild. · 3cf73f27
      unknown authored
      3cf73f27
    • unknown's avatar
      Dummy change to force PushBuild. · 0b86a282
      unknown authored
      0b86a282
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-ateam · 98daf3fe
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/t/federated.test:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      mysql-test/suite/binlog/r/binlog_unsafe.result:
        Manual merge
      mysql-test/suite/binlog/t/binlog_unsafe.test:
        Manual merge
      98daf3fe
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · a68cb126
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_gb2312.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/slave.cc:
        Auto merged
      mysql-test/r/federated.result:
        Manual merge from 5.0
      mysql-test/t/federated.test:
        Manual merge from 5.0
      storage/federated/ha_federated.cc:
        Manual merge from 5.0
      a68cb126
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 375fae43
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_gb2312.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result:
        Auto merged
      mysql-test/suite/binlog/r/binlog_stm_ctype_cp932.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/log.cc:
        Auto merged
      sql/log_event.cc:
        Auto merged
      sql/rpl_rli.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/lib/mtr_report.pl:
        SCCS merged
      375fae43
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-ateam · 768d675a
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      768d675a
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 8f24dc76
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      mysql-test/r/ctype_big5.result:
        Auto merged
      mysql-test/r/ctype_cp932.result:
        Auto merged
      mysql-test/r/ctype_euckr.result:
        Auto merged
      mysql-test/r/ctype_gb2312.result:
        Auto merged
      mysql-test/r/ctype_gbk.result:
        Auto merged
      mysql-test/r/ctype_uca.result:
        Auto merged
      mysql-test/r/ctype_ucs.result:
        Auto merged
      mysql-test/t/ctype_ucs.test:
        Auto merged
      sql/slave.cc:
        Auto merged
      8f24dc76