1. 25 Oct, 2005 3 commits
    • 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
  2. 24 Oct, 2005 15 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
      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
  3. 21 Oct, 2005 14 commits
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · d29ecd5e
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      
      d29ecd5e
    • unknown's avatar
      ctype_utf8.result: · 8ba28aa3
      unknown authored
        After merge fix.
      
      
      mysql-test/r/ctype_utf8.result:
        After merge fix.
      8ba28aa3
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · eddba2ea
      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.
      eddba2ea
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 0cd95ca6
      unknown authored
      into  mysql.com:/usr/home/pem/bug13941/mysql-5.0
      
      
      0cd95ca6
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · 08ed63ed
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      
      08ed63ed
    • unknown's avatar
      Post-review fix. · d9b0a62e
      unknown authored
      
      sql/sp_head.cc:
        Post-review fix; changed string copying method (+ fixed comment typo and indention).
      d9b0a62e
    • unknown's avatar
      Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · ea077883
      unknown authored
      into mysql.com:/home/gluh/MySQL/Bugs/5.0.14089
      
      
      ea077883
    • unknown's avatar
      Bug#13233 · c9978d8b
      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
      c9978d8b
    • unknown's avatar
      fix for bug#14089 FROM list subquery always fails when · 4c872f74
      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
      4c872f74
    • unknown's avatar
      Merge abarkov@bk-internal:/home/bk/mysql-5.0 · c2b83beb
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0.b12371
      
      
      c2b83beb
    • unknown's avatar
      Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 · 571d9cdd
      unknown authored
      into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
      
      
      571d9cdd
    • unknown's avatar
      bug#14199 - ndb leak of index opertaions in TC leading to error 288 · 740123a4
      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
      740123a4
    • unknown's avatar
      Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6e2f09ee
      unknown authored
      into lmy004.:/work/mysql-5.0-bug12595-4
      
      
      6e2f09ee
    • unknown's avatar
      fix for bug #12595 (ESCAPE must be exactly 1 character long) · ccc051cd
      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.
      ccc051cd
  4. 20 Oct, 2005 8 commits
    • unknown's avatar
      Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 885a0c14
      unknown authored
      into  mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      
      885a0c14
    • unknown's avatar
      Fix Bug#14107 (IM test failures on QNX) · a5f2355c
      unknown authored
      (v.2 with post-review fixes)
      
      
      server-tools/instance-manager/instance.cc:
        On QNX one cannot use fork() in multithreaded environment. Therefore we should use QNX's spawn()
      a5f2355c
    • unknown's avatar
      Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release · 9e23aa11
      unknown authored
      into mysql.com:/Users/kent/mysql/bk/mysql-5.0
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      9e23aa11
    • unknown's avatar
      configure.in: · ad731d38
      unknown authored
        Set the version number to 5.0.16
      
      
      configure.in:
        Set the version number to 5.0.16
      ad731d38
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 65ef7cc2
      unknown authored
      into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
      
      
      65ef7cc2
    • unknown's avatar
      Bug#12371: executing prepared statement fails (illegal mix of collations) · 06164d5d
      unknown authored
      ctype_utf8.test, ctype_utf8.result:
        Adding test case.
      item.h:
      item.cc:
        Adding Item_param::safe_charset_converter
      
      
      sql/item.cc:
         Bug#12371: executing prepared statement fails (illegal mix of collations)
        Adding Item_param::safe_charset_converter
      sql/item.h:
        Adding Item_param::safe_charset_converter
      mysql-test/r/ctype_utf8.result:
        Adding test case.
      mysql-test/t/ctype_utf8.test:
        Adding test case.
      06164d5d
    • unknown's avatar
      Merge mysql.com:/usr/home/bar/mysql-4.1 · b488e987
      unknown authored
      into  mysql.com:/usr/home/bar/mysql-5.0
      
      
      mysys/charset.c:
        Auto merged
      b488e987
    • unknown's avatar
      charset.c: · f4911002
      unknown authored
        Bug#13238 mysqldump and mysqladmin hangs
        Avoid recursion into init_available_charsets.
        Serg's version didn't work for me: I got 
        double mutex locking.
        Pushing this version instead
        (It was approved by Serg anyway)
      
      
      mysys/charset.c:
        Bug#13238 mysqldump and mysqladmin hangs
        Avoid recursion into init_available_charsets.
        Serg's version didn't work for me: I got 
        double mutex locking.
        Pushing this version instead
        (It was approved by Serg anyway)
      f4911002