1. 25 Oct, 2005 23 commits
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 70bae357
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      70bae357
    • unknown's avatar
      Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 33bea5b2
      unknown authored
      into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
      
      33bea5b2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7e39dcdb
      unknown authored
      into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
      
      7e39dcdb
    • unknown's avatar
      This cset fixes BUG# 12838, 14061, 12129 · 94562078
      unknown authored
      mysqldump.result:
        BUG# 12838
            New test results for mysqldump -x on a DB with views
      mysqldump.test:
        sqldump.test:
            BUG# 12838
            New test to run mysqldump -x on a DB with views
      mysqldump.c:
        BUG# 12838
            Removed/Changed code which created tables to be put into the dump
            (For loading views of views) by creating temp tables and then using
            the CREATE TABLE information in those temp tables. The problem with this
            is that when mysqldump -x is called, it locks all tables, so the
            temp tables could not be created, causing the mysqldump to exit with
            failure. The code was changed to use SHOW FIELDS to get the column
            names and type to build CREATE TABLE text used to create these tables
            that views need in the dump.
      
      
      client/mysqldump.c:
        BUG# 12838
            Removed/Changed code which created tables to be put into the dump
            (For loading views of views) by creating temp tables and then using
            the CREATE TABLE information in those temp tables. The problem with this
            is that when mysqldump -x is called, it locks all tables, so the
            temp tables could not be created, causing the mysqldump to exit with
            failure. The code was changed to use SHOW FIELDS to get the column
            names and type to build CREATE TABLE text used to create these tables
            that views need in the dump.
      mysql-test/t/mysqldump.test:
        sqldump.test:
            BUG# 12838
            New test to run mysqldump -x on a DB with views
      mysql-test/r/mysqldump.result:
        BUG# 12838
            New test results for mysqldump -x on a DB with views
      94562078
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 270891b3
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_yacc.yy:
        Auto merged
      270891b3
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.13820 · 6536d0cb
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/item_func.cc:
        Auto merged
      6536d0cb
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.13667 · ace6dfa5
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_parse.cc:
        Auto merged
      ace6dfa5
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · adb2263b
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      adb2263b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a7e512f
      unknown authored
      into  zim.(none):/home/acurtis/mysql-5.0-noraid.2
      
      
      sql/sql_yacc.yy:
        Auto merged
      7a7e512f
    • unknown's avatar
      Deprecate RAID create options · 54afd557
      unknown authored
      54afd557
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · b872cbe7
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      b872cbe7
    • unknown's avatar
      fix issue with IM that causes commandlines that are executed to be incorrect. · 6273205b
      unknown authored
      
      server-tools/instance-manager/instance.cc:
        terminate the new line buffer so our strcat's will work
      6273205b
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 969b99ac
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      969b99ac
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 676ca204
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b14207
      
      676ca204
    • unknown's avatar
      Converted mysys/base64.c into C code (not C++). · b1a2fef9
      unknown authored
      
      mysys/base64.c:
        Converted into C code (not C++).
      b1a2fef9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c422e674
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
      
      c422e674
    • unknown's avatar
      Fix for BUG#13037: undefined variable in IF cause erroneous error-message. · b584382f
      unknown authored
      
      mysql-test/r/sp-error.result:
        Results for the test case for BUG#13037.
      mysql-test/t/sp-error.test:
        Test case for BUG#13037.
      sql/sql_base.cc:
        Polishing: use constant.
      sql/sql_class.cc:
        Reset THD::where in THD::cleanup_after_query();
        Polishing: use the constant (THD::DEFAULT_WHERE).
      sql/sql_class.h:
        Introduce a constant for the default value of THD::where.
      b584382f
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8ff5e493
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b10303
      
      8ff5e493
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 134043a5
      unknown authored
      into  zim.(none):/home/brian/mysql/mysql-5.0
      
      
      sql/ha_innodb.cc:
        Auto merged
      134043a5
    • unknown's avatar
      Additional test request by Jonas. We check pushdown conditions for GEOM types. · 9dc8012b
      unknown authored
      
      mysql-test/r/ndb_gis.result:
        Result file change to check pushdown conditions.
      mysql-test/t/ndb_gis.test:
        pushdown conditions now checked for geom  types
      mysql-test/r/innodb_gis.result:
        New BitKeeper file ``mysql-test/r/innodb_gis.result''
      9dc8012b
    • unknown's avatar
      This patch add support for storing Geometry types to Archive, Innodb, NDB, and BDB. · 322d8d49
      unknown authored
      
      sql/ha_archive.h:
        Adding support for Geometry type to archive.
      sql/ha_berkeley.cc:
        Adding geometry support to berkely
      sql/ha_innodb.cc:
        Adding geometry support to Innodb.
      sql/ha_ndbcluster.cc:
        Adding Geometry support to NDB.
      mysql-test/include/gis_generic.inc:
        New BitKeeper file ``mysql-test/include/gis_generic.inc''
      mysql-test/r/archive_gis.result:
        New BitKeeper file ``mysql-test/r/archive_gis.result''
      mysql-test/r/bdb_gis.result:
        New BitKeeper file ``mysql-test/r/bdb_gis.result''
      mysql-test/r/ndb_gis.result:
        New BitKeeper file ``mysql-test/r/ndb_gis.result''
      mysql-test/t/archive_gis.test:
        New BitKeeper file ``mysql-test/t/archive_gis.test''
      mysql-test/t/bdb_gis.test:
        New BitKeeper file ``mysql-test/t/bdb_gis.test''
      mysql-test/t/innodb_gis.test:
        New BitKeeper file ``mysql-test/t/innodb_gis.test''
      mysql-test/t/ndb_gis.test:
        New BitKeeper file ``mysql-test/t/ndb_gis.test''
      322d8d49
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · a4685abd
      unknown authored
      into  mysql.com:/home/timka/mysql/src/5.0-bug-13832
      
      
      mysql-test/r/select.result:
        Auto merged
      mysql-test/t/select.test:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      a4685abd
    • unknown's avatar
      Fix for BUG#13832 - Unknown column t1.a in 'on clause'. · fedd917f
      unknown authored
      The cause for the bug is that the priorities of all rules/terminals
      that process the FROM clause are not fully specified, and the
      parser generator produces a parser that doesn't always parse
      the FROM clause so that JOINs are left-associative. As a result
      the final join tree produced by the parser is incorrect, which
      is the cause for subsequent name resolution to fail.
      
      
      mysql-test/r/select.result:
        Test for BUG#13832.
      mysql-test/t/select.test:
        Test for BUG#13832.
      sql/sql_yacc.yy:
        Fix for BUG#13832 - Unknown column t1.a in 'on clause'.
        
        List all join-related operators as having lower priority
        than the join operands to make the parser process join-
        related productions from left to right.
      fedd917f
  2. 24 Oct, 2005 16 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · b8a6f05c
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
      
      b8a6f05c
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 76d8a72e
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
      
      
      sql/log_event.h:
        Auto merged
      76d8a72e
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · d2e63709
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      d2e63709
    • unknown's avatar
      Fixed enum numbering, patch 2 · f878f7bb
      unknown authored
      
      sql/log_event.h:
        One enum value per line
        Fixed a mistake
        Added values to every line for strange compilers
      f878f7bb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2c7d5c4b
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
      
      2c7d5c4b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · db192547
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
      
      db192547
    • unknown's avatar
      Fix for BUG#13095: Cannot create VIEWs in prepared statements · b73a5f75
      unknown authored
        - allow CREATE VIEW as well as DROP VIEW to use in prepared statements;
        - fix CREATE VIEW implementation to make it work in prepared statements.
      
      
      mysql-test/r/sp.result:
        Results file for the test case for BUG#13095.
      mysql-test/t/sp.test:
        Test case for BUG#13095.
      sql/sql_lex.h:
        Added a variable to remember start of whole CREATE VIEW statement
        as well as start of its SELECT part.
      sql/sql_prepare.cc:
        Allow CREATE VIEW and DROP VIEW to use in prepared statements.
      sql/sql_view.cc:
        Use stored start of whole CREATE VIEW statement instead of thd->query,
        which differs from the original when prepared statement is executing.
      sql/sql_yacc.yy:
        Remember start of whole CREATE VIEW statement as well as start of its
        SELECT part.
      b73a5f75
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · aeb5f636
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      aeb5f636
    • unknown's avatar
      Disabled federated test, added then removed · 5bd68e42
      unknown authored
      federated.disabled and instead using disabled.def (per
      comments in this commit)
      
      disabled.def:
        disabled federated until bug 14272 is fixed.
      .del-federated.disabled~9e4cca59f547174d:
        Delete: mysql-test/t/federated.disabled
      federated.disabled:
        New BitKeeper file ``t/federated.disabled'' to disable federated test until
        Bug 14272 is fixed.
        new file
      
      
      BitKeeper/deleted/.del-federated.disabled~9e4cca59f547174d:
        Delete: mysql-test/t/federated.disabled
      mysql-test/t/disabled.def:
        disabled federated until bug 14272 is fixed.
      5bd68e42
    • unknown's avatar
      BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in · b25ee828
      unknown authored
      OPTIMIZE TABLE.
      
      
      sql/ha_innodb.cc:
        Fix for BUG#11704: "Found locks from different thread" warnings:
        The source of warnings was this scenario in OPTIMIZE:
          thr1: lock table with TL_WRITE_ONLY (InnoDB converts lock to TL_WRITE_ALLOW_WRITE)
          thr2: (UPDATE command) obtains a TL_WRITE_ALLOW_WRITE lock
          thr1: call mysql_lock_abort(). This function sets type of thr'1 lock to TL_WRITE_ONLY
          thr2: try to release thr2's lock. See two locks: TL_WRITE_ONLY, TL_WRITE_ALLOW_WRITE 
                and produce a warning.
        
        The fix: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in
        OPTIMIZE TABLE.
      b25ee828
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 5aae8fc7
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      
      ndb/src/mgmapi/mgmapi.cpp:
        Auto merged
      ndb/src/mgmsrv/Services.cpp:
        Auto merged
      5aae8fc7
    • unknown's avatar
      Reducing risk for incorrect merges. Since we are multiple teams working on · 64d5a78c
      unknown authored
      different features, adding numbering to enums reduce the risk that code will
      be merged incorrectly.  This particular enum must have fixed values to ensure
      that an upgraded server always can read old logs.  I added this, since I 
      noticed the incorrect order in the RBR clone.
      
      
      sql/log_event.h:
        Added numbering of enum values
      64d5a78c
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 5b4e13f9
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
      
      5b4e13f9
    • unknown's avatar
      Fix for dropping a table with frm file consisting of "junk" · 33f45772
      unknown authored
      
      mysql-test/r/show_check.result:
        Move result to correct place
      sql/sql_table.cc:
        Reset error if table_type is unknown. ie. the .frm file could not be opened
      33f45772
    • unknown's avatar
      a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH). · aca87441
      unknown authored
      
      sql/sql_show.cc:
        a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH).
        Interchange of CHARACTER_MAXIMUM_LENGTH and CHARACTER_OCTET_LENGTH.
      aca87441
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 409e6044
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b10303
      
      
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      sql/sql_cache.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      409e6044
  3. 23 Oct, 2005 1 commit