1. 27 Mar, 2008 12 commits
    • unknown's avatar
      Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 0c2b6330
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      0c2b6330
    • unknown's avatar
      Merge trift2.:/MySQL/M51/ndb-decl-5.1 · a0cf1fa1
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      a0cf1fa1
    • unknown's avatar
      Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 648dae60
      unknown authored
      into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
      
      
      BitKeeper/deleted/.del-configure.js:
        Auto merged
      648dae60
    • unknown's avatar
      BUG#25340 · 5a6b357e
      unknown authored
      5a6b357e
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 09d7b08a
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      configure.in:
        Auto merged
      09d7b08a
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 797a2d68
      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
      797a2d68
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · 9878e861
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      configure.in:
        Auto merged
      9878e861
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50 · db9df4c7
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      db9df4c7
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 42a06b46
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50
      
      
      42a06b46
    • unknown's avatar
      Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51 · f676e122
      unknown authored
      into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
      
      
      f676e122
    • unknown's avatar
      Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 45ebe995
      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
      45ebe995
    • unknown's avatar
      Apply innodb-5.1-ss2360 snapshot · 9aaab69a
      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.
      9aaab69a
  2. 26 Mar, 2008 15 commits
    • unknown's avatar
      Post-merge fix. · 321f392f
      unknown authored
      Query cache does now work with concurrent_insert=0. See
      Bug 33756 - query cache with concurrent_insert=0 appears broken
      
      
      321f392f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build · c932049c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
      
      
      c932049c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build · 19afc9d9
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      19afc9d9
    • unknown's avatar
      Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build · faf1d55c
      unknown authored
      into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
      
      
      support-files/mysql.server.sh:
        Auto merged
      faf1d55c
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 0fe833f4
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.1-axmrg
      
      
      0fe833f4
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 98b77660
      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
      98b77660
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 4eaa7303
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      4eaa7303
    • unknown's avatar
      Post-merge fix · 10d9d68d
      unknown authored
      10d9d68d
    • unknown's avatar
      Dummy change to force PushBuild. · 27c0540b
      unknown authored
      27c0540b
    • unknown's avatar
      Dummy change to force PushBuild. · c49632cf
      unknown authored
      c49632cf
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-ateam · cebc10e3
      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
      cebc10e3
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-axmrg · f77bca69
      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
      f77bca69
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.1-amain · 03c110ea
      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
      03c110ea
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-ateam · 7587a871
      unknown authored
      into  stella.local:/home2/mydev/mysql-5.0-axmrg
      
      
      7587a871
    • unknown's avatar
      Merge stella.local:/home2/mydev/mysql-5.0-amain · 0d6f9bad
      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
      0d6f9bad
  3. 25 Mar, 2008 13 commits
    • unknown's avatar
      Bug#35559 - plugin_load.test creates warnings · a1de91e7
      unknown authored
      plugin_load.test created lines in the warnings files and made
      pushbuild cells yellow. Some pushbuild systems are configured
      so that they don't build the ha_example plugin. Trying to load
      them creates error messages in the error log. These were copied
      to the warnings file.
      
      Fixed by ignoring expected error messages for non-existent
      ha_example.
      
      
      mysql-test/lib/mtr_report.pl:
        Bug#35559 - plugin_load.test creates warnings
        Ignore expected error messages for non-existent ha_example.
      a1de91e7
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 · ca57d040
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      ca57d040
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG35509/mysql-5.0-engines · 3e28618f
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG34768/mysql-5.1-engines
      
      
      mysql-test/t/federated.test:
        Auto merged
      storage/federated/ha_federated.cc:
        Use local.
      3e28618f
    • unknown's avatar
      Merge trift2.:/MySQL/M50/push-5.0 · 891e811a
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      891e811a
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · 00991357
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      00991357
    • unknown's avatar
      Merge trift2.:/MySQL/M51/mysql-5.1 · e01bedb2
      unknown authored
      into  trift2.:/MySQL/M51/push-5.1
      
      
      e01bedb2
    • unknown's avatar
      Eliminating compiler warnings. · 2daa0168
      unknown authored
      
      sql/set_var.h:
        Changing order of initializer list for sys_var class constructor to
        eliminate compiler warning.
      mysql-test/suite/binlog/combinations:
        New BitKeeper file ``mysql-test/suite/binlog/combinations''
      2daa0168
    • unknown's avatar
      BUG#34789 - drop server/create server leaks memory ! · 811fb145
      unknown authored
      BUG#34790 - 'create server' doesn't handle out of memory scenario
                  well enough
      
      This is an addition to fixes for these bugs, which makes gcov
      happy.
      
      
      mysql-test/r/federated.result:
        CREATE SERVER is only tested by federated_server.test, which requires
        big-test option. Added dummy test case to make gcov happy.
      mysql-test/t/federated.test:
        CREATE SERVER is only tested by federated_server.test, which requires
        big-test option. Added dummy test case to make gcov happy.
      sql/sql_parse.cc:
        Make gcov happy.
      811fb145
    • unknown's avatar
      BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode · 2b2ae926
      unknown authored
                  if binlog_format=mixed
      
      Addition to fix for BUG#34768: fixed test case failures discovered
      by pushbuild.
      
      
      mysql-test/suite/binlog/r/binlog_stm_ps.result:
        Fixed binlog_stm_ps failure when binlog format is statement:
        - this test case makes sence only if binlog format is statement,
          thus execute it only in this mode;
        - added a warning that insert ... select ... limit is not safe
          to execute in statement mode.
      mysql-test/suite/binlog/t/binlog_stm_ps.test:
        Fixed binlog_stm_ps failure when binlog format is statement:
        - this test case makes sence only if binlog format is statement,
          thus execute it only in this mode;
        - added a warning that insert ... select ... limit is not safe
          to execute in statement mode.
      mysql-test/suite/rpl/t/rpl_optimize.test:
        rpl_optimize test may be executed in various binlog format modes.
        In statement mode delete ... limit issues a warning, in mixed and
        row modes it does not.
        
        Fixed a test case so it is still possible to execute it in all binlog
        format modes by ignoring delete ... limit warnings.
      mysql-test/suite/rpl/t/rpl_user_variables.test:
        rpl_user_variables test may be executed in various binlog format modes.
        In statement mode insert ... select ... limit issues a warning,
        in mixed and row modes it does not.
        
        Fixed a test case so it is still possible to execute it in all binlog
        format modes by ignoring insert ... select ... limit warnings.
      2b2ae926
    • unknown's avatar
      Merge trift2.:/MySQL/M50/mysql-5.0 · d6fc09af
      unknown authored
      into  trift2.:/MySQL/M50/push-5.0
      
      
      d6fc09af
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt · a9283538
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      sql/sql_delete.cc:
        Auto merged
      a9283538
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1 · 6cd3a150
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
      
      
      sql/sql_delete.cc:
        Auto merged
      6cd3a150
    • unknown's avatar
      Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0 · 4816e7b7
      unknown authored
      into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
      
      
      sql/sql_delete.cc:
        Auto merged
      4816e7b7