1. 25 Jan, 2007 14 commits
  2. 24 Jan, 2007 26 commits
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 247bd923
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Use local.
      mysql-test/t/myisam.test:
        Use local.
      247bd923
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 1cf81178
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/lock.cc:
        Auto merged
      sql/opt_range.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      storage/federated/ha_federated.cc:
        Auto merged
      storage/myisam/mi_check.c:
        Auto merged
      storage/myisam/mi_packrec.c:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      1cf81178
    • unknown's avatar
      Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 53491b18
      unknown authored
      into  weblab.(none):/home/marcsql/TREE/mysql-5.1-21029
      
      
      Makefile.am:
        Auto merged
      sql/Makefile.am:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      53491b18
    • unknown's avatar
      Bug#21029 (Dependencies between sql_yacc.cc and dependent headers not detected) · 39cc6d11
      unknown authored
      The build scripts in general, using automake, autoconf, etc, contain several
      special commands and work around all related to the way the bison code in the
      parser is built, for sql/sql_yacc.yy. These work arounds, accumulated over
      time during development, ultimately cause the build scripts to be unstable
      and cause build defects by not enforcing dependencies.
      
      This fix simplifies the build process and aligns it with the automake tooling,
      which provides native support for bison and *.yy files.
      
      In particular, the following problem have been fixed:
      - dependencies with sql_yacc.cc were not honored (Bug 21029), leading to
        corrupted builds,
      - the work around introduced by Bug 24557, to cleanup the generated files
        sql_yacc.h and sql_yacc.cc, has been removed,
      - the generated makefile, in a source distribution, used to destroy the files
        sql_yacc.h and sql_yacc.cc on a 'make clean' target. This has been fixed:
        these files are now removed by make maintainer-clean.
      - The root cause of the problem found with gcc 4.1 (see Bug 24619) has been
        clearly documented, and the "sed" hack has been replaced by a cleaner
        work around, when building the code with bison 1.875.
      - Removed the file sql/sql_yacc.yy.bak, added by WL 3031 by accident.
      - Removed the unnecessary AM_YFLAG= --debug introduced by WL 3432, since
        the compiling option DBUG_OFF takes precedence when setting YYDEBUG.
      
      
      BitKeeper/deleted/.del-sql_yacc.yy.bak:
        Rename: sql/sql_yacc.yy.bak -> BitKeeper/deleted/.del-sql_yacc.yy.bak
      Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/Makefile.am:
        General cleanup of the build process for sql_yacc.yy
      sql/sql_yacc.yy:
        General cleanup of the build process for sql_yacc.yy
      39cc6d11
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 2ed7eaf5
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/t/myisam.test:
        Auto merged
      2ed7eaf5
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · c26ffedb
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
      
      
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/symlink.test:
        Auto merged
      sql/table.cc:
        Auto merged
      mysql-test/r/myisam.result:
        Manually merged.
      mysql-test/t/myisam.test:
        Manually merged.
      c26ffedb
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge · 5c0216c5
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/ps.test:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      mysql-test/t/disabled.def:
        Manual merge.
      5c0216c5
    • unknown's avatar
      Disabling back im_daemon_life_cycle.test, which was temporarily enabled in · 259a4658
      unknown authored
      the team tree for additional investigation.
      
      
      259a4658
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7b109de6
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.0-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      7b109de6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 491ef6af
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
      
      
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      491ef6af
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 6bb5fd6b
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      6bb5fd6b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines · e8ca911f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24607
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      e8ca911f
    • unknown's avatar
      After merge fix · 89f02b13
      unknown authored
      89f02b13
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-5.0-bug24607 · 389388f1
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.1-bug24607
      
      
      mysql-test/t/myisam.test:
        Auto merged
      mysql-test/r/myisam.result:
        Manual merged
      389388f1
    • unknown's avatar
      Bug#24607 - MyISAM pointer size determined incorrectly · ccb002db
      unknown authored
      After merge fix
      
      
      ccb002db
    • unknown's avatar
      Merge chilla.local:/home/mydev/mysql-4.1-bug24607 · 4f73c75f
      unknown authored
      into  chilla.local:/home/mydev/mysql-5.0-bug24607
      
      
      mysql-test/r/myisam.result:
        Manual merged
      mysql-test/t/myisam.test:
        Manual merged
      4f73c75f
    • unknown's avatar
      Bug#24607 - MyISAM pointer size determined incorrectly · 112ef50f
      unknown authored
      Fixed test. On 32-bit machines which compile without
      -DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
      Using a value below 4G is portable.
      
      
      mysql-test/r/myisam.result:
        Bug#24607 - MyISAM pointer size determined incorrectly
        Fixed test results.
      112ef50f
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · bb5dccf2
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
      
      
      sql/ha_ndbcluster.cc:
        Auto merged
      bb5dccf2
    • unknown's avatar
      Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e57ef96a
      unknown authored
      into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
      
      
      e57ef96a
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines · 8b405d4f
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      8b405d4f
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines · 6216e794
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
      
      
      6216e794
    • unknown's avatar
      After merge fix. · 5e0fd916
      unknown authored
      5e0fd916
    • unknown's avatar
      Fixed test case after merging fix for bug#24491 "using alias from source · 07b6b2f8
      unknown authored
      table in insert ... on duplicate key" in 5.1 tree.
      
      
      mysql-test/t/sp-error.test:
        After merge fix.
      07b6b2f8
    • unknown's avatar
      Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491 · a45938bf
      unknown authored
      into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
      
      
      mysql-test/t/sp-error.test:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      mysql-test/r/ps.result:
        SCCS merged
      mysql-test/r/sp-error.result:
        SCCS merged
      mysql-test/t/disabled.def:
        SCCS merged
      mysql-test/t/ps.test:
        SCCS merged
      a45938bf
    • unknown's avatar
      Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines · 4c51028e
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
      
      
      mysql-test/r/myisam.result:
        Auto merged
      mysql-test/t/myisam.test:
        Auto merged
      4c51028e
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines · 89e558c9
      unknown authored
      into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
      
      
      89e558c9