1. 26 Nov, 2004 5 commits
  2. 25 Nov, 2004 23 commits
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · fe8724c2
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-wl2050-new
      
      fe8724c2
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · c5333cd8
      unknown authored
      into mysql.com:/home/cps/mysql/trees/mysql-5.0
      
      c5333cd8
    • unknown's avatar
      Merge mysql.com:/home/mydev/mysql-5.0 · 709285ab
      unknown authored
      into mysql.com:/home/mydev/mysql-5.0-wl2050-new
      
      
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      709285ab
    • unknown's avatar
      Fix for the unixware: non-posix sigwait · 8b02a0fb
      unknown authored
      
      server-tools/instance-manager/manager.cc:
        Use my_sigwait instead of sigwait
      8b02a0fb
    • unknown's avatar
      WL#2050 - CREATE USER and DROP USER and RENAME USER · 5e26cd43
      unknown authored
      Added new commands CREATE USER and RENAME USER.
      Changed behaviour of DROP USER.
      Changed an error messages for the new commands.
      
      
      Docs/mysqld_error.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      include/mysqld_error.h:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Changed an error code for more general use.
      mysql-test/r/grant.result:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Changed test results.
      mysql-test/r/grant2.result:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        New test results.
      mysql-test/r/ps_1general.result:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Changed test results.
      mysql-test/t/grant.test:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Updated old tests for new behaviour of DROP USER.
        It does now implicitly remove all privileges and
        does not fail when privileges are still in place.
        Fixed a typo, which left an user in the database,
        whereby other tests could be confused.
        Added a DROP USER for another test user.
      mysql-test/t/grant2.test:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added new tests for the new features.
      sql/share/czech/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/danish/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/dutch/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/english/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/estonian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/french/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/german/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/greek/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/hungarian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/italian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/japanese/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/korean/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/norwegian-ny/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/norwegian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/polish/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/portuguese/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/romanian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/russian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/serbian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/slovak/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/spanish/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/swedish/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/share/ukrainian/errmsg.txt:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Modified an error message for more general use.
      sql/sql_acl.cc:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added a destructor for the GRANT_TABLE object to get
        rid of a hash_column in cases where a nonsense row was
        read from the privilege tables. Added code to delete
        such an object when it is not entered into the 
        column_priv_hash due to a nonsense row.
        Added function comments to two unmodified functions.
        Replaced mysql_drop_user() by the implementation of all
        of the functions as specified in the Low Level Design.
      sql/sql_acl.h:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added prototypes for new functions.
      sql/sql_lex.h:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added new command codes for CREATE USER and
        RENAME USER.
      sql/sql_parse.cc:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added case clauses for the new commands CREATE USER
        and RENAME USER.
      sql/sql_yacc.yy:
        WL#2050 - CREATE USER and DROP USER and RENAME USER
        Added syntax for the new commands CREATE USER and 
        RENAME USER, reworked DROP USER, introduced a new
        'user_list' and 'rename_list', renamed the old 
        'user_list' to 'grant_list'. The difference is that
        'grant_list' contains 'grant_user' (with optional
        IDENTIFIED BY), while 'user_list' contains 'user'.
        Concentrated privilege initializazions into a new
        section 'clear_privileges'.
      5e26cd43
    • unknown's avatar
      Merge mysql.com:/usr/local/bk/mysql-5.0 · 506be434
      unknown authored
      into mysql.com:/home/pem/work/mysql-5.0
      
      506be434
    • unknown's avatar
      Fixed BUG#6807: Stored procedure crash if CREATE PROCEDURE ... KILL QUERY · ddf63bbb
      unknown authored
      ...and for PURGE BEFORE too. (Don't fix_fields in the parser!)
      
      
      mysql-test/r/sp-error.result:
        New test case for BUG#6807
      mysql-test/t/sp-error.test:
        New test case for BUG#6807
      sql/sql_lex.h:
        Purge and kill query args not needed in lex. (Using value_list instead)
      sql/sql_parse.cc:
        Evaluate purge before and kill query args in mysql_execute_command
        instead of in the parser. (Makes it work with stored procedures)
      sql/sql_yacc.yy:
        Don't evaluate (fix_fields) args in the parser for purge before and kill query.
        (Doesn't work with stored procedures)
      ddf63bbb
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · e24375fd
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
      
      
      mysql-test/r/fulltext.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/table.cc:
        Auto merged
      e24375fd
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 77a0f7ff
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
      
      77a0f7ff
    • unknown's avatar
      table.cc: · d35818bb
      unknown authored
        Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
      
      
      sql/table.cc:
        Bug #6802 MySQL 4.0's VARCHAR(NN) BINARY is interpreted as VARBINARY(NN) in 4.1
      d35818bb
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 3c5d3814
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6441
      
      
      sql/item_func.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      3c5d3814
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 9dc944c9
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      9dc944c9
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0466c917
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      0466c917
    • unknown's avatar
      ndb/src/common/logger/LogHandler.cpp · 93118f79
      unknown authored
          changed so that error is returned if format is wrong in logger param parsing
      ndb/src/common/logger/Logger.cpp
          some debuf printout added
      ndb/src/mgmsrv/InitConfigFileParser.cpp
          rewrote parsing on parseNameValuePair, was buggy
      
      
      ndb/src/common/logger/LogHandler.cpp:
        changed so that error is returned if format is wrong in logger param parsing
      ndb/src/common/logger/Logger.cpp:
        some debuf printout added
      ndb/src/mgmsrv/InitConfigFileParser.cpp:
        rewrote parsing on parseNameValuePair, was buggy
      93118f79
    • unknown's avatar
      Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2cc4d329
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      2cc4d329
    • unknown's avatar
      Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 0971d6f9
      unknown authored
      into mysql.com:/home/jonas/src/mysql-4.1
      
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Auto merged
      0971d6f9
    • unknown's avatar
      bug#6775 - ndb - fix bug introduced by bug fix · 64a9c403
      unknown authored
      
      ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
        Scan number allocation must be on table even in case of range scan
        Otherwise scan takeover won't work as LQHKEYREQ contains table
      64a9c403
    • unknown's avatar
      do not leave sql command uninitialized, because it used for detection need of... · bfe57bf8
      unknown authored
      do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing  during finding identifiers i
      
      
      sql/sql_lex.h:
        do not leave sql command uninitialized, because it used for detection need of preparation correct idends printing  during finding identifiers in table list (alias resolving tracking)
      bfe57bf8
    • unknown's avatar
      spelling fixed/comments added (postreview fixes) · d3a09b8c
      unknown authored
      
      sql/mysqld.cc:
        spelling fixed
      sql/sql_base.cc:
        spelling fixed
      sql/sql_delete.cc:
        spelling fixed
      sql/sql_parse.cc:
        comments added
      sql/sql_prepare.cc:
        comments added
      sql/sql_update.cc:
        spelling fixed
      sql/sql_view.cc:
        spelling fixed
      sql/table.cc:
        spelling fixed
      d3a09b8c
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · d827a8c4
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-join-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      d827a8c4
    • unknown's avatar
      post-merge fix · 04b6bf2c
      unknown authored
      
      mysql-test/r/view.result:
        changes in error number, and key in view processing
      mysql-test/t/view.test:
        changes in error number, and key in view processing
      sql/mysql_priv.h:
        changes functions
      sql/sp.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_base.cc:
        fixed finding table, taking in account join view, which can have not TABLE pointer
        now we report to setup_tables(), are we setuping SELECT...INSERT and ennumerete insert table separately
      sql/sql_delete.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_help.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_insert.cc:
        fixed returning value of functions
      sql/sql_load.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
        removed second setup_tables call (merge)
      sql/sql_olap.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_parse.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_prepare.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_select.cc:
        now we report to setup_tables(), are we setuping SELECT...INSERT
      sql/sql_update.cc:
        UPDATE->MULTIUPDATE switching fixed
      sql/sql_view.cc:
        returning value fixed
      sql/sql_view.h:
        returning value fixed
      04b6bf2c
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · a03cf092
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-clean
      
      a03cf092
    • unknown's avatar
      sql_select.cc: · d1e325c2
      unknown authored
        my_message_sql does not tolerate a NullS argument (segfault)
      
      
      sql/sql_select.cc:
        my_message_sql does not tolerate a NullS argument (segfault)
      d1e325c2
  3. 24 Nov, 2004 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 669a34fe
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      669a34fe
    • unknown's avatar
      bug#6784 · b5a7ee4d
      unknown authored
      mi_flush_bulk_insert (on dup key error in mi_write)
      was mangling info->dupp_key_pos
      
      b5a7ee4d
    • unknown's avatar
      lowercase_table3.result: · ef023fb8
      unknown authored
        Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension
      
      
      mysql-test/r/lowercase_table3.result:
        Correct InnoDB's result output in test; the pseudo-file-extension for InnoDB tables '.InnoDB' was replaced by a more realistic '.ibd' extension
      ef023fb8
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · aa25cfaf
      unknown authored
      into avenger.(none):/export/brian/mysql/merge/5.0
      
      aa25cfaf
    • unknown's avatar
      Merging 4.1 to 5.0 · ad5d5b4b
      unknown authored
      
      Build-tools/Do-compile:
        Auto merged
      client/Makefile.am:
        Auto merged
      client/mysqladmin.cc:
        Auto merged
      configure.in:
        Auto merged
      ndb/src/common/util/version.c:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      ndb/src/mgmsrv/main.cpp:
        Resolved NDB conflict between 4.1 and 5.0
      ad5d5b4b
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 8b451b6a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      8b451b6a
    • unknown's avatar
      A fix. Why didn't we use UINT_MAX32? · 9a4cb312
      unknown authored
      9a4cb312
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · b927c63d
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-error-5.0
      
      
      sql/item.cc:
        Auto merged
      sql/item.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/table.h:
        Auto merged
      b927c63d
    • unknown's avatar
      fixed problem in MacOS · 12ac3d30
      unknown authored
      correct printing of aliases
      
      
      mysql-test/r/lowercase_view.result:
        aliases in VIEWs
      mysql-test/t/lowercase_view.test:
        aliases in VIEWs
      sql/item.cc:
        tracking using aliases in indentifiers
      sql/item.h:
        tracking using aliases in indentifiers
      sql/sql_base.cc:
        tracking using aliases in indentifiers
      sql/sql_lex.cc:
        tracking using aliases in indentifiers
      sql/sql_lex.h:
        tracking using aliases in indentifiers
      sql/table.h:
        tracking using aliases in indentifiers
      12ac3d30
    • unknown's avatar
      configure.in: · a0e87092
      unknown authored
        Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
      
      
      innobase/configure.in:
        Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
      a0e87092
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d67814fe
      unknown authored
      into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
      
      d67814fe
    • unknown's avatar
      added explanation of error code 4335 · 3a731e7e
      unknown authored
      3a731e7e