1. 05 Oct, 2004 4 commits
    • unknown's avatar
      postmerge fix · 61e96be7
      unknown authored
      61e96be7
    • unknown's avatar
      merge · 75730fb3
      unknown authored
      
      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_class.h:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      75730fb3
    • unknown's avatar
      join_outer.result, join_outer.test: · dc25de58
      unknown authored
        Added a test case for bug #5896.
      sql_select.cc:
        Fixed the problem of ignoring on expressions depending
        only on outer table when outer table either contains
        1 row or is guaranteed to return only 1 row (bug #5896).
      
      
      sql/sql_select.cc:
        Fixed the problem of ignoring on expressions depending
        only on outer tables when outer tables either contained
        1 row or is guaranteed to return not more than 1 row.
        (bug #5896).
      mysql-test/t/join_outer.test:
        Added a test case for bug #5896.
      mysql-test/r/join_outer.result:
        Added a test case for bug #5896.
      dc25de58
    • unknown's avatar
      After merge fixes · 2f9c7c0b
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Fixed tests (changed becasue of new checking of float numbers during parsing)
      2f9c7c0b
  2. 04 Oct, 2004 5 commits
    • unknown's avatar
      merge · 45a7c658
      unknown authored
      
      mysql-test/r/sp.result:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      45a7c658
    • unknown's avatar
      Fixed bug in strict mode (A state was not properly cleared on successful insert/update's) · c7cf529f
      unknown authored
      
      mysql-test/mysql-test-run.sh:
        Print less text on failure
      mysql-test/r/strict.result:
        More tests for strict mode
      mysql-test/t/strict.test:
        More tests for strict mode
      sql/set_var.cc:
        Don't clear any flags in traditional mode
      sql/sql_insert.cc:
        Fixed bug in strict mode
      sql/sql_update.cc:
        Fixed bug in strict mode
      c7cf529f
    • unknown's avatar
      merge · faea8411
      unknown authored
      
      sql/sql_class.h:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      faea8411
    • unknown's avatar
      postmerge fix · 50cc3e4a
      unknown authored
      50cc3e4a
    • unknown's avatar
      fixed problem with freeing stack memory · 99bf885b
      unknown authored
      99bf885b
  3. 02 Oct, 2004 1 commit
    • unknown's avatar
      More fixes for strict mode: · 6966e869
      unknown authored
      More tests.
      Better error messages.
      Fixed bug when checking if we updated all needed columns for INSERT.
      Give an error if we encounter a wrong float value during parsing.
      Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS.
      Fixed UPDATE IGNORE when using STRICT mode.
      
      
      include/mysqld_error.h:
        More error messages for strict mode
      include/sql_state.h:
        Fixed wrong state
        New error message
      mysql-test/r/alter_table.result:
        Updated results for not automatic default fields
      mysql-test/r/auto_increment.result:
        Better error messages
      mysql-test/r/create.result:
        Updated results for not automatic default fields
        Better error messages
      mysql-test/r/ctype_collate.result:
        Updated results for not automatic default fields
      mysql-test/r/ctype_latin1_de.result:
        Updated results for not automatic default fields
      mysql-test/r/ctype_many.result:
        Updated results for not automatic default fields
      mysql-test/r/ctype_recoding.result:
        Updated results for not automatic default fields
      mysql-test/r/gis-rtree.result:
        Updated results for not automatic default fields
      mysql-test/r/gis.result:
        Updated results for not automatic default fields
      mysql-test/r/innodb.result:
        Updated results for not automatic default fields
      mysql-test/r/insert.result:
        Better error messages
      mysql-test/r/insert_select.result:
        Better error messages
      mysql-test/r/isam.result:
        Updated results for not automatic default fields
      mysql-test/r/key.result:
        Better error messages
      mysql-test/r/merge.result:
        Updated results for not automatic default fields
      mysql-test/r/null.result:
        Better error messages
      mysql-test/r/null_key.result:
        Better error messages
      mysql-test/r/ps_1general.result:
        Updated results for not automatic default fields
      mysql-test/r/select.result:
        Drop views that may interfere with later results
      mysql-test/r/show_check.result:
        Updated results for not automatic default fields
      mysql-test/r/sp.result:
        Updated results for not automatic default fields
      mysql-test/r/strict.result:
        More tests
      mysql-test/r/type_set.result:
        Updated results for not automatic default fields
      mysql-test/r/warnings.result:
        Better error messages
      mysql-test/t/insert.test:
        Using wrong float values now gives an error
      mysql-test/t/select.test:
        Drop views that may interfere with later results
      mysql-test/t/strict.test:
        More tests
      scripts/mysql_fix_privilege_tables.sql:
        Add missing DEFAULT's
      sql/field.cc:
        Fix some strict mode issues for float and double
      sql/field.h:
        Fix DEFAULT handling
      sql/item.cc:
        Give an error if we encounter a wrong float value during parsing.
        Give an error if we use DEFAULT() on a field that doesn't have a default value.
      sql/item.h:
        Give an error if we encounter a wrong float value during parsing.
      sql/mysqld.cc:
        More debug info
      sql/share/czech/errmsg.txt:
        Better error messages
      sql/share/danish/errmsg.txt:
        Better error messages
      sql/share/dutch/errmsg.txt:
        Better error messages
      sql/share/english/errmsg.txt:
        Better error messages
      sql/share/estonian/errmsg.txt:
        Better error messages
      sql/share/french/errmsg.txt:
        Better error messages
      sql/share/german/errmsg.txt:
        Better error messages
      sql/share/greek/errmsg.txt:
        Better error messages
      sql/share/hungarian/errmsg.txt:
        Better error messages
      sql/share/italian/errmsg.txt:
        Better error messages
      sql/share/japanese/errmsg.txt:
        Better error messages
      sql/share/korean/errmsg.txt:
        Better error messages
      sql/share/norwegian-ny/errmsg.txt:
        Better error messages
      sql/share/norwegian/errmsg.txt:
        Better error messages
      sql/share/polish/errmsg.txt:
        Better error messages
      sql/share/portuguese/errmsg.txt:
        Better error messages
      sql/share/romanian/errmsg.txt:
        Better error messages
      sql/share/russian/errmsg.txt:
        Better error messages
      sql/share/serbian/errmsg.txt:
        Better error messages
      sql/share/slovak/errmsg.txt:
        Better error messages
      sql/share/spanish/errmsg.txt:
        Better error messages
      sql/share/swedish/errmsg.txt:
        Better error messages
      sql/share/ukrainian/errmsg.txt:
        Better error messages
      sql/sql_insert.cc:
        Fixed bug in last push of checking of default values.
      sql/sql_parse.cc:
        Enum fields has always a default value
      sql/sql_show.cc:
        Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS
      sql/sql_table.cc:
        Fixed storing/retrieving of NO_DEFAULT_VALUE_FLAG
      sql/sql_update.cc:
        Don't abort for wrong values for UPDATE IGNORE
      sql/sql_yacc.yy:
        Abort if we find a wrong float value
      sql/table.cc:
        Fixed storing/retrieving of NO_DEFAULT_VALUE_FLAG
      6966e869
  4. 01 Oct, 2004 2 commits
  5. 29 Sep, 2004 3 commits
    • unknown's avatar
      Fixed BUG#4905: Stored procedure doesn't clear for "Rows affected". · aaa54ac7
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#4905
      mysql-test/t/sp.test:
        New test case for BUG#4905
      sql/sql_parse.cc:
        Reset row count before CALL.
      aaa54ac7
    • unknown's avatar
      merge · 40ac8462
      unknown authored
      
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.h:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.h:
        Auto merged
      40ac8462
    • unknown's avatar
      post review changes: · e05e1860
      unknown authored
      CHECK OPTION moved to one function
      view name added to error messages
      
      
      mysql-test/r/view.result:
        error messages changed
      sql/share/czech/errmsg.txt:
        view name added
      sql/share/danish/errmsg.txt:
        view name added
      sql/share/dutch/errmsg.txt:
        view name added
      sql/share/english/errmsg.txt:
        view name added
      sql/share/estonian/errmsg.txt:
        view name added
      sql/share/french/errmsg.txt:
        view name added
      sql/share/german/errmsg.txt:
        view name added
      sql/share/greek/errmsg.txt:
        view name added
      sql/share/hungarian/errmsg.txt:
        view name added
      sql/share/italian/errmsg.txt:
        view name added
      sql/share/japanese/errmsg.txt:
        view name added
      sql/share/korean/errmsg.txt:
        view name added
      sql/share/norwegian-ny/errmsg.txt:
        view name added
      sql/share/norwegian/errmsg.txt:
        view name added
      sql/share/polish/errmsg.txt:
        view name added
      sql/share/portuguese/errmsg.txt:
        view name added
      sql/share/romanian/errmsg.txt:
        view name added
      sql/share/russian/errmsg.txt:
        view name added
      sql/share/serbian/errmsg.txt:
        view name added
      sql/share/slovak/errmsg.txt:
        view name added
      sql/share/spanish/errmsg.txt:
        view name added
      sql/share/swedish/errmsg.txt:
        view name added
      sql/share/ukrainian/errmsg.txt:
        view name added
      sql/sql_class.h:
        view reference saved
      sql/sql_insert.cc:
        CHECK OPTION moved to one function
      sql/sql_update.cc:
        CHECK OPTION moved to one function
      sql/sql_view.cc:
        view name added to error message
      sql/table.cc:
        CHECK OPTION moved to one function
      sql/table.h:
        CHECK OPTION moved to one function
      e05e1860
  6. 28 Sep, 2004 4 commits
    • unknown's avatar
      mysqldump.c: · f61034d7
      unknown authored
        Add missing semicolons.
      
      
      client/mysqldump.c:
        Add missing semicolons.
      f61034d7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · eb4b8b13
      unknown authored
      into mishka.local:/home/my/mysql-5.0
      
      
      mysql-test/r/sp.result:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      eb4b8b13
    • unknown's avatar
      Strict mode & better warnings · 2a491215
      unknown authored
      Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
      Added checking of date/datetime fields.
      If strict mode, give error if we have not given value to field without a default value (for INSERT)
      
      
      client/mysqltest.c:
        Added --exit as an option to abort a test in a middle (good for debugging)
      include/my_time.h:
        Added flags to allow checking of dates in strict mode
      include/mysql_com.h:
        Added flag to check if field has a default value or not
      include/mysqld_error.h:
        New error messages for strict mode
      include/sql_state.h:
        Fixed SQL states (for strict mode tests)
      mysql-test/r/auto_increment.result:
        Updated error messages
      mysql-test/r/func_sapdb.result:
        Added test for ALLOW_INVALID_DATES
      mysql-test/r/func_str.result:
        Updated error messages
      mysql-test/r/func_time.result:
        Updated error messages
      mysql-test/r/insert.result:
        Updated error messages
      mysql-test/r/loaddata.result:
        Updated error messages
      mysql-test/r/select.result:
        Updated error messages
      mysql-test/r/sp.result:
        Updated error messages
      mysql-test/r/timezone2.result:
        Updated error messages
      mysql-test/r/type_datetime.result:
        Updated error messages
      mysql-test/r/type_decimal.result:
        Updated error messages
      mysql-test/r/type_float.result:
        Updated error messages
      mysql-test/r/type_ranges.result:
        Updated error messages
      mysql-test/r/type_time.result:
        Updated error messages
      mysql-test/r/type_uint.result:
        Updated error messages
      mysql-test/r/warnings.result:
        Updated error messages
      mysql-test/t/func_sapdb.test:
        Aded test
      sql-common/my_time.c:
        Added checking of dates
      sql/field.cc:
        Better error messages
        Optimization of warning handling (by introducing of check_int())
        Changed to use my_strtoll10()
      sql/field.h:
        Added check_int()
      sql/item_func.cc:
        Warnings when dividing by NULL
      sql/item_func.h:
        Warnings when dividing by NULL
      sql/item_timefunc.cc:
        Testing of date/datetime
        Use macros instead of constants
      sql/mysql_priv.h:
        New modes (part of strict mode)
      sql/mysqld.cc:
        New modes (part of strict mode)
      sql/opt_range.cc:
        Simple optimizations
      sql/protocol.cc:
        Add note/warning level to find_handler()
      sql/set_var.cc:
        Added mode 'traditional'
      sql/share/czech/errmsg.txt:
        New error messages for strict mode
      sql/share/danish/errmsg.txt:
        New error messages for strict mode
      sql/share/dutch/errmsg.txt:
        New error messages for strict mode
      sql/share/english/errmsg.txt:
        New error messages for strict mode
      sql/share/estonian/errmsg.txt:
        New error messages for strict mode
      sql/share/french/errmsg.txt:
        New error messages for strict mode
      sql/share/german/errmsg.txt:
        New error messages for strict mode
      sql/share/greek/errmsg.txt:
        New error messages for strict mode
      sql/share/hungarian/errmsg.txt:
        New error messages for strict mode
      sql/share/italian/errmsg.txt:
        New error messages for strict mode
      sql/share/japanese/errmsg.txt:
        New error messages for strict mode
      sql/share/korean/errmsg.txt:
        New error messages for strict mode
      sql/share/norwegian-ny/errmsg.txt:
        New error messages for strict mode
      sql/share/norwegian/errmsg.txt:
        New error messages for strict mode
      sql/share/polish/errmsg.txt:
        New error messages for strict mode
      sql/share/portuguese/errmsg.txt:
        New error messages for strict mode
      sql/share/romanian/errmsg.txt:
        New error messages for strict mode
      sql/share/russian/errmsg.txt:
        New error messages for strict mode
      sql/share/serbian/errmsg.txt:
        New error messages for strict mode
      sql/share/slovak/errmsg.txt:
        New error messages for strict mode
      sql/share/spanish/errmsg.txt:
        New error messages for strict mode
      sql/share/swedish/errmsg.txt:
        New error messages for strict mode
      sql/share/ukrainian/errmsg.txt:
        New error messages for strict mode
      sql/sp_rcontext.cc:
        Add note/warning level to find_handler()
      sql/sp_rcontext.h:
        Add note/warning level to find_handler()
      sql/sql_base.cc:
        Fix bug for detecting crashed table
      sql/sql_class.cc:
        Variables for strct mode
      sql/sql_class.h:
        Variables for strct mode
      sql/sql_error.cc:
        In strict mode, convert warnings to errors
      sql/sql_insert.cc:
        Strict mode
        If strict mode, give error if we have not given value to field without a default value
      sql/sql_load.cc:
        Strict mode
      sql/sql_parse.cc:
        Strict mode.
        Add flag to field if it doesn't have a default value
      sql/sql_select.cc:
        Added comment
        Prepare for upper level handling of table->status
      sql/sql_union.cc:
        Added THD to write_record()
      sql/sql_update.cc:
        Strict mode
      sql/table.cc:
        Handling of default values
      sql/time.cc:
        Checking of dates
      2a491215
    • unknown's avatar
      fix test suite for portability · f9ae154d
      unknown authored
      f9ae154d
  7. 26 Sep, 2004 2 commits
  8. 24 Sep, 2004 4 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com://home/bk/mysql-5.0 · e316f16c
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0
      
      
      e316f16c
    • unknown's avatar
      In binary log events, flags are 2 bytes, not 4. Using 4 resulted in buffer... · 4ecf5111
      unknown authored
      In binary log events, flags are 2 bytes, not 4. Using 4 resulted in buffer overflow (and on a certain build it resulted in overwriting another part of the event without crashing :( ).
      
      
      sql/log_event.cc:
        flags are 2 bytes, not 4. Using 4 resulted in buffer overflow (and on a certain build it resulted in overwriting another part of the event without crashing :( ).
      4ecf5111
    • unknown's avatar
      For now we will require super privilege for creating/dropping trigger because proper · 7c46c0d0
      unknown authored
      privilege checking is not in place yet.
      
      
      7c46c0d0
    • unknown's avatar
      new show create view output · 66b4c82e
      unknown authored
      mysqldump view support (BUG#4972)
      workaround to allow view work after LOCK TABLES
      
      
      client/mysqldump.c:
        view support
      mysql-test/r/lowercase_view.result:
        new show create view output
      mysql-test/r/view.result:
        new show create view output
        test of locked views
      mysql-test/t/view.test:
        new show create view output
        test of locked views
      sql/sql_base.cc:
        workaround to allow view work after LOCK TABLES
      sql/sql_show.cc:
        new show create view output (to help mysql dump detect views)
      66b4c82e
  9. 18 Sep, 2004 1 commit
  10. 17 Sep, 2004 9 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dbee90a7
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      
      dbee90a7
    • unknown's avatar
      SHOW CREATE VIEW (TABLE) privilege now reqiere show create privilege · d700f3bc
      unknown authored
      (BUG#4777)
      
      
      mysql-test/r/view.result:
        fixed SHOW CREATE VIEW privileges requrements
      mysql-test/t/view.test:
        fixed SHOW CREATE VIEW privileges requrements
      sql/sql_acl.cc:
        fixed command name
      d700f3bc
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · 5c422671
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
      
      
      sql/item.h:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      5c422671
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 210829a1
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-amf
      
      
      210829a1
    • unknown's avatar
      Fixed BUG#3583: query cache doesn't work for stored procedures. · e2c4279c
      unknown authored
      
      mysql-test/r/sp.result:
        New test case for BUG#3583.
        (And current query is now set correctly.)
      mysql-test/t/sp.test:
        New test case for BUG#3583.
      sql/sp_head.cc:
        Set the thd->query and try to use cached query, if any, when executing a statement.
      sql/sp_head.h:
        Extract the sub-query and store in sp_instr_stmt.
      sql/sql_cache.cc:
        Keep the net->pkt_nr up-to-date when using query cache.
        This makes it work with stored procedures too.
      sql/sql_cache.h:
        Keep the net->pkt_nr up-to-date when using query cache.
        This makes it work with stored procedures too.
      sql/sql_yacc.yy:
        Extract the sub-query and store in sp_instr_stmt.
        (And it's never safe to cache references to local variables.)
      e2c4279c
    • unknown's avatar
      Fixed memory leak that occured after merge with 4.1 · 944f84eb
      unknown authored
      We should not replace Item_arena in Item_bool_func2::fix_length_and_dec() if this is
      conventional statement, since in this case THD::current_arena is the same as active arena
      and we will overwrite arena with its older version during restore_backup_item_arena()
      call.
      
      
      944f84eb
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 32fed579
      unknown authored
      into mysql.com:/home/dlenev/src/mysql-5.0-tzfix
      
      
      32fed579
    • unknown's avatar
      Small after merge cleanup of time zone initialization code. · 436b8045
      unknown authored
      
      sql/tztime.cc:
        After merge cleanup.
        Updated comments for tz_init_table_list() and my_tz_get_table_list().
        my_tz_init(): Simplified table list creation.
      436b8045
    • unknown's avatar
      Removed wrong warnings in test suite (This was because select_insert /... · e74b00bb
      unknown authored
      Removed wrong warnings in test suite (This was because select_insert / select_create results was not freed.
      Added thd to openfrm() for initialization of TABLE->in_use. This fixed a bug in BDB handling where table->in_use was used early
      
      
      mysql-test/r/key.result:
        Added new tests that shows a bug in warnings hat
      mysql-test/t/key.test:
        Added new tests that shows a bug in warnings hat
      sql/handler.cc:
        Added thd to openfrm() for initialization of TABLE->in_use
      sql/item.cc:
        New function to avoid warnings when giving field a value
      sql/item.h:
        New function to avoid warnings when giving field a value
      sql/mysql_priv.h:
        Added thd to openfrm() for initialization of TABLE->in_use
      sql/opt_range.cc:
        Don't give warnings in optimizer when internally storing a field value in a field. (Should be ok as we ar checking the feild in the WHERE clause later)
      sql/sql_base.cc:
        Give memroot explicitely to open_unireg_entry() and open_table() (Makes code simpler)
        Ensure that table->in_use is set early
        New arguments for openfrm()
      sql/sql_insert.cc:
        More debugging & comments
      sql/sql_parse.cc:
        Delete results for select_insert and select_create. This fixed a bug that generated warnings in test suite
      sql/sql_select.h:
        Don't give warnings in optimizer when internally storing a field value in a field. (Should be ok as we ar checking the feild in the WHERE clause later)
      sql/sql_table.cc:
        New arguments to open_table() and openfrm()
      sql/table.cc:
        Added thd to openfrm() for initialization of TABLE->in_use
        This fixes some bugs in BDB where table->in_use was used
      e74b00bb
  11. 16 Sep, 2004 2 commits
    • unknown's avatar
      now we allow to careate VIEW without any privileges on view columns (except... · f284ce04
      unknown authored
      now we allow to careate VIEW without any privileges on view columns (except create view privilege) (BUG#5152)
      
      
      mysql-test/r/view.result:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
        test of blocking try of getting more privileges on colemn with vierw using
      mysql-test/t/view.test:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
        test of blocking try of getting more privileges on colemn with vierw using
      sql/sql_view.cc:
        now we allow to careate VIEW without any privileges on view columns (except create view privilege)
      f284ce04
    • unknown's avatar
      updateability of field with collation support (BUG#5506) · 29ec367e
      unknown authored
      
      mysql-test/r/view.result:
         Collation with view update
      mysql-test/t/view.test:
         Collation with view update
      sql/item.h:
        updateability of field with collation support
      sql/item_strfunc.h:
        updateability of field with collation support
      sql/sql_insert.cc:
        updateability of field with collation support
      sql/sql_update.cc:
        updateability of field with collation support
      sql/sql_view.cc:
        updateability of field with collation support
      29ec367e
  12. 15 Sep, 2004 3 commits
    • unknown's avatar
      support of join view updateability (WL#1809) · 9aa459f0
      unknown authored
      
      include/mysqld_error.h:
        new error mesaages
      mysql-test/r/view.result:
        tests of updatint/inserting join views
      mysql-test/t/view.test:
        tests of updatint/inserting join views
      sql/mysql_priv.h:
        support of "usual UPDATE" -> "multi UPDATE" conversion
      sql/share/czech/errmsg.txt:
        new error mesaages
      sql/share/danish/errmsg.txt:
        new error mesaages
      sql/share/dutch/errmsg.txt:
        new error mesaages
      sql/share/english/errmsg.txt:
        new error mesaages
      sql/share/estonian/errmsg.txt:
        new error mesaages
      sql/share/french/errmsg.txt:
        new error mesaages
      sql/share/german/errmsg.txt:
        new error mesaages
      sql/share/greek/errmsg.txt:
        new error mesaages
      sql/share/hungarian/errmsg.txt:
        new error mesaages
      sql/share/italian/errmsg.txt:
        new error mesaages
      sql/share/japanese/errmsg.txt:
        new error mesaages
      sql/share/korean/errmsg.txt:
        new error mesaages
      sql/share/norwegian-ny/errmsg.txt:
        new error mesaages
      sql/share/norwegian/errmsg.txt:
        new error mesaages
      sql/share/polish/errmsg.txt:
        new error mesaages
      sql/share/portuguese/errmsg.txt:
        new error mesaages
      sql/share/romanian/errmsg.txt:
        new error mesaages
      sql/share/russian/errmsg.txt:
        new error mesaages
      sql/share/serbian/errmsg.txt:
        new error mesaages
      sql/share/slovak/errmsg.txt:
        new error mesaages
      sql/share/spanish/errmsg.txt:
        new error mesaages
      sql/share/swedish/errmsg.txt:
        new error mesaages
      sql/share/ukrainian/errmsg.txt:
        new error mesaages
      sql/sql_base.cc:
        test to avoid join virew to be catched here
      sql/sql_class.h:
        support of join views add to update
      sql/sql_delete.cc:
        support of join views add to delete(error issue)
      sql/sql_insert.cc:
        support of join views add to insert
        (order of some check changed, to allow find table which will be inserted in, when we will know which fields will be inserted)
        mechanism of calling setup_tables() only once fixed for INSERT SELECT
      sql/sql_parse.cc:
        support of "usual UPDATE" -> "multi UPDATE" conversion
        mysql_insert_select_prepare now called in same environment for usual queries and PS preparing
        support of join views add to delete (error issue)
      sql/sql_prepare.cc:
        support of "usual UPDATE" -> "multi UPDATE" conversion
        support of join views add to delete (error issue)
      sql/sql_update.cc:
        support of join views add to update
      sql/sql_view.cc:
        join views made updatable
      sql/sql_view.h:
        insert_view_fields now can check some errors
      sql/table.cc:
        methods to support recursive walk by tables tree
      sql/table.h:
        methods to support recursive walk by tables tree
      9aa459f0
    • unknown's avatar
      Merge · 6c3e6651
      unknown authored
      
      BitKeeper/etc/logging_ok:
        auto-union
      sql/ha_berkeley.cc:
        Auto merged
      sql/ha_heap.cc:
        Auto merged
      sql/ha_innodb.cc:
        Auto merged
      sql/ha_myisam.cc:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/handler.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_help.cc:
        Auto merged
      sql/sql_insert.cc:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_class.h:
        SCCS merged
      sql/sql_parse.cc:
        SCCS merged
      6c3e6651
    • unknown's avatar
      Added some missing per status variables. · 4ef01ca2
      unknown authored
      
      sql/ha_isam.cc:
        Added per status variables.
      sql/ha_isammrg.cc:
        Added per status variables.
      4ef01ca2