1. 18 Dec, 2003 2 commits
    • unknown's avatar
      Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7a163af0
      unknown authored
      into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
      
      7a163af0
    • unknown's avatar
      This will be pushed only after I fix the testsuite. · 0ade6e93
      unknown authored
      This is the main commit for Worklog tasks:
       * A more dynamic binlog format which allows small changes (1064)
       * Log session variables in Query_log_event (1063)
      Below 5.0 means 5.0.0.
      MySQL 5.0 is able to replicate FOREIGN_KEY_CHECKS, UNIQUE_KEY_CHECKS (for speed),
      SQL_AUTO_IS_NULL, SQL_MODE. Not charsets (WL#1062), not some vars (I can only think
      of SQL_SELECT_LIMIT, which deserves a special treatment). Note that this
      works for queries, except LOAD DATA INFILE (for this it would have to wait
      for Dmitri's push of WL#874, which in turns waits for the present push, so...
      the deadlock must be broken!). Note that when Dmitri pushes WL#874 in 5.0.1,
      5.0.0 won't be able to replicate a LOAD DATA INFILE from 5.0.1.
      Apart from that, the new binlog format is designed so that it can tolerate
      a little variation in the events (so that a 5.0.0 slave could replicate a
      5.0.1 master, except for LOAD DATA INFILE unfortunately); that is, when I
      later add replication of charsets it should break nothing. And when I later
      add a UID to every event, it should break nothing.
      The main change brought by this patch is a new type of event, Format_description_log_event,
      which describes some lengthes in other event types. This event is needed for
      the master/slave/mysqlbinlog to understand a 5.0 log. Thanks to this event,
      we can later add more bytes to the header of every event without breaking compatibility.
      Inside Query_log_event, we have some additional dynamic format, as every Query_log_event
      can have a different number of status variables, stored as pairs (code, value); that's
      how SQL_MODE and session variables and catalog are stored. Like this, we can later
      add count of affected rows, charsets... and we can have options --don't-log-count-affected-rows
      if we want.
      MySQL 5.0 is able to run on 4.x relay logs, 4.x binlogs.
      Upgrading a 4.x master to 5.0 is ok (no need to delete binlogs),
      upgrading a 4.x slave to 5.0 is ok (no need to delete relay logs);
      so both can be "hot" upgrades.
      Upgrading a 3.23 master to 5.0 requires as much as upgrading it to 4.0.
      3.23 and 4.x can't be slaves of 5.0.
      So downgrading from 5.0 to 4.x may be complicated.
      Log_event::log_pos is now the position of the end of the event, which is
      more useful than the position of the beginning. We take care about compatibility
      with <5.0 (in which log_pos is the beginning).
      I added a short test for replication of SQL_MODE and some other variables.
      TODO:
      - after committing this, merge the latest 5.0 into it
      - fix all tests
      - update the manual with upgrade notes.
      
      
      client/Makefile.am:
        mysqlbinlog.cc depends slightly on sql/mysql_priv.h
      client/mysqlbinlog.cc:
        Make mysqlbinlog able to read the new binlog format,
        by seeking to the start and reading the first few events, to
        detect the format of the binlog.
      include/my_sys.h:
        a correct tell() for SEQ_READ_APPEND caches.
      mysys/mf_iocache2.c:
        a correct tell() for SEQ_READ_APPEND caches
        (my_b_tell() is not working for such caches).
      sql/ha_innodb.cc:
        we are getting rid of event lengthes here and there, which is good.
      sql/log.cc:
        Start events will have created==0 if generated by rotation (like in 3.23).
        In 5.0 we always write a Format_description_log_event at the beginning of
        every master's binary log and of every slave's relay log.
        We also add Rotate and Stop to relay logs (like there already was in
        master's binary logs).
        When we rotate a relay log, we write the previous relay log's Start event
        (the one which was sent from the master) to the beginning of the new log,
        so that we don't need the previous relay log to understand the new one;
        that's the purpose of MYSQL_LOG::description_event_for_queue.
        Removed logging of SET FOREIGN_KEY_CHECKS, because we handle it as flags
        in the Query event now.
      sql/log_event.cc:
        New event type: Format_description_log_event, to describe the log's format.
        read_log_event() needs to be passed this event to be able to read 5.0 events.
        Query_log_event has new members flags2 and sql_mode for replication of session
        variables (except charsets which are WL#1062) and SQL_MODE.
        flags2 is in fact a kind of copy of thd->options (&'d with a mask).
        Now with this replication of FOREIGN_KEY_CHECKS, SQL_AUTO_IS_NULL, UNIQUE_CHECKS
        and SQL_MODE work; with mysqlbinlog too.
      sql/log_event.h:
        Binlog version is changed to 4.
        New classes (details in sql/log_event.cc).
        Removing some useless #defines.
      sql/mysql_priv.h:
        Definition of SELECT_DISTINCT and others must be visible in client/mysqlbinlog.cc,
        so adding #ifdefs.
      sql/mysqld.cc:
        update for prototype change
      sql/slave.cc:
        When the slave opens a relay log, it reads the first few events to know the format.
        When slave I/O thread receives a Rotate from the master, it rotates its relay log
        (to avoid mixed format in the relay log).
      sql/slave.h:
        in the slave we avoid lengthes and rely on absolute positions instead;
        hence the introduction of future_group_master_log_pos and future_event_relay_log_pos
        (explained in code).
      sql/sql_class.cc:
        catalog in THD
      sql/sql_class.h:
        catalog, and new members in MYSQL_LOG
      sql/sql_repl.cc:
        When the master starts sending binlog to slave, it must
        first read the first few events to detect the binlog's format.
        Same for SHOW BINLOG EVENTS.
      0ade6e93
  2. 17 Dec, 2003 1 commit
  3. 16 Dec, 2003 11 commits
    • unknown's avatar
      Renamed the "schema" column to "db" in mysql.proc to keep it in style with · 44421e6a
      unknown authored
      all the other mysql.* tables.
      
      44421e6a
    • unknown's avatar
      Post-merge fixes. · 6462c691
      unknown authored
      Multiple result sets from stored procedures now works with the
      mysql and mysqltest clients.
      
      
      client/mysqltest.c:
        Post-merge fixes.
      mysql-test/r/index_merge_innodb.result:
        Post-merge fixes.
      mysql-test/r/sp-error.result:
        Post-merge fixes.
        Removed now obsolete error test for multiple selects (without "into").
      mysql-test/r/sp.result:
        Post-merge fixes.
        Added test for mulple result sets.
      mysql-test/r/variables.result:
        Post-merge fixes.
      mysql-test/t/index_merge_innodb.test:
        Post-merge fixes.
      mysql-test/t/sp-error.test:
        Post-merge fixes.
        Removed now obsolete error test for multiple selects (without "into").
      mysql-test/t/sp.test:
        Post-merge fixes.
        Added test for mulple result sets.
      sql/lex.h:
        Post-merge fixes.
      6462c691
    • unknown's avatar
      Merge 4.1 to 5.0. · e0d4eb99
      unknown authored
      
      mysql-test/r/distinct.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/multi_update.result:
        Auto merged
      mysql-test/r/mysqldump.result:
        Auto merged
      mysql-test/r/null.result:
        Auto merged
      mysql-test/r/query_cache.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/r/status.result:
        Auto merged
      mysql-test/r/subselect.result:
        Auto merged
      mysql-test/r/symlink.result:
        Auto merged
      mysql-test/t/distinct.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/multi_update.test:
        Auto merged
      mysql-test/t/null.test:
        Auto merged
      mysql-test/t/query_cache.test:
        Auto merged
      mysql-test/t/subselect.test:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_cmpfunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      e0d4eb99
    • unknown's avatar
      Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 · 27bcbf33
      unknown authored
      into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.1
      
      27bcbf33
    • unknown's avatar
      Fixed parenthesis needed by valgrind-max. · d3e0a80d
      unknown authored
      d3e0a80d
    • unknown's avatar
      proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly. · 5b543270
      unknown authored
      note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.
      
      
      mysql-test/r/type_enum.result:
        proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      mysql-test/t/type_enum.test:
        proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      sql/field.cc:
        proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      sql/sql_show.cc:
        proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      sql/table.cc:
        proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      5b543270
    • unknown's avatar
      Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server. · 159673af
      unknown authored
      Added missing cleanup in sp-security.test.
      
      
      mysql-test/r/sp-security.result:
        Added clean-up.
      mysql-test/t/sp-security.test:
        Added clean-up.
      sql/item_func.cc:
        Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
      sql/sp_head.cc:
        Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
      sql/sp_head.h:
        Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
      sql/sql_parse.cc:
        Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
      159673af
    • unknown's avatar
      Missed header added · f591a8ec
      unknown authored
      
      heap/hp_hash.c:
        header added
      f591a8ec
    • unknown's avatar
      Some minor code clean up. · c4698900
      unknown authored
      c4698900
    • unknown's avatar
      Added support for multi statement tests. Use mysqltest internal · 2b3e2821
      unknown authored
      command delimiter to change the default delimiter (;) to something
      else, a string upto 16 characters is allowed. Separate the sub
      queries with ';' and end the whole statement with your own delimiter.
      
      2b3e2821
    • unknown's avatar
      Cleanup · 1e025afb
      unknown authored
      
      client/mysqltest.c:
        Remove not needed include files
      1e025afb
  4. 15 Dec, 2003 6 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 298b4d59
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      298b4d59
    • unknown's avatar
      Updated results · fa38b593
      unknown authored
      fa38b593
    • unknown's avatar
      part one of the fix for the bug #2077: accented characters in enum/defaul... · 177caba6
      unknown authored
      part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      
      
      mysql-test/r/type_enum.result:
        test for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      mysql-test/t/type_enum.test:
        test for the bug #2077: accented characters in enum/defaul values are reported incorrectly
      177caba6
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5cdbc91e
      unknown authored
      into mysql.com:/my/mysql-4.1
      
      
      mysql-test/r/create.result:
        Auto merged
      mysql-test/t/create.test:
        Auto merged
      5cdbc91e
    • unknown's avatar
      Added missing timeout function for named pipes and shared memory (fixes core dump on windows) · ec2e2c3a
      unknown authored
      Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
      nitialize system_charset_info() early. Fixes core dump when starting windows service
      
      
      heap/hp_hash.c:
        Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
      mysql-test/r/create.result:
        More test for type returned by if_null()
      mysql-test/t/create.test:
        More test for type returned by if_null()
      sql/field.h:
        Remove not needed functions
      sql/item.cc:
        Use normal field create function instead of special functions just made for tmp_table_field_from_field_type
      sql/mysqld.cc:
        Initialize system_charset_info() early. Fixes core dump when starting windows service
      vio/vio.c:
        Added missing timeouts for named pipes and shared memory (fixes core dump on windows)
      vio/vio_priv.h:
        Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
      vio/viosocket.c:
        Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
      ec2e2c3a
    • unknown's avatar
      Fixed various memory leaks. · 96cc8d8e
      unknown authored
      
      sql/sp.cc:
        Fixed memory leaks. Deletion of sps now in sp_cache.
      sql/sp_cache.cc:
        Fixed memory leaks. Use implicit delete of objects to make sure
        they're always freed.
      sql/sp_cache.h:
        Fixed memory leaks. Use implicit delete of objects to make sure
        they're always freed.
      sql/sp_head.cc:
        Fixed memory leaks. Make sure we use the right mem_root during parsing.
      sql/sp_head.h:
        Fixed memory leaks. Make sure we use the right mem_root during parsing.
      sql/sql_parse.cc:
        Fixed memory leaks. Don't forget to free the temporary object created at definition.
      sql/sql_yacc.yy:
        Fixed memory leaks. Make sure we use the right mem_root during parsing.
      96cc8d8e
  5. 13 Dec, 2003 5 commits
    • unknown's avatar
      Translation update · ff36dd5b
      unknown authored
      ff36dd5b
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · cb8bca90
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      cb8bca90
    • unknown's avatar
    • unknown's avatar
      WL#1365: Implement definer's rights execution of stored procedures. · 2123263a
      unknown authored
      (Also put the hostpart back in the definer column.)
      
      
      mysql-test/r/sp-error.result:
        Moved error test from sp.test
      mysql-test/r/sp.result:
        Moved error test to sp-error.test.
        Put hostpart back into definer column in mysql.proc.
      mysql-test/t/sp-error.test:
        Moved error test from sp.test
      mysql-test/t/sp.test:
        Moved error test to sp-error.test.
        Put hostpart back into definer column in mysql.proc.
      sql/item_func.cc:
        (Maybe) switch security context before invoking a stored function.
      sql/sp.cc:
        Renamed creator into definer, for more consistent terminology, and put the
        hostpart back.
      sql/sp_head.cc:
        Some fixes in the way things are allocated, and moved set_info() definition
        here from sp_head.h. creator is now called definer, and is split into a
        user and host part.
        Added functions for (possible) change and restore of privileges, for sql security
        definer calls.
      sql/sp_head.h:
        Moved set_info() definition here from sp_head.h.
        creator is now called definer, and is split into a user and host part.
        Added functions for (possible) change and restore of privileges, for sql security
        definer calls.
      sql/sql_acl.cc:
        New function acl_getroot_no_password() for getting the privileges used when
        calling an SP with sql security definer.
      sql/sql_acl.h:
        New function acl_getroot_no_password() for getting the privileges used when
        calling an SP with sql security definer.
      sql/sql_parse.cc:
        (Maybe) switch security context before invoking a stored procedure.
      sql/sql_yacc.yy:
        Fixed typo.
      2123263a
    • unknown's avatar
      Already approved bug fix for #1561. · 35689c09
      unknown authored
      Bug happens in INTERVAL function when number of compared arguments
      is 8 or more.
      
      35689c09
  6. 12 Dec, 2003 3 commits
    • unknown's avatar
      Merge bk-internal:/home/bk/mysql-4.1/ · aeddfe6e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      aeddfe6e
    • unknown's avatar
      Don't want host in the definer's column. · 61a7a06a
      unknown authored
      61a7a06a
    • unknown's avatar
      In order to make ALTER PROCEDURE|FUNCTION work correctly, and in general to · d61de900
      unknown authored
      make characteristics (and SHOW) work right, we had to separate the old
      definition blob in the mysql.proc table into separate fields for parameters,
      return type, and body, and handle the characteristics (like SQL SECURITY)
      separately... and then reassemble the CREATE string for parsing, of course.
      This is rather ugly, mostly the parser bit. (Hopefully that will be better
      with the new parser.)
      
      
      Docs/sp-imp-spec.txt:
        Separated the definitions string of the procedure into different columns
        in the mysql.proc schema.
      mysql-test/r/sp.result:
        New characteristics tests.
      mysql-test/t/sp.test:
        New characteristics tests.
      scripts/mysql_create_system_tables.sh:
        Separated the definitions string of the procedure into different columns
        in the mysql.proc schema.
      scripts/mysql_fix_privilege_tables.sql:
        Separated the definitions string of the procedure into different columns
        in the mysql.proc schema.
      sql/sp.cc:
        Separated the definitions string of the procedure into different columns.
        Rewrote much of the code related this (have a assemble the definition
        string from its different parts now) and the way characteristics are now
        handled, in order to make ALTER actually work.
      sql/sp.h:
        Changed prototypes.
      sql/sp_head.cc:
        Rewrote much of the code related to the new mysql.proc schema with separate
        definition fields (have to assemble the definition string from its different
        parts now) and the way characteristics are now handled, in order to make ALTER
        actually work.
      sql/sp_head.h:
        Separated the different parts of the definition strings: name, parameters,
        return type (for functions) and body.
      sql/sql_yacc.yy:
        Separated the different parts of the definition strings: name, parameters,
        return type (for functions) and body.
        This is ugly and messy; hopefully there's a more elegant way to do this
        when the new parser is installed.
      d61de900
  7. 11 Dec, 2003 4 commits
  8. 10 Dec, 2003 3 commits
    • unknown's avatar
      WL#1363: Update the mysql.proc table and add new fields. · 9bd2b74d
      unknown authored
      Also made the parsing and handling of SP characteristics
      more general and extendable, and added a few ch:istics.
      
      
      Docs/sp-imp-spec.txt:
        Updated spec with new schema.
      Docs/sp-implemented.txt:
        Added info about ALTER and SHOW.
      mysql-test/r/sp.result:
        Minor change in SHOW FUNCTION|PROCEDURE STATUS output.
      scripts/mysql_create_system_tables.sh:
        New mysql.proc schema.
      scripts/mysql_fix_privilege_tables.sql:
        New mysql.proc schema.
      sql/lex.h:
        New lex words for SP characteristics.
      sql/sp.cc:
        New mysql.proc schema.
        Also made the characteristics handling slightly more extendable.
      sql/sp.h:
        Made the characteristics handling slightly more extendable.
      sql/sp_head.cc:
        Made the characteristics handling slightly more extendable.
      sql/sp_head.h:
        Made the characteristics handling slightly more extendable.
      sql/sql_lex.h:
        Made the characteristics handling slightly more extendable.
      sql/sql_parse.cc:
        Made the characteristics handling slightly more extendable.
      sql/sql_yacc.yy:
        Made the characteristics handling slightly more extendable
        and made the parsing of characteristics more general, and
        added a few new dito. (LANGUAGE SQL, and [NOT] DETERMINISTIC
        for starters).
      9bd2b74d
    • unknown's avatar
      de8f26aa
    • unknown's avatar
      WorkLog#1323 · 833f85fb
      unknown authored
      Deprecate the use of TYPE=... Preferred syntax is ENGINE=
      
      
      include/mysqld_error.h:
        New warning for deprecated syntax
      sql/lex.h:
        Introduce ENGINE keyword
        Sort order of symbols
      sql/share/czech/errmsg.txt:
        New warning for deprecated syntax
      sql/share/danish/errmsg.txt:
        New warning for deprecated syntax
      sql/share/dutch/errmsg.txt:
        New warning for deprecated syntax
      sql/share/english/errmsg.txt:
        New warning for deprecated syntax
      sql/share/estonian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/french/errmsg.txt:
        New warning for deprecated syntax
      sql/share/german/errmsg.txt:
        New warning for deprecated syntax
      sql/share/greek/errmsg.txt:
        New warning for deprecated syntax
      sql/share/hungarian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/italian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/japanese/errmsg.txt:
        New warning for deprecated syntax
      sql/share/korean/errmsg.txt:
        New warning for deprecated syntax
      sql/share/norwegian-ny/errmsg.txt:
        New warning for deprecated syntax
      sql/share/norwegian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/polish/errmsg.txt:
        New warning for deprecated syntax
      sql/share/portuguese/errmsg.txt:
        New warning for deprecated syntax
      sql/share/romanian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/russian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/serbian/errmsg.txt:
        New warning for deprecated syntax
      sql/share/slovak/errmsg.txt:
        New warning for deprecated syntax
      sql/share/spanish/errmsg.txt:
        New warning for deprecated syntax
      sql/share/swedish/errmsg.txt:
        New warning for deprecated syntax
      sql/share/ukrainian/errmsg.txt:
        New warning for deprecated syntax
      sql/sql_show.cc:
        Change TYPE= with ENGINE=
      sql/sql_yacc.yy:
        Introduce ENGINE keyword,
        Deprecate TYPE= syntax,
        Introduce SHOW ENGINE syntax,
        Deprecate SHOW INNODB/BDB syntax.
      mysql-test/r/alias.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/alter_table.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/auto_increment.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/bdb-alter-table-1.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/bdb-crash.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/bdb-deadlock.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/bdb.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/bdb_cache.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/case.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/cast.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/constraints.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/create.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_collate.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_latin1_de.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_many.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_mb.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_recoding.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/ctype_ucs.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/delete.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/distinct.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/fulltext.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/fulltext2.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/fulltext_distinct.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/fulltext_left_join.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_compress.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_date_add.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_group.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_if.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_str.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_system.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_test.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/func_time.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/gis-rtree.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/group_by.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/handler.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/heap.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/heap_auto_increment.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/heap_btree.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/heap_hash.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/help.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/innodb-deadlock.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/innodb.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/innodb_cache.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/innodb_handler.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/insert_select.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/isam.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/join.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/join_crash.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/join_outer.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/key.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/lock.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/lock_tables_lost_commit.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/merge.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/multi_update.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/myisam.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/null.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/null_key.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/order_by.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/query_cache.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/range.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/repair_part1.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/replace.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/rollback.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/rpl000006.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/rpl_flush_tables.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/rpl_insert_id.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/rpl_relayrotate.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/select.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/select_found.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/show_check.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/sql_mode.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/status.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/subselect.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/subselect2.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/subselect_innodb.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/symlink.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/temp_table.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/type_blob.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/type_datetime.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/type_enum.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/type_nchar.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/type_set.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/union.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/update.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/r/warnings.result:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/alias.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/alter_table.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/auto_increment.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/bdb-alter-table-1.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/bdb-crash.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/bdb-deadlock.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/bdb.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/bdb_cache.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/create.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/ctype_ucs.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/delete.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/distinct.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/fulltext.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/fulltext2.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/fulltext_distinct.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/fulltext_left_join.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_compress.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_date_add.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_group.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_if.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_str.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_test.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/func_time.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/gis-rtree.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/group_by.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/handler.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/heap.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/heap_auto_increment.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/heap_btree.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/heap_hash.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/help.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/innodb-deadlock.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/innodb.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/innodb_cache.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/innodb_handler.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/insert_select.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/isam.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/join.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/join_crash.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/join_outer.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/key.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/lock.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/lock_tables_lost_commit.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/merge.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/mix_innodb_myisam_binlog.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/multi_update.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/myisam.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/null.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/null_key.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/order_by.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/outfile.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/query_cache.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/query_cache_merge.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/range.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/repair_part1.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/replace.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/rollback.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/rpl000006.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/rpl_flush_tables.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/rpl_insert_id.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/rpl_relayrotate.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/select.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/select_found.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/show_check.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/sql_mode.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/status.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/subselect.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/subselect2.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/subselect_innodb.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/symlink.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/temp_table.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/type_datetime.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/type_set.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/union.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/update.test:
        Change occurances of TYPE= to ENGINE=
      mysql-test/t/warnings.test:
        Change occurances of TYPE= to ENGINE=
        New test for deprecated syntax
      833f85fb
  9. 09 Dec, 2003 5 commits
    • unknown's avatar
      key_cache.result, key_cache.test, mf_keycache.c: · a34aac17
      unknown authored
        Fixed a wrong return code by the function init_key_cache.
      
      
      mysys/mf_keycache.c:
        Fixed a wrong return code by the function init_key_cache.
      mysql-test/t/key_cache.test:
        Fixed a wrong return code by the function init_key_cache.
      mysql-test/r/key_cache.result:
        Fixed a wrong return code by the function init_key_cache.
      a34aac17
    • unknown's avatar
      Post-merge fixes. · fa7e4114
      unknown authored
      fa7e4114
    • unknown's avatar
      Merged 4.1 -> 5.0 · f46c6b51
      unknown authored
      
      include/mysql_com.h:
        Auto merged
      libmysqld/lib_sql.cc:
        Auto merged
      myisam/mi_check.c:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sql_acl.cc:
        Auto merged
      sql/sql_class.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_load.cc:
        Auto merged
      sql/sql_show.cc:
        Auto merged
      sql/share/czech/errmsg.txt:
        Auto merged
      sql/share/romanian/errmsg.txt:
        Auto merged
      sql/sql_table.cc:
        Auto merged
      sql/sql_select.cc:
        Auto merged
      f46c6b51
    • unknown's avatar
      Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 9fb26ff2
      unknown authored
      into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b1994
      
      9fb26ff2
    • unknown's avatar
      Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bc3575e
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_1688/mysql-4.1
      
      8bc3575e