1. 04 Apr, 2005 2 commits
  2. 03 Apr, 2005 7 commits
  3. 02 Apr, 2005 8 commits
    • unknown's avatar
      - stackoverflow check added for view of view processing · a50bf2f0
      unknown authored
      - fixed bug in join view processing
      - postreview fixes (BUG#9398 & BUG#8703)
      
      
      sql/sql_base.cc:
        used original TABLE object to get correct name of table and db
      sql/sql_view.cc:
        fixed bug of assigning select_lex for join view
      sql/table.cc:
        comment fixed
        stack overflow check added
        new method for underlying base table finding
      sql/table.h:
        comment fixed
        new method for underlying base table finding
      a50bf2f0
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · ecf8732c
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ecf8732c
    • unknown's avatar
      results updated · a77a2c83
      unknown authored
      a77a2c83
    • unknown's avatar
      merged · 5f8c654a
      unknown authored
      
      mysql-test/r/drop.result:
        Auto merged
      mysql-test/t/drop.test:
        Auto merged
      sql/share/english/errmsg.txt:
        Auto merged
      sql/share/russian/errmsg.txt:
        Auto merged
      sql/share/ukrainian/errmsg.txt:
        Auto merged
      5f8c654a
    • unknown's avatar
      bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names · 7d865e0b
      unknown authored
      sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)
      
      
      mysql-test/r/drop.result:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      mysql-test/t/drop.test:
        bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
      sql/share/english/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/russian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/share/ukrainian/errmsg.txt:
        allow longer "table names" as DROP TABLE puts a list here
      sql/sql_table.cc:
        print an error with a function that respects width modifiers (%.64s)
      7d865e0b
    • unknown's avatar
      postreview patch · cdad0890
      unknown authored
      
      sql/sql_view.cc:
        wording fixed
      cdad0890
    • unknown's avatar
      fix of required privileges for altering view VIEW (DELETE->DROP) (BUG#9260) · 9139be50
      unknown authored
      
      mysql-test/r/view.result:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      mysql-test/t/view.test:
        fix of required privileges for altering view VIEW (DELETE->DROP)
        new test of altering view
      sql/sql_view.cc:
        fix of required privileges for altering view VIEW (DELETE->DROP)
      9139be50
    • unknown's avatar
      mysqld.dsp: · ba8dc8e9
      unknown authored
        Corrected wrong exe naming from bad merge
      
      
      VC++Files/sql/mysqld.dsp:
        Corrected wrong exe naming from bad merge
      ba8dc8e9
  4. 01 Apr, 2005 16 commits
  5. 31 Mar, 2005 7 commits
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 5b0c7525
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-union_merge-5.0
      
      
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/item_subselect.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      5b0c7525
    • unknown's avatar
      postmerge 4.1->5.0 fixes · c831a156
      unknown authored
      
      mysql-test/r/group_by.result:
        result change
      mysql-test/r/union.result:
        result change
      mysql-test/r/view.result:
        result change
      mysql-test/t/subselect.test:
        fixed mistake of merge
      sql/field.cc:
        new 5.0 types support
        temporary table/db names detection in field fixed
      sql/field.h:
        removed non-existent methods
        added wrongly deleted during manual merge string
      sql/item.cc:
        support of new types added to merge of union types routines
      sql/item.h:
        fixed method definition
      sql/item_cmpfunc.cc:
        fixed type
      sql/item_func.h:
        item type name fixed
      sql/item_subselect.cc:
        added forgoten methods
      sql/item_subselect.h:
        fixed type
      sql/sql_derived.cc:
        fixed typo of manual merge
      sql/sql_view.cc:
        added new parameter
      c831a156
    • unknown's avatar
      Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ · ab77d7d7
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      ab77d7d7
    • unknown's avatar
      Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4a5057f9
      unknown authored
      into mysql.com:/home/svoj/devel/mysql/mysql-5.0
      
      
      4a5057f9
    • unknown's avatar
      BUG#9521 fix: · 231fdb4b
      unknown authored
      openssl_1 and rpl_openssl results difference
      
      
      mysql-test/r/openssl_1.result:
        Fix expected error messages.
      mysql-test/r/rpl_openssl.result:
        Fix show slave status output. This fix makes rpl_openssl work with openssl-0.9.7 and yassl.
      mysql-test/t/openssl_1.test:
        Fix expected error codes.
      231fdb4b
    • unknown's avatar
      25474644
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 · 407d8d87
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
      
      
      407d8d87