1. 26 Oct, 2005 1 commit
  2. 25 Oct, 2005 22 commits
    • unknown's avatar
      Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · e4408aec
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      e4408aec
    • unknown's avatar
      Merge mysql.com:/home/jimw/my/mysql-5.0-13534 · bb2f4b81
      unknown authored
      into  mysql.com:/home/jimw/my/mysql-5.0-clean
      
      
      bb2f4b81
    • unknown's avatar
      Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.0 · f4e4f846
      unknown authored
      into  asksasha.com:/reiser-data/mysql-dev/mysql-5.0-bug12974
      
      
      f4e4f846
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 48d5c28f
      unknown authored
      into mysql.com:/data0/mysqldev/patg/mysql-5.0-viewfix
      
      
      48d5c28f
    • unknown's avatar
      This cset fixes BUG# 12838, 14061, 12129 · cecdc15a
      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
      cecdc15a
    • unknown's avatar
      Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 015f5bd5
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_yacc.yy:
        Auto merged
      015f5bd5
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.13820 · e579fe3e
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/item_func.cc:
        Auto merged
      e579fe3e
    • unknown's avatar
      Merge deer.(none):/home/hf/work/mysql-5.0.13667 · 57982bcc
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_parse.cc:
        Auto merged
      57982bcc
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · 821107cf
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      821107cf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 54d1558c
      unknown authored
      into  zim.(none):/home/acurtis/mysql-5.0-noraid.2
      
      
      sql/sql_yacc.yy:
        Auto merged
      54d1558c
    • unknown's avatar
      Deprecate RAID create options · e1e02e68
      unknown authored
      e1e02e68
    • unknown's avatar
      fix issue with IM that causes commandlines that are executed to be incorrect. · 73b4d7eb
      unknown authored
      
      server-tools/instance-manager/instance.cc:
        terminate the new line buffer so our strcat's will work
      73b4d7eb
    • unknown's avatar
      Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 · eba555b3
      unknown authored
      into deer.(none):/home/hf/work/mysql-5.0.12267
      
      
      sql/sql_table.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      eba555b3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · abd77bc5
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b14207
      
      
      abd77bc5
    • unknown's avatar
      Converted mysys/base64.c into C code (not C++). · 10a889a5
      unknown authored
      
      mysys/base64.c:
        Converted into C code (not C++).
      10a889a5
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 6416abfd
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13037
      
      
      6416abfd
    • unknown's avatar
      Fix for BUG#13037: undefined variable in IF cause erroneous error-message. · 5ed3b0b3
      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.
      5ed3b0b3
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 786b5e95
      unknown authored
      into  mysql.com:/usr/home/ram/work/5.0.b10303
      
      
      786b5e95
    • unknown's avatar
      Merge mysql.com:/home/timka/mysql/src/5.0-virgin · 215602cb
      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
      215602cb
    • unknown's avatar
      Fix for BUG#13832 - Unknown column t1.a in 'on clause'. · 3efd251a
      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.
      3efd251a
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread · ab27a943
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      ab27a943
    • unknown's avatar
      Makefile.am: · e17b176e
      unknown authored
        Option to set environment variable MTR_BUILD_THREAD to a small
        number, from what mysql-test-run calculate port numbers that
        will not conflict with other runs with different thread num
      
      
      Makefile.am:
        Option to set environment variable MTR_BUILD_THREAD to a small
        number, from what mysql-test-run calculate port numbers that
        will not conflict with other runs with different thread num
      e17b176e
  3. 24 Oct, 2005 16 commits
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · bd3ec22f
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
      
      
      bd3ec22f
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 2e4b962d
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-enum-logtype
      
      
      sql/log_event.h:
        Auto merged
      2e4b962d
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 90573dec
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
      
      
      90573dec
    • unknown's avatar
      Fixed enum numbering, patch 2 · d63b12d9
      unknown authored
      
      sql/log_event.h:
        One enum value per line
        Fixed a mistake
        Added values to every line for strange compilers
      d63b12d9
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · ee46cce8
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
      
      
      ee46cce8
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1d0d71b0
      unknown authored
      into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-bug13095
      
      
      1d0d71b0
    • unknown's avatar
      Fix for BUG#13095: Cannot create VIEWs in prepared statements · 33d5d4ad
      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.
      33d5d4ad
    • unknown's avatar
      Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 49d0a3cc
      unknown authored
      into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
      
      
      49d0a3cc
    • unknown's avatar
      Disabled federated test, added then removed · e4309121
      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.
      e4309121
    • unknown's avatar
      BUG#11704: Make InnoDB not to convert TL_WRITE_ONLY locks to TL_WRITE_ALLOW_WRITE in · d91f4dea
      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.
      d91f4dea
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · 84626e70
      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
      84626e70
    • unknown's avatar
      Reducing risk for incorrect merges. Since we are multiple teams working on · b6975a83
      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
      b6975a83
    • unknown's avatar
      Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 · e897eb34
      unknown authored
      into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
      
      
      e897eb34
    • unknown's avatar
      Fix for dropping a table with frm file consisting of "junk" · 19758ce6
      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
      19758ce6
    • unknown's avatar
      a fix (bug #14207: strange change of values CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH). · e19b7f19
      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.
      e19b7f19
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 39af58db
      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
      39af58db
  4. 23 Oct, 2005 1 commit