1. 03 Nov, 2005 1 commit
    • unknown's avatar
      Changes in get_table_type() and mysql_frm_type(). The main problem was · 2ca2aecd
      unknown authored
      that in mysql_rm_table_part2_with_lock() previously we needed to open
      same file twice. Now once is enough.
      
      
      sql/mysql_priv.h:
        Merged functions get_table_type() and mysql_frm_type() into one,
        using the name from latter one.
      sql/sql_base.cc:
        Changed get_table_type() to mysql_frm_type()
      sql/sql_delete.cc:
        Changed get_table_type() to mysql_frm_type()
      sql/sql_rename.cc:
        Changed get_table_type() to mysql_frm_type()
      sql/sql_show.cc:
        Changed get_table_type() to mysql_frm_type()
      sql/sql_table.cc:
        Changed get_table_type() to mysql_frm_type()
      sql/sql_view.cc:
        Merged code from get_table_type() and mysql_frm_type() into the latter one.
      sql/sql_view.h:
        Function prototype changes.
      sql/table.cc:
        No longer needed.
      2ca2aecd
  2. 25 Oct, 2005 7 commits
  3. 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
  4. 21 Oct, 2005 14 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · c924903d
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      c924903d
    • unknown's avatar
      ctype_utf8.result: · 58e09e24
      unknown authored
        After merge fix.
      
      
      mysql-test/r/ctype_utf8.result:
        After merge fix.
      58e09e24
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · 8c044507
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      
      mysql-test/t/ctype_utf8.test:
        Auto merged
      mysql-test/t/show_check.test:
        Auto merged
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/r/ctype_utf8.result:
        After merge fix.
      mysql-test/r/show_check.result:
        After merge fix.
      sql/item_strfunc.h:
        After merge fix.
      tests/mysql_client_test.c:
        After merge fix.
      8c044507
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 01cc9f1a
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      01cc9f1a
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · f3ee1afe
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      f3ee1afe
    • unknown's avatar
      Post-review fix. · d9dc38a8
      unknown authored
      
      sql/sp_head.cc:
        Post-review fix; changed string copying method (+ fixed comment typo and indention).
      d9dc38a8
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · baa9876c
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
      
      baa9876c
    • unknown's avatar
      Bug#13233 · cfc78dae
      unknown authored
        select distinct char(column) fails with utf8
      ctype_utf8.result, ctype_utf8.test:
        Adding test case
      sql_yacc.yy:
        Adding new syntax.
      item_strfunc.h:
        Fixing wrong max_length calculation.
        Also, adding CHAR(x USING charset),
        for easier migrating from 4.1 to 5.0,
        according to Monty's suggestion.
      
      
      sql/item_strfunc.h:
        Bug#13233
        select distinct char(column) fails with utf8
        Also, adding CHAR(x USING charset),
        for easier migrating from 4.1 to 5.0.
      sql/sql_yacc.yy:
        Adding new syntax.
      mysql-test/t/ctype_utf8.test:
        Adding test case
      mysql-test/r/ctype_utf8.result:
        Adding test case
      cfc78dae
    • unknown's avatar
      fix for bug#14089 FROM list subquery always fails when · cb76c37b
      unknown authored
                        information_schema is current database
        skip the check of I_S tables if table is derived table
      
      
      mysql-test/r/information_schema.result:
        fix for bug#14089 FROM list subquery always fails when 
                          information_schema is current database
          test case
      mysql-test/t/information_schema.test:
        fix for bug#14089 FROM list subquery always fails when 
                          information_schema is current database
          test case
      cb76c37b
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 3bacfc84
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      3bacfc84
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 35100d95
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      35100d95
    • unknown's avatar
      bug#14199 - ndb leak of index opertaions in TC leading to error 288 · 58852bb0
      unknown authored
      
      ndb/include/kernel/signaldata/DumpStateOrd.hpp:
        New dump for index operation count
      ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
        New dump for index operation count
        Fix leak on index ops
      58852bb0
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73223e9a
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595-4
      
      73223e9a
    • unknown's avatar
      fix for bug #12595 (ESCAPE must be exactly 1 character long) · 8a20d641
      unknown authored
      ESCAPE has length of 1 if specified and sql_mode is NO_BACKSLASH_ESCAPES
      or has length of 0 or 1 in every other situation.
      (approved patch applied on a up-to-date tree re-commit) 
      
      
      mysql-test/r/select.result:
        results of test for bug 12595
      mysql-test/t/select.test:
        test for bug #12595 (ESCAPE must be exactly one character long)
      sql/item_cmpfunc.cc:
        if ESCAPE was in the statement check whether its length is
        different than 1. In NO_BACKSLASH_ESCAPES mode only length of 1 is
        allowed, otherwise the length could be 0 or 1 character (code point
        in the sense of Unicode).
      sql/item_cmpfunc.h:
        pass variable from the parsing stage - whether
        ESCAPE clause was found in the statement
      sql/sql_help.cc:
        pass FALSE for escape_used_in_parsing because we
        want the default mode of no error checking - our internal code.
      sql/sql_lex.cc:
        initialized variable used to transfer information during
        parsing up in the stack when reducing in the grammar
      sql/sql_lex.h:
        new variable used for transfering information when
        reducing in the grammar.
      sql/sql_yacc.yy:
        initialize Lex->escape_used and then use it when reducing.
        This is needed as fix for bug #12595 to distinguish between
        situation where ESCAPE was found and when not because internally
        we may pass a string an empty string and there is no other way
        to find out whether this is correct or not in case of 
        NO_BACKSLASH_ESCAPES mode, which allows only length of 1 if
        ESCAPE is part of the SQL statement.
      8a20d641
  5. 20 Oct, 2005 2 commits