An error occurred fetching the project authors.
  1. 24 Aug, 2004 1 commit
  2. 20 Aug, 2004 1 commit
  3. 19 Aug, 2004 2 commits
    • unknown's avatar
      Bug#4521: unique key prefix interacts poorly with utf8. · be7e151f
      unknown authored
      Fix for binary collations for MyISAM and HEAP BTREE.
      This patch also changes trailing spaces behaviour for
      binary collations. Binary collations now have PAD 
      characteristic too.
      
      be7e151f
    • unknown's avatar
      after merge fixes · e86cbb3a
      unknown authored
      strings/my_vsnprintf.c:
        %.#s support in my_vsnprintf
      BitKeeper/etc/ignore:
        Added EXCEPTIONS-CLIENT to the ignore list
      e86cbb3a
  4. 18 Aug, 2004 1 commit
  5. 26 Jul, 2004 1 commit
  6. 08 Jul, 2004 1 commit
    • unknown's avatar
      New handler::index_flags() definition to make it easy to check the full used... · 9236c380
      unknown authored
      New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
      Added key part to optimize_range() to fix problems when using fields in key parts.
      
      
      
      sql/examples/ha_archive.h:
        New handler::index_flags() definition
      sql/examples/ha_example.h:
        New handler::index_flags() definition
      sql/field.cc:
        New optimize_range() definition
      sql/field.h:
        New optimize_range() definition
      sql/ha_berkeley.cc:
        New handler::index_flags() definition
      sql/ha_berkeley.h:
        New handler::index_flags() definition
      sql/ha_heap.h:
        New handler::index_flags() definition
      sql/ha_innodb.h:
        New handler::index_flags() definition
      sql/ha_isam.h:
        New handler::index_flags() definition
      sql/ha_isammrg.h:
        New handler::index_flags() definition
      sql/ha_myisam.h:
        New handler::index_flags() definition
      sql/ha_myisammrg.h:
        New handler::index_flags() definition
      sql/ha_ndbcluster.cc:
        New handler::index_flags() definition
      sql/ha_ndbcluster.h:
        New handler::index_flags() definition
      sql/handler.h:
        New handler::index_flags() definition
      sql/log.cc:
        Fixed compiler warnings
      sql/log_event.cc:
        Fixed compiler warnings (and renamed short variable name)
      sql/opt_range.cc:
        New handler::index_flags() definition
      sql/opt_sum.cc:
        New handler::index_flags() definition
      sql/set_var.cc:
        Removed compiler warnings
      sql/sql_db.cc:
        Removed compiler warnings
      sql/sql_select.cc:
        New handler::index_flags() definition
      sql/sql_show.cc:
        Removed compiler warnings
      sql/sql_update.cc:
        Removed compiler warnings
      sql/table.cc:
        New handler::index_flags() definition
      9236c380
  7. 24 Jun, 2004 1 commit
    • unknown's avatar
      bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash. · 4ea8ef98
      unknown authored
      Added put_length() to get_length() and unpack_key() to pack_key().
      Keys were packed with the minimum size of the length field for the key part and 
      unpacked with length size of the base column. 
      For the purpose of optimal key packing we have the method pack_key(), while rows are 
      packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
      unpack() which is used for rows.
      
      
      mysql-test/r/bdb.result:
        bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
        Added the test case results.
      mysql-test/t/bdb.test:
        bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
        Added the test case.
      sql/field.cc:
        bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
        Added put_length() to get_length() and unpack_key() to pack_key().
        Keys were packed with the minimum size of the length field for the key part and 
        unpacked with length size of the base column. 
        For the purpose of optimal key packing we have the method pack_key(), while rows are packed 
        with pack(). Now keys are unpacked with unpack_key() and no longer with unpack() which is 
        used for rows.
      sql/field.h:
        bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
        Added put_length() to get_length() and unpack_key() to pack_key().
        The default implementation simply calls unpack() for those field types that don't need 
        a special key unpacking.
      sql/ha_berkeley.cc:
        bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
        Now keys are unpacked with unpack_key() and no longer with unpack() which is used for rows.
        For most field types, however, this simply calls unpack().
      4ea8ef98
  8. 21 Jun, 2004 2 commits
    • unknown's avatar
      Field_geom should have same max_length as Field_blob · 0cb010cf
      unknown authored
      Updated tests
      After merge fix
      
      
      mysql-test/r/func_time.result:
        Updated tests
      sql/field.cc:
        After merge fix
        Removed compiler warning
      sql/field.h:
        Field_geom should have same max_length as Field_blob
      0cb010cf
    • unknown's avatar
      After merge fixes · 0c0b2bae
      unknown authored
      Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
      
      
      client/mysqltest.c:
        Added MAX_VAR_NAME which was lost in merge
        Added more debugging
        Fixed bug in 'eval'
      innobase/data/data0type.c:
        After merge fix
      innobase/fil/fil0fil.c:
        After merge fix
      innobase/log/log0recv.c:
        After merge fix
      myisam/mi_unique.c:
        Better checksum handling
      mysql-test/r/func_time.result:
        Return NULL if a time argument is given to date_add()
      mysql-test/r/rpl_free_items.result:
        After merge fix
      mysql-test/r/rpl_get_lock.result:
        Test was depending on when server was restarted.
      mysql-test/r/type_date.result:
        After merge fix
      mysql-test/r/type_decimal.result:
        After merge fix
      mysql-test/t/func_time.test:
        Removed comment that is not needed anymore
        (After Dimitri's timezone patch is pushed, we should get a warning for the date_add(time...) entry)
      mysql-test/t/rpl_get_lock.test:
        Test was depending on when server was restarted.
      mysql-test/t/type_date.test:
        Addded missing explanation for bug
      netware/mysqld_safe.c:
        Removed end \r
        Run program through indent-ex to get MySQL indentation
      sql-common/client.c:
        After merge fix
      sql/field.cc:
        Fixed that get_date(time) gives a warning
      sql/field.h:
        After merge fix
      sql/net_serv.cc:
        More debugging (if DEBUG_DATA_PACKETS is set)
      sql/sql_class.cc:
        Removed compiler warning
      sql/table.cc:
        Better comment
      0c0b2bae
  9. 18 Jun, 2004 1 commit
    • unknown's avatar
      WL#1264 "Per-thread time zone support infrastructure". · 6415966e
      unknown authored
      Added basic per-thread time zone functionality (based on public
      domain elsie-code). Now user can select current time zone
      (from the list of time zones described in system tables).
      All NOW-like functions honor this time zone, values of TIMESTAMP
      type are interpreted as values in this time zone, so now
      our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
      LOCAL TIME ZONE (or proper PostgresSQL type).
        
      WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
      function".
        
      Fixed problems described in Bug #2336 (Different number of warnings 
      when inserting bad datetime as string or as number). This required
      reworking of datetime realted warning hadling (they now generated 
      at Field object level not in conversion functions).
        
      Optimization: Now Field class descendants use table->in_use member
      instead of current_thd macro.
      
      
      include/my_global.h:
        Added macro for reading of 32-bit ints stored in network order from
        unaligned memory location.
      include/mysqld_error.h:
        Added error-code for invalid timestamp warning and error-code
        for wrong or unknown time zone specification.
      libmysqld/Makefile.am:
        Added main per-thread time zone support file to libmysqld
      libmysqld/lib_sql.cc:
        Added initialization of time zones infrastructure to embedded server.
      mysql-test/r/connect.result:
        Updated test result since now mysql database contains more
        system tables.
      mysql-test/r/date_formats.result:
        Now when truncation occurs during conversion to datetime value we are producing Warnings 
        instead of Notes. Also we are giving more clear warnings about this in some cases.
      mysql-test/r/func_sapdb.result:
        New warnings about truncation occured during conversion to datetime value added due
        their better handling.
      mysql-test/r/func_time.result:
        New warnings about truncation occured during conversion to datetime value added due
        their better handling.
      mysql-test/r/select.result:
        New warnings about truncation occured during conversion to datetime value added due
        their better handling. Also tweaked test a bit to made it less ambigious for reader.
      mysql-test/r/system_mysql_db.result:
        Updated test result because new system tables holding time zone descriptions were 
        added.
      mysql-test/r/timezone.result:
        Updated timezone.test to use new system variable which shows system time zone.
        Added test of warning which is produced if someone tries to store non-existing (due 
        falling into spring time-gap) datetime value into TIMESTAMP field.
      mysql-test/r/type_datetime.result:
        Separated and extended test of values and warnings produced for bad values stored in 
        DATETTIME fields.
      mysql-test/r/type_time.result:
        Now we are producing more consistent warning when we are truncating datetime value while
        storing it in TIME field.
      mysql-test/r/type_timestamp.result:
        Separated and extended test of values and warnings produced for bad
        values stored in TIMESTAMP fields.
      mysql-test/t/select.test:
        Updated test to make it less ambigous for reader.
      mysql-test/t/timezone.test:
        Updated timezone.test to use new system variable which shows system time zone.
        Added test of warning which is produced if someone tries to store non-existing (due 
        falling into spring time-gap) datetime value into TIMESTAMP field.
      mysql-test/t/type_datetime.test:
        Separated and extended test of values and warnings produced for bad
        values stored in DATETTIME fields.
      mysql-test/t/type_timestamp.test:
        Separated and extended test of values and warnings produced for bad
        values stored in TIMESTAMP fields.
      scripts/mysql_create_system_tables.sh:
        Added creation of tables with time zone descriptions.
        Also added descriptions of time zones used in tests.
      scripts/mysql_fix_privilege_tables.sql:
        Added mysql.time_zone* tables family.
      sql/Makefile.am:
        Added files implementing time zone support to server, also added
        rules for building of mysql_tzinfo_to_sql converter and test_time
        test.
      sql/field.cc:
        Now we are using per-thread time zone for TIMESTAMP <-> whatever conversion.
        Fixed generation of warnings for datetime types (DATETIME/TIMESTAMP/DATE/...) and
        any other Field to datetime conversion (now we are generating warnings no in lower
        level functions like in str_to_TIME() but in Field methods. This allows generate
        better and more consistent warnings and to reuse code of str_to_TIME() outside of
        server).
        
        Added 3rd parameter to set_warning() method to be able to not increment cut fields
        but still produce a warning. Also added set_datetime_warning() family of auxiliary 
        methods which allow easier generate datetime related warnings.
        Also replaced occurences of current_thd with table->in_use member, added
        asserts for catching all places there we need to set table->in_use
        accordingly. Renamed fix_datetime() function to number_to_TIME() and
        moved it to sql/time.cc there it fits better.
      sql/field.h:
        Added comment about places where we can use table->in_use member
        instead of current_thd.
        Added 3rd parameter to Field::set_warning() method and set_datetime_warning()
        family of methods.
      sql/field_conv.cc:
        Field::set_warning() method with 2 arguments was replaced with more 
        generic set_warning() method with 3 arguments.
      sql/ha_berkeley.cc:
        Now we set table->in_use for temporary tables so we have to use
        table->tmp_table for checking if table is temporary.
      sql/item.cc:
        Replaced calls to str_to_time() and str_to_TIME() funcs with their warning
        generating analogs.
      sql/item_create.cc:
        Added creation of CONVERT_TZ function as FUNC_ARG3.
      sql/item_create.h:
        Added creation of CONVERT_TZ function as FUNC_ARG3.
      sql/item_timefunc.cc:
        Added support of per-thread time zone to NOW-like and FROM_UNIXTIME,
        UNIX_TIMESTAMP functions. 
        Added support for CONVERT_TZ function.
        Removed call to str_to_timestamp function which caused non-optimal
        behavior in certain cases. Replaced calls to str_to_time() function 
        with its warning generating analog.
      sql/item_timefunc.h:
        Added support of per-thread time zone to NOW-like and
        FROM_UNIXTIME, UNIX_TIMESTAMP functions.
        Added support of CONVERT_TZ function.
      sql/lex.h:
        Added support of CONVERT_TZ function.
      sql/log.cc:
        Added support for replication of statements depending on time zone.
      sql/mysql_priv.h:
        Now including headers with per-thread time zone support functions
        and classes. Added portable replacement of time_t - my_time_t type. 
        Added time zone as one of query distinguishing parameters for
        query cache. 
        Fixed declarations of str_to_TIME, str_to_time and 
        my_system_gmt_sec (former my_gmt_sec) since now they have one more
        out parameter which informs about wrong datetime value or data 
        truncation during conversion.
        Added warning generating version of str_to_TIME() and str_to_time()
        functions.
        Thrown away str_to_datetime/timestamp functions since they are not
        needed any longer. Added number_to_TIME function.
      sql/mysqld.cc:
        Added per-thread time zone support initialization.
        Added new startup parameter --default-time-zone.
      sql/set_var.cc:
        Added support for per-thread time_zone variable.
        Renamed old timezone variable to system_time_zone.
      sql/set_var.h:
        Added support for per-thread time_zone variable.
      sql/share/czech/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/danish/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/dutch/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/english/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/estonian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/french/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/german/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/greek/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/hungarian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/italian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/japanese/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/korean/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/norwegian-ny/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/norwegian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/polish/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/portuguese/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/romanian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/russian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/serbian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/slovak/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/spanish/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/swedish/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/share/ukrainian/errmsg.txt:
        Added error message for barking when incorrect time zone name or
        specifiaction is provided and for warning about invalid TIMESTAMP
        values (e.g. falling into the spring time-gap).
      sql/slave.cc:
        In order to support replication of statements using time zones in 4.1 we should 
        ensure that both master and slave have same default time zone.
      sql/sql_base.cc:
        Now we are setting TABLE::in_use member for all tables (which assume
        calls to Field::store or val_ methods).
      sql/sql_cache.cc:
        Added time zone as one more query distinguishing parameter
        for query cache.
      sql/sql_class.cc:
        Added THD::time_zone_used variable indicating that this query
        uses per thread time zone.
      sql/sql_class.h:
        Added per-thread time zone variable. Added THD::time_zone_used
        variable indicating that this query uses per thread time zone
        so if this is updating query the time zone should be logged to 
        binlog.
      sql/sql_insert.cc:
        We should set TABLE::in_use member pointing to thread which is called
        INSERT DELAYED and not to worker thread.
      sql/sql_load.cc:
        Field::set_warning() now has one more argument now.
      sql/sql_parse.cc:
        Resetting THD::time_zone_used variable in the end of query
        processing.
      sql/sql_select.cc:
        Now we are setting TABLE::in_use member for all tables (which assume
        calls to Field::store or val_ methods).
      sql/sql_show.cc:
        Now using per thread time zone for extended show tables.
      sql/time.cc:
        Added support for per-thread time zones for TIMESTAMP type and
        reworked generation of warnings for TIMESTAMP and DATETIME types.
        (Introduced new TIME_to_timestamp() function. Removed hours 
        normalisation from former my_gmt_sec() since it was not working 
        and not used anywhere now, but breaks parameter constness, added
        to this function generation of warning if we are falling in spring 
        time-gap. Removed str_to_timestamp and str_to_datetime functions 
        which are no longer used. Moved fix_datetime function from
        sql/field.cc to this file as number_to_TIME() function. Added
        out parameter for str_to_TIME and str_to_time functions which
        indicates if value was truncated during conversion, removed direct 
        generation of warnings from this functions.)
      sql/unireg.cc:
        Now we are setting TABLE::in_use member for all tables (which assume
          calls to Field::store or val_ methods).
      BitKeeper/etc/ignore:
        Added sql/test_time sql/mysql_tzinfo_to_sql libmysqld/tztime.cc to the ignore list
      6415966e
  10. 17 Jun, 2004 1 commit
    • unknown's avatar
      after review fix (BUG#4067) · 47e3e1f0
      unknown authored
      sql/field.cc:
        method getting maximum display length for fields
      sql/field.h:
        method getting maximum display length for fields
      sql/item.cc:
        code cleanup
        switch replaced with new method
      sql/item.h:
        method getting maximum display length for fields
      47e3e1f0
  11. 07 Jun, 2004 1 commit
  12. 11 Apr, 2004 1 commit
  13. 07 Apr, 2004 2 commits
    • unknown's avatar
      Cleanup/optimizations of structures and key usage to make it easier to move... · 076ec3c0
      unknown authored
      Cleanup/optimizations of structures and key usage to make it easier to move key-range-search to handler
      
      
      sql/field.cc:
        Use 'HA_KEY_BLOB_LENGTH' instead of '2' for 'packed-length'
        Changed 'get_key_image' and 'set_key_image' to take length data part of key (without length-store bytes). This makes the interface easier to use from opt_range.cc
      sql/field.h:
        Indentation fix
      sql/opt_range.cc:
        Changed KEY_PART to use KEY_PART_INFO->store_length (which includes null-byte if needed)
        This makes some functions easier and allowed us to easier use the new get_key_image/set_key_image interfaces
        Simple loop optimization.
      sql/opt_range.h:
        Changed part_length -> store_length and added length to KEY_PART.
        This make this structure more like KEY_PART_INFO
        Added 'sorted' to QUICK_SELECT for NDB
      sql/sql_class.cc:
        Fixed compiler warning
      sql/sql_select.cc:
        Set 'quick->sorted' if keys should be sorted (for NDB)
      sql/table.cc:
        GEOMETRY KEYS doesn't have length prefix in keys
      076ec3c0
    • unknown's avatar
      post-review fixes · a9a5517a
      unknown authored
      HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
      test cleanups
      
      
      BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
        Delete: mysql-test/t/repair_part2-master.sh
      BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
        Delete: mysql-test/t/repair_part2.test
      BitKeeper/deleted/.del-repair_part2.result~72ca166fb248b566:
        Delete: mysql-test/r/repair_part2.result
      mysql-test/r/myisam.result:
        updated
      mysql-test/t/lowercase_table2.test:
        typo fixed
      mysql-test/r/repair.result:
        single repair.test from repair_part[12].test
      mysql-test/t/lowercase_table3.test:
        typo fixed
      mysql-test/t/lowercase_table_qcache.test:
        newline added
      mysql-test/t/myisam.test:
        updated
      mysql-test/t/repair.test:
        single repair.test from repair_part[12].test
      sql/field.cc:
        reverted
      sql/field.h:
        style fix
      sql/ha_myisam.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_insert.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_load.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      sql/sql_table.cc:
        add HA_EXTRA_WRITE_CACHE to start_bulk_insert
      a9a5517a
  14. 06 Apr, 2004 1 commit
    • unknown's avatar
      ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(),... · 6ca2c764
      unknown authored
      ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      Field::val_str simplification, comment
      
      
      include/my_base.h:
        typos fixed
      mysql-test/r/myisam.result:
        alter table enable/disable keys
      mysql-test/t/help.test:
        cleanup
      mysql-test/t/myisam.test:
        alter table enable/disable keys
      sql/field.cc:
        Field::val_str() simplification
      sql/field.h:
        Field::val_str() simplification and comment
      sql/field_conv.cc:
        Field::val_str() simplification
      sql/ha_berkeley.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_berkeley.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_heap.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_heap.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_innodb.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_innodb.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isam.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isam.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isammrg.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_isammrg.h:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_myisam.cc:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/ha_myisam.h:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/ha_myisammrg.cc:
        ::reset(), HA_FAST_KEY_READ
      sql/ha_myisammrg.h:
        ::reset(), HA_FAST_KEY_READ
      sql/handler.h:
        ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/item.cc:
        Field::val_str() simplification
      sql/item_sum.cc:
        Field::val_str() simplification
      sql/key.cc:
        Field::val_str() simplification
      sql/opt_range.cc:
        Field::val_str() simplification
      sql/protocol.cc:
        Field::val_str() simplification
      sql/records.cc:
        HA_FAST_KEY_READ
      sql/sql_acl.cc:
        Field::val_str() simplification
      sql/sql_base.cc:
        ::reset
      sql/sql_insert.cc:
        ::reset(), start_bulk_insert(), end_bulk_insert()
      sql/sql_load.cc:
        start_bulk_insert(), end_bulk_insert()
      sql/sql_show.cc:
        Field::val_str() simplification
      sql/sql_table.cc:
        disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
      sql/table.cc:
        Field::val_str() simplification
      6ca2c764
  15. 05 Apr, 2004 1 commit
    • unknown's avatar
      Fixed many compiler warnings · 3a0254a6
      unknown authored
      Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
      Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
      Set locked_in_memory properly
      
      
      include/mysql_com.h:
        Fixed compiler warning
      libmysqld/emb_qcache.cc:
        Removed not used variable
      libmysqld/lib_sql.cc:
        Removed not used variable
      myisam/mi_locking.c:
        Added comment
      myisam/mi_rnext.c:
        Fixed bug in concurrent insert
      myisam/mi_rprev.c:
        Simple optimization
      mysql-test/r/func_gconcat.result:
        New tests
      mysql-test/t/func_gconcat.test:
        New tests
      mysql-test/t/func_group.test:
        Cleanup
      sql-common/client.c:
        Removed compiler warning
      sql/derror.cc:
        Better comments
      sql/field.cc:
        Removed not used function/variable
      sql/field.h:
        Removed not needed variable
      sql/ha_innodb.cc:
        Removed not used function
      sql/item.cc:
        Fixed compiler warning
      sql/item_cmpfunc.cc:
        Fixed compiler warning
      sql/item_func.cc:
        Fixed compiler warning
      sql/item_geofunc.cc:
        Fixed compiler warning
      sql/item_sum.cc:
        Fixed bugs in group_concat and added more comments
        (Bugs #2695, #3381 and #3319)
        - field->abs_offset was not needed
        - Wrong assumption of field order in temporary table
        - Some not used variables removed
        - Added ORDER BY fields after argument fields so that code in sql_select.cc can move all fields to point to temporary tables, if needed.
        - Optimized loops
      sql/item_sum.h:
        Bug fixing and cleanup of group_concat()
      sql/log.cc:
        Removed wrong comment
      sql/log_event.cc:
        Removed compiler warning
      sql/mysqld.cc:
        Set locked_in_memory properly
      sql/protocol.cc:
        Removed compiler warning
      sql/set_var.cc:
        Code cleanup
      sql/slave.cc:
        Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
      sql/sql_cache.cc:
        Removed compiler warnings
      sql/sql_derived.cc:
        Removed not used variable
      sql/sql_insert.cc:
        Removed compiler warnings
      sql/sql_lex.cc:
        Removed not used lable
      sql/sql_lex.h:
        Removed compiler warnings
      sql/sql_parse.cc:
        Removed compiler warnings
      sql/sql_prepare.cc:
        Removed compiler warnings
      sql/sql_select.cc:
        Removed not used variables
        Added function comments
      sql/sql_show.cc:
        Removed compiler warnings
      sql/sql_yacc.yy:
        Fix for ORDER BY handling in GROUP_CONCAT()
      3a0254a6
  16. 02 Apr, 2004 1 commit
    • unknown's avatar
      WL#1266 "Separate auto-set logic from TIMESTAMP type." · 4ada2ea9
      unknown authored
      Final version of patch.
      
      Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
      clauses for TIMESTAMP field definition.
      Current implementation allows only one such field per table and
      uses several unireg types for storing info about this properties of
      field. It should be replaced with better implementation when new
      .frm format is introduced.
      
      
      include/mysqld_error.h:
        Added error codes for case when we have more than one column with NOW()
        in DEFAULT or ON UPDATE clauses and for case when we are using ON UPDATE
        clause with wrong type.
      mysql-test/r/create.result:
        Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with
        non-TIMESTAMP fields.
      mysql-test/r/show_check.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW CREATE TABLE.
      mysql-test/r/system_mysql_db.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW CREATE TABLE.
      mysql-test/r/type_ranges.result:
        Updated test results to reflect new default look of TIMESTAMP fields
        in SHOW COLUMNS.
      mysql-test/r/type_timestamp.result:
        Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP
        fields definitions.
      mysql-test/t/create.test:
        Added tests for using of DEFAULT NOW() and ON UPDATE NOW() with
        non-TIMESTAMP fields.
      mysql-test/t/type_timestamp.test:
        Added tests for various DEFAULT and ON UPDATE clauses for TIMESTAMP
        fields definitions.
      sql/field.cc:
        Added support for various combinations of DEFAULT and ON UPDATE clauses
        for TIMESTAMP field. 
        
        Setting TABLE::timestamp* members for TIMESTAMP fields with auto-set 
        option taking into account their unireg type (which corresponds to 
        various DEFAULT/ON UPDATE values combinations). Replaced 
        TABLE::time_stamp with TABLE::timestamp_default_now/on_update_now
        couple moved their setup to separate method set_timestamp_offsets(),
        which now is called from  open_table instead of Field_timestamp cons.
      sql/field.h:
        Added more unireg types for handling of DEFAULT NOW() and ON UPDATE
        NOW() for TIMESTAMP fields.
        Fixed value corresponding to DEFAULT item for TIMESTAMP field.
      sql/ha_berkeley.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_heap.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_innodb.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_isam.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_isammrg.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_myisam.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/ha_myisammrg.cc:
        Now TIMESTAMP column with auto-set property could be updated during
        INSERT or/and UPDATE independently.
      sql/item_func.h:
        We need to distinguish NOW() from other function for using in 
        DEFAULT and in ON UPDATE clauses.
      sql/item_timefunc.h:
        We need to distinguish NOW() from other function for using in 
        DEFAULT and in ON UPDATE clauses.
      sql/mysql_priv.h:
        Added parameter for ON UPDATE value to add_field_to_list() function.
      sql/share/czech/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/danish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/dutch/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/english/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/estonian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/french/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/german/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/greek/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/hungarian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/italian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/japanese/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/korean/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/norwegian-ny/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/norwegian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/polish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/portuguese/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/romanian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/russian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/serbian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/slovak/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/spanish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/swedish/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/share/ukrainian/errmsg.txt:
        Added error messages for case when we have more than one column with
        NOW() (CURRENT_TIMESTAMP is just more standard alias) in DEFAULT or 
        ON UPDATE clauses and for case when we are using ON UPDATE clause with
        wrong type.
      sql/sql_base.cc:
        Added setup of TABLE::timestamp_default_now/on_update_now pair
        for each statement to open_table().
      sql/sql_insert.cc:
        Using TABLE::timestamp_default_now/on_update_now pair instead of
        old TABLE::time_stamp. Added check for case then REPLACE could not
        be converted to UPDATE because of different DEFAULT/ON UPDATE values
        for TIMESTAMP field.
      sql/sql_lex.h:
        Added member for value used in ON UPDATE clause to st_lex.
      sql/sql_load.cc:
        Using TABLE::timestamp_default_now/on_update_now pair instead of
        old TABLE::time_stamp. We don't need to restore these members
        since they are set up for each statement in open_table().
      sql/sql_parse.cc:
        Added handling of DEFAULT NOW() and ON UPDATE NOW() clauses for
        TIMESTAMP fields to add_field_to_list() function.
      sql/sql_show.cc:
        Added support for DEFAULT CURRENT_TIMESTAMP (aka NOW() ) and 
        ON UPDATE CURRENT_TIMESTAMP to SHOW CREATE TABLE and SHOW COLUMNS.
      sql/sql_table.cc:
        mysql_create_table() function - added check for number of TIMESTAMP 
          fields with auto-set values and replacing of old style TIMESTAMPs
          with their newer analogs.
        mysql_alter_table(): Using TABLE::timestamp_default_now/on_update_now 
          pair instead of old TABLE::time_stamp. We don't need to restore these
          members since they are set up for each statement in open_table().
      sql/sql_update.cc:
        Left only setting of TABLE::timestamp_default_now/on_update_now
        to 0 since they should be already set up in open_table().
      sql/sql_yacc.yy:
        Added support for DEFAULT NOW() and ON UPDATE NOW() in field
        definitions.
      sql/table.h:
        Replaced TABLE::time_stamp withTABLE::timestamp_default_now/timestamp_on_update_now
        pair which allows to distinguish TIMESTAMP's with various DEFAULT/ON UPDATE
        clauses and optimize checks if TIMESTAMP field should be set to NOW()
        in handlers.
      sql/unireg.cc:
        Now we are marking only TIMESTAMP fields with NOW() as default or
        as on update value as special field for unireg.
      4ada2ea9
  17. 30 Mar, 2004 1 commit
    • unknown's avatar
      Fix to get correct metadata when using temporary tables to create result. (Bug #2654) · 961767fa
      unknown authored
      client/mysqltest.c:
        Added support for --enable_metadata
      mysql-test/t/order_by.test:
        Improved comment
      scripts/mysqlaccess.sh:
        CGI is required (Bug #2988)
      sql/field.cc:
        Fix to get correct metadata when using temporary tables to create result
      sql/field.h:
        Fix to get correct metadata when using temporary tables to create result
      sql/sql_insert.cc:
        Fix to get correct metadata when using temporary tables to create result
      961767fa
  18. 26 Mar, 2004 1 commit
    • unknown's avatar
      1. New data types, from the user point of view: · d98ff080
      unknown authored
         BINARY(N) and VARBIBARY(N)
      2. More 4.0 compatibility and more BINARY keyword consistency:
      2a. CREATE TABLE a (a CHAR(N) BINARY) 
          is now synonym for
          CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
      2b. SELECT BINARY x
          is still synonin for
          SELECT x COLLATE xxxxx_bin.
      
      d98ff080
  19. 16 Mar, 2004 1 commit
    • unknown's avatar
      Fix for #233 (final part) · 548eedc3
      unknown authored
      mysql-test/r/gis.result:
        test result added
      mysql-test/t/gis.test:
        test case added
      sql/field.h:
        now set_field_to_null can return -1
      sql/field_conv.cc:
        now set_field_to_null* can return -1
      548eedc3
  20. 16 Feb, 2004 1 commit
    • unknown's avatar
      Changed wellformedlen to well_formed_len · f9976eb1
      unknown authored
      Fixed that blobs >16M can be inserted/updated
      Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
      
      
      include/m_ctype.h:
        Changed wellformedlen to well_formed_len
      include/mysql.h:
        Fixed comment
      libmysql/libmysql.c:
        Fixed indentation
      libmysqld/lib_sql.cc:
        Fixed indentation
      mysql-test/r/ctype_utf8.result:
        updated warning numbers
      mysql-test/r/innodb.result:
        Moved test to right place
      mysql-test/r/myisam-blob.result:
        More test for blobs
      mysql-test/r/rpl000002.result:
        Move test to better place
      mysql-test/r/rpl_log.result:
        Move test to better place
      mysql-test/r/union.result:
        Move test to better place
      mysql-test/t/innodb.test:
        Moved test to right place
      mysql-test/t/myisam-blob.test:
        More test of blobs
      mysql-test/t/rpl000002.test:
        Move test to better place
      mysql-test/t/rpl_log.test:
        Move test to better place
      mysql-test/t/union.test:
        Move test to better place
      sql/field.cc:
        Changed wellformedlen to well_formed_len.
        Fixed that blobs >16M can be inserted/updated (new bug)
      sql/field.h:
        Code optimization
      sql/sql_lex.cc:
        Changed short variable names
      sql/sql_show.cc:
        Optimized quote handling
      sql/sql_table.cc:
        Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
      sql/sql_union.cc:
        Added comment
      strings/ctype-big5.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-bin.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-euc_kr.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-gb2312.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-gbk.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-latin1.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-mb.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-simple.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-sjis.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-tis620.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-ucs2.c:
        Changed wellformedlen to well_formed_len
        Indentation changes
      strings/ctype-ujis.c:
        Changed wellformedlen to well_formed_len
      strings/ctype-utf8.c:
        Changed wellformedlen to well_formed_len
      f9976eb1
  21. 10 Feb, 2004 1 commit
  22. 30 Jan, 2004 1 commit
    • unknown's avatar
      Fix for bugs #1885, #2464, #2539. Proper handling of default · 4d83e9d1
      unknown authored
      values for TIMESTAMP columns. The solution is not perfect since
      we just silently ignoring default value for first TIMESTAMP 
      column and properly reflecting this fact in SHOW CREATE TABLE.
      We can't give a warning or simply support standard syntax 
      (niladic functions as legal value for default) for first field 
      since it is 4.0 tree.
      
      
      mysql-test/r/type_timestamp.result:
        Added test for bugs #1885, #2464, #2539
        (proper support of default values for TIMESTAMP columns)
      mysql-test/t/type_timestamp.test:
        Added test for bugs #1885, #2464, #2539
        (proper support of default values for TIMESTAMP columns)
      sql/field.cc:
        Enabled copying of defaults for TIMESTAMP fields when we are 
        creating table with CREATE TABLE x (SELECT ...)
      sql/field.h:
        Set proper DEFAULT value for non-first TIMESTAMP column.
      sql/sql_parse.cc:
        Allowed default values for TIMESTAMP column.
      sql/sql_show.cc:
        Enabled printing of default values in SHOW CREATE TABLE and 
        SHOW COLUMNS for all TIMESTAMP columns except first one.
      4d83e9d1
  23. 15 Jan, 2004 1 commit
    • unknown's avatar
      SCRUM: · 975a611b
      unknown authored
      WL#1163 (Making spatial code optional)
      Pack of changes to do in sql/ code.
      
      
      sql/field.cc:
        Spatial code #ifdef-ed
      sql/field.h:
        Spatial code #ifdef-ed
      sql/item_create.cc:
        Spatial code #ifdef-ed
      sql/item_create.h:
        Spatial code #ifdef-ed
      sql/item_geofunc.cc:
        Spatial code #ifdef-ed
      sql/item_geofunc.h:
        Spatial code #ifdef-ed
        GEOM_NEW implementation
      sql/lex.h:
        Code was significally modified to support optional group
        of functions
      sql/lex_symbol.h:
        SYM_GROUP structure presented
      sql/sql_table.cc:
        Spatial code #ifdef-ed
      sql/sql_yacc.yy:
        Several modifications to make spatial code optional
      sql/table.cc:
        Spatial code #ifdef-ed
      sql/unireg.cc:
        Spatial code #ifdef-ed
      975a611b
  24. 11 Jan, 2004 1 commit
    • unknown's avatar
      A fix (bug #2335: Inconsistancy with handling of Years and NOW() function). · 001205fd
      unknown authored
      The test might fail if one runs it at 23:59:59 Dec 31
      
      
      mysql-test/r/type_year.result:
        a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
      mysql-test/t/type_year.test:
        a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
      sql/field.h:
        a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
      001205fd
  25. 19 Dec, 2003 1 commit
    • unknown's avatar
      Fixes after merge with 4.0 · c9f5145a
      unknown authored
      Cleaned up embedded library access and query cache handling
      Changed min stack size to 128K (to allow longer MyISAM keys)
      Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      
      
      client/mysqldump.c:
        Fixed bugs found after merge
      include/mysql_embed.h:
        Disable query cache when using embedded version
      myisam/mi_check.c:
        Removed not used variable
      mysql-test/r/auto_increment.result:
        Fixed bugs found after merge
      mysql-test/r/bdb.result:
        Fixed bugs found after merge
      mysql-test/r/func_group.result:
        Fixed bugs found after merge
      mysql-test/r/func_str.result:
        Fixed bugs found after merge
      mysql-test/r/func_time.result:
        Fixed bugs found after merge
      mysql-test/r/group_by.result:
        Fixed bugs found after merge
      mysql-test/r/innodb.result:
        Fixed bugs found after merge
      mysql-test/r/insert.result:
        Fixed bugs found after merge
      mysql-test/r/join_outer.result:
        Fixed bugs found after merge
      mysql-test/r/loaddata.result:
        Fixed bugs found after merge
      mysql-test/r/multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/mysqldump.result:
        Update results
      mysql-test/r/rpl_EE_error.result:
        Fixed bugs found after merge
      mysql-test/r/rpl_multi_update.result:
        Fixed bugs found after merge
      mysql-test/r/symlink.result:
        Update results
      mysql-test/r/type_blob.result:
        Update results
      mysql-test/r/type_datetime.result:
        Update results
      mysql-test/r/type_decimal.result:
        Update results
      mysql-test/r/type_enum.result:
        Fixed bugs found after merge
      mysql-test/r/type_timestamp.result:
        Update results
      mysql-test/r/union.result:
        Update results
      mysql-test/r/warnings.result:
        Update results
      mysql-test/t/bdb.test:
        Fix test for 4.1
      mysql-test/t/innodb.test:
        Fix test for 4.1
      mysql-test/t/multi_update.test:
        Fix test for 4.1
      mysql-test/t/mysqldump.test:
        Fix test for 4.1
      mysql-test/t/rpl_EE_error.test:
        Fix test for 4.1
      mysql-test/t/rpl_multi_update.test:
        Fix test for 4.1
      mysql-test/t/union.test:
        Cleanup
      mysys/charset.c:
        Check results from my_once_alloc()
      mysys/my_handler.c:
        part of 4.0 merge
      sql-common/client.c:
        Part of 4.0 merge
      sql/field.cc:
        After merge fixes
      sql/field.h:
        After merge fixes
      sql/ha_innodb.cc:
        Remove duplicate include files
      sql/item.cc:
        Changed automatic int conversion to be of type binary
      sql/item.h:
        After merge fixes
      sql/item_func.cc:
        Changed automatic int conversion to be of type binary
      sql/item_func.h:
        After merge fixes
      sql/item_strfunc.cc:
        Added comments
      sql/item_subselect.cc:
        Indentation fixes
      sql/item_sum.cc:
        Changed automatic int conversion to be of type binary
      sql/item_sum.h:
        After merge fixes
      sql/mysql_priv.h:
        Cleanup embedded library access checks
      sql/mysqld.cc:
        Changed min stack size to 128K (to allow longer MyISAM keys)
      sql/set_var.cc:
        Fixed compiler warnings
      sql/share/czech/errmsg.txt:
        Better error message
      sql/share/danish/errmsg.txt:
        Better error message
      sql/share/dutch/errmsg.txt:
        Better error message
      sql/share/english/errmsg.txt:
        Better error message
      sql/share/estonian/errmsg.txt:
        Better error message
      sql/share/french/errmsg.txt:
        Better error message
      sql/share/greek/errmsg.txt:
        Better error message
      sql/share/hungarian/errmsg.txt:
        Better error message
      sql/share/italian/errmsg.txt:
        Better error message
      sql/share/japanese/errmsg.txt:
        Better error message
      sql/share/korean/errmsg.txt:
        Better error message
      sql/share/norwegian-ny/errmsg.txt:
        Better error message
      sql/share/norwegian/errmsg.txt:
        Better error message
      sql/share/polish/errmsg.txt:
        Better error message
      sql/share/romanian/errmsg.txt:
        Better error message
      sql/share/russian/errmsg.txt:
        Better error message
      sql/share/serbian/errmsg.txt:
        Better error message
      sql/share/slovak/errmsg.txt:
        Better error message
      sql/share/spanish/errmsg.txt:
        Better error message
      sql/share/swedish/errmsg.txt:
        Better error message
      sql/share/ukrainian/errmsg.txt:
        Better error message
      sql/sql_acl.h:
        Cleaned up embedded library acccess checks
      sql/sql_base.cc:
        After merge fixes
      sql/sql_client.cc:
        After merge fixes
      sql/sql_parse.cc:
        After merge fixes
        Changed access check code for embedded library (needed to make code shorter and ensure that check_table_access() is called)
        Recoded create-table handling for CREATE TABLE ... SELECT to make code shorter and faster
      sql/sql_prepare.cc:
        Add missing arguments
      sql/sql_select.cc:
        After merge fixes
      sql/sql_update.cc:
        After merge fixes
      sql/sql_yacc.yy:
        Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
      sql/table.cc:
        After merge fixes
      c9f5145a
  26. 15 Dec, 2003 1 commit
    • 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
  27. 12 Dec, 2003 1 commit
    • unknown's avatar
      Fix autoincrement for signed columns (Bug #1366) · 6c50fea9
      unknown authored
      Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
      Disable creation of symlinks if my_disable_symlink is set
      Fixed searching of TEXT with end space. (Bug #1651)
      Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
      Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
      Fixed timestamp.test
      
      
      include/my_base.h:
        Add HA_END_SPACE_KEY to mark keys that has VARCHAR/TEXT fields.
      myisam/mi_check.c:
        Delete not used variable
      myisam/mi_key.c:
        Fix autoincrement for signed columns (Bug #1366). Patch by Holyfoot
      myisam/mi_open.c:
        Bug fix for future (doesn't affect current code)
      myisam/mi_search.c:
        Ignore end space for VARCHAR/TEXT columns
      mysql-test/r/auto_increment.result:
        Test auto_increment with signed numbers
      mysql-test/r/binary.result:
        Update results (old result was wrong)
      mysql-test/r/func_str.result:
        Added test of QUOTE()
      mysql-test/r/func_time.result:
        Add test of unix_timestamp()
      mysql-test/r/have_met_timezone.require:
        Fixed test
      mysql-test/r/innodb.result:
        Add test for InnoDB behaviour with TRUNCATE
      mysql-test/r/multi_update.result:
        Test of multi-update bug
      mysql-test/r/symlink.result:
        Test of ALTER TABLE and symlinks
      mysql-test/r/timezone.result:
        Test of from_unixtime()
      mysql-test/r/truncate.result:
        Test of truncate and auto_increment
      mysql-test/r/type_blob.result:
        Test of key search on TEXT/VARCHAR column with end space
      mysql-test/t/auto_increment.test:
        Test auto_increment with signed numbers
      mysql-test/t/func_str.test:
        Added test of QUOTE()
      mysql-test/t/func_time.test:
        Add test of unix_timestamp()
      mysql-test/t/innodb.test:
        Add test for InnoDB behaviour with TRUNCATE
      mysql-test/t/multi_update.test:
        Test of multi-update bug
      mysql-test/t/symlink.test:
        Test of ALTER TABLE and symlinks
      mysql-test/t/timezone.test:
        Test of from_unixtime()
      mysql-test/t/truncate.test:
        Test of truncate and auto_increment
      mysql-test/t/type_blob.test:
        Test of key search on TEXT/VARCHAR column with end space
      mysys/my_symlink2.c:
        Disable creation of symlinks if my_disable_symlink is set
      sql/field.h:
        Indentation cleanup
      sql/ha_innodb.cc:
        HA_PART_KEY -> HA_PART_KEY_SEG
      sql/item_strfunc.cc:
        Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
      sql/mysql_priv.h:
        Make check_dup() external
      sql/opt_range.cc:
        Fixed searching of TEXT with end space. (Bug #1651)
      sql/records.cc:
        Fixed caching bug in multi-table-update where same table was used twice.
        (Bug #1711)
      sql/sql_acl.cc:
        Reset ip and ip_mask if hostname is NULL
      sql/sql_parse.cc:
        Make check_dup() global
      sql/sql_select.cc:
        Fixed searching of TEXT with end space. (Bug #1651)
      sql/sql_table.cc:
        Fixed searching of TEXT with end space. (Bug #1651)
      sql/sql_update.cc:
        Fixed caching bug in multi-table-update where same table was used twice.
        (Bug #1711)
      sql/table.cc:
        Fixed searching of TEXT with end space. (Bug #1651)
      sql/table.h:
        Fixed caching bug in multi-table-update where same table was used twice.
        (Bug #1711)
      sql/time.cc:
        Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
      6c50fea9
  28. 25 Nov, 2003 1 commit
    • unknown's avatar
      added collation processing in UNION merging · 7a013ca6
      unknown authored
      temporary table BLOB now is longblob
      
      
      mysql-test/r/create.result:
        blob size changed for safety
      mysql-test/r/type_blob.result:
        blob size changed for safety
      mysql-test/r/type_ranges.result:
        blob size changed for safety
      mysql-test/r/union.result:
        blob size changed for safety
        new tests of UNION types merging
      mysql-test/t/union.test:
        new tests of UNION types merging
      sql/field.h:
        blob size changed for safety
      sql/item.cc:
        processing of collation added
        added comment
      sql/item.h:
        joining of UNION fields may failed now, because of incompatibility of collations
      sql/sql_union.cc:
        joining of UNION fields may failed now, because of incompatibility of collations
      7a013ca6
  29. 23 Nov, 2003 2 commits
    • unknown's avatar
      after review fixes · c73803e9
      unknown authored
      mysql-test/r/union.result:
        new tests, more correct results for old one
      mysql-test/t/union.test:
        new tests, more correct results for old one
      sql/field.cc:
        new way to make field types csting
      sql/field.h:
        new way to make field types csting
      sql/item.cc:
        new way to make field types csting
      sql/sql_derived.cc:
        fixed typo
      sql/sql_lex.h:
        comment added
      c73803e9
    • unknown's avatar
      Fixed UNION fields type/length detecting · 0fdce449
      unknown authored
      mysql-test/r/union.result:
        new results with max union field length detecting
        type conversion tests
      mysql-test/t/union.test:
        type conversion tests
      sql/field.h:
        field converion support
      sql/item.cc:
        fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
        layout fix
        new item for storing field type
      sql/item.h:
        new item for storing field type
      sql/item_subselect.cc:
        new subquery item length/dec detecting
      sql/mysql_priv.h:
        we do not need pre-inited tables and fields
      sql/sql_base.cc:
        we do not need double fix_fielding
      sql/sql_class.h:
        we do not need double fix_fielding
      sql/sql_derived.cc:
        preparing moved before temporary table creation
      sql/sql_lex.h:
        we do not need pre-inited tables and fields
        new lists to store fields types and fields of temporary table
      sql/sql_parse.cc:
        we do not need pre-inited tables and fields
      sql/sql_prepare.cc:
        we do not need pre-inited tables and fields
      sql/sql_select.cc:
        we do not need pre-inited tables and fields
        support mysql_select call from derived tables after it preparing (in derived table routing)
        support of crreating temporary table fields from Item_type_holder
      sql/sql_select.h:
        we do not need pre-inited tables and fields
      sql/sql_union.cc:
        we do not need pre-inited tables and fields
        check of columns number in union moved to prepare()
        prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting
      sql/sql_update.cc:
        we do not need pre-inited tables and fields
      0fdce449
  30. 03 Nov, 2003 1 commit
    • unknown's avatar
      Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error · 4563a476
      unknown authored
      Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
      This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
      Changed flag argument to str_to_TIME() and get_date() from bool to uint
      Removed THD from str_to_xxxx functions and Item class.
      Fixed core dump when doing --print-defaults
      Move some common string functions to strfunc.cc
      Dates as strings are now of type my_charset_bin instead of default_charset()
      Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
      Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
      Renamed some TIMESTAMP_xxx enums to more appropriate names
      Use defines instead of integers for date/time/datetime string lengths
      Added to build system and use the new my_strtoll10() function.
      
      
      
      BUILD/compile-pentium-valgrind-max:
        Remove double printing of warning
      VC++Files/libmysqld/libmysqld.dsp:
        Added strfunc.cc
      VC++Files/sql/mysqld.dsp:
        Added strfunc.cc
      VC++Files/sql/mysqldmax.dsp:
        Added strfunc.cc
      VC++Files/strings/strings.dsp:
        added my_strtoll10.c
      include/m_ctype.h:
        Removed MY_LEX_FOUND_IDENT (not used)
      include/m_string.h:
        Added my_strtoll10()
      include/mysqld_error.h:
        simplified 'wrong xxx name' error messages
      include/sql_state.h:
        simplified 'wrong xxx name' error messages
      libmysqld/Makefile.am:
        Added strfunc.cc
      mysql-test/mysql-test-run.sh:
        Simplified some options
        changed $@ to "$@" in an attempt to handle options with space (Didn't succeed;  Problem will disappear when mysql-test-run is rewritten in C)
      mysql-test/r/ctype_latin1_de.result:
        Added new tests
      mysql-test/r/ctype_recoding.result:
        Extended tests
      mysql-test/r/date_formats.result:
        Cleaned up tests
        Disabled some tests that can't yet be run
      mysql-test/r/func_compress.result:
        New error message
      mysql-test/r/rpl_temporary.result:
        Added new test
      mysql-test/t/create.test:
        Changed error numbers
      mysql-test/t/ctype_latin1_de.test:
        New tests
      mysql-test/t/ctype_recoding.test:
        Extended tests
      mysql-test/t/date_formats-master.opt:
        Removed datetime_format as we can't handle options with space in mysql-test-run
      mysql-test/t/date_formats.test:
        Cleaned up tests
        Disabled some tests that can't yet be run
      mysql-test/t/rpl_temporary.test:
        Added testing of open temporary table on slave shutdown
      mysql-test/t/symlink.test:
        Fixed error numbers
      mysys/default.c:
        Fixed core dump when doing --print-defaults
      sql/Makefile.am:
        Added strfunc.cc
      sql/derror.cc:
        Fixed compiler warning
      sql/field.cc:
        Changed argument to str_to_TIME() from bool to uint
        Removed THD argument from str_to_TIME()
        Moved find_enum() and find_set() to strfunc.cc
      sql/field.h:
        Changed type of last argument to get_date() to be able to handle more options
      sql/init.cc:
        Remove not used variable dayord
      sql/item.cc:
        Changed type of last argument to get_date() to be able to handle more options
        Removed THD* element from item.
        Don't use make_date_time() to generate date/time/datetimes
      sql/item.h:
        Changed type of last argument to get_date() to be able to handle more options
        Removed THD* from Item
      sql/item_create.cc:
        Indentation cleanup
      sql/item_func.cc:
        Use new find_type()
      sql/item_func.h:
        Changed type of last argument to get_date() to be able to handle more options
      sql/item_strfunc.h:
        space change
      sql/item_timefunc.cc:
        Changed month_names[] to be easier to use
        Moved check_names[] to strfunc.cc
        Added back old make_datetime() function
        Optimized extract_date_time()
        Use my_strtoll10() insetad of my_strntoll()
        Optimized make_date_time()
        Replaced short variable names with long ones.
        Use new functions make_time(), make_date() and make_datetime()
        Dates as strings are now of type my_charset_bin instead of default_charset()
        Changed Item_func_str_to_date() to by default return a date.
      sql/item_timefunc.h:
        Changed charset for date string from default_charset() to my_charset_bin
        Changed type of last argument to get_date() to be able to handle more options
        Use defines instead of integers for date/time/datetime string lengths
      sql/mysql_priv.h:
        Fixed/added new prototypes
      sql/mysqld.cc:
        Removed opt_datetime_format_names
        Cleaned up handling of date_time format handling. (Fixed core dump when mysqld had error on startup)
        Removed some unnecessary double init of collation variables
      sql/protocol.cc:
        Changed back protocol functions to always return dates in ISO format
      sql/set_var.cc:
        Added variables time_format, date_format and datetime_format
        This had to be recoded becasue checking was done in 'update' method and not in 'check' method.
      sql/set_var.h:
        Removed class sys_var_datetime_format() as this defined a variable (which doesn't work) instead of updating a variable
      sql/share/czech/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/danish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/dutch/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/english/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/estonian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/french/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/german/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/greek/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/hungarian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/italian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/japanese/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/korean/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/norwegian-ny/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/norwegian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/polish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/portuguese/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/romanian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/russian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/serbian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/slovak/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/spanish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/swedish/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/share/ukrainian/errmsg.txt:
        simplified 'wrong xxx name' error messages
      sql/sql_base.cc:
        Use new find_type()
      sql/sql_class.cc:
        Allocate/free date_time format variables
      sql/sql_class.h:
        Define datetime_format variables
      sql/sql_db.cc:
        Use new ER_WRONG_NAME error
      sql/sql_lex.cc:
        Change lex to generate IDENT_QUOTED for quoted identifiers or identifers that are using characters > 128.
        This enabled us to not have to copy and convert the identifier to utf8 for simpe identifiers
      sql/sql_parse.cc:
        Use new ER_WRONG_NAME error
        Use new find_type() function
      sql/sql_prepare.cc:
        Use new defines
      sql/sql_table.cc:
        Use new ER_WRONG_NAME error
      sql/sql_yacc.yy:
        Don't copy and convert simple identifiers to utf8.
        Replace __FORMAT_TYPE defines with TIMESTAMP... defines
      sql/structs.h:
        Renamed DATETIME_FORMAT to DATE_TIME format to indicate that it's for date/time/datetime formats
        Renamed WRONT_TIMESTAMP_FULL to TIMESTAMP_DATETIME_ERROR and TIMESTAMP_FULL to TIMESTAMP_DATETIME
        Added KNOWN_DATE_TIME_FORMAT struct for Item_func_get_format
      sql/time.cc:
        Prepare str_to_TIME and str_to_time() for general date/time handling
        Removed THD from str_to... functions
        Renamed date/time/datetime functions to use 'date_time' instead of 'datetime'
        Added functions to make and copy DATE_TIME_FORMAT's
        Added trivial functions 'make_time()', 'make_date()' and 'make_datetime()'
      strings/Makefile.am:
        Added my_strtoll10()
      strings/ctype-bin.c:
        Cleared upper part of binary state map to be able to easily identify simple identifiers
      strings/my_vsnprintf.c:
        F
      4563a476
  31. 24 Oct, 2003 1 commit
  32. 11 Oct, 2003 1 commit
    • unknown's avatar
      key_map with more that 64 bits width · 373f3516
      unknown authored
      sql/field.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/ha_berkeley.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/ha_berkeley.h:
        typedef Bitmap<64> key_map
        all tests pass
      sql/item.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/item_func.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/opt_sum.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/sql_delete.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/sql_show.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/sql_test.cc:
        typedef Bitmap<64> key_map
        all tests pass
      sql/sql_update.cc:
        typedef Bitmap<64> key_map
        all tests pass
      include/my_bitmap.h:
        more bitmap methods
      mysys/my_bitmap.c:
        more bitmap methods
      sql/field.h:
        init bitmaps
      sql/ha_innodb.h:
        optimization
      sql/ha_isam.cc:
        optimization
      sql/ha_myisam.cc:
        optimization
      sql/ha_myisammrg.cc:
        optimization
      sql/handler.h:
        optimization
      sql/mysqld.cc:
        bitmap_init() interface changed
      sql/opt_range.cc:
        optimization
      sql/opt_range.h:
        optimization
      sql/slave.cc:
        bitmap_init() interface changed
      sql/sql_base.cc:
        optimization
      sql/sql_select.cc:
        init bitmaps
        using const for bitmaps whenever possible
      sql/sql_select.h:
        cleanup
      sql/table.cc:
        always init bitmaps
      BitKeeper/etc/ignore:
        Added sql/udf_example.so to the ignore list
      sql/mysql_priv.h:
        use Bitmap over ulonglong by default
      373f3516
  33. 11 Sep, 2003 1 commit
    • unknown's avatar
      After merge fixes. · d574e99c
      unknown authored
      Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
      
      
      client/mysql.cc:
        After merge fix
      include/mysql.h:
        Some additions to MYSQL_BIND for cleaner prepared statement code
      libmysql/libmysql.c:
        mysql_prepare_result -> mysql_get_metadata()
        Added test for offset overflow when using mysql_fetch_column()
        Cleaned up mysql_fetch_column()
        Optimized fetch_result() usage
      mysql-test/r/func_group.result:
        Updated results after merge
      mysql-test/r/func_test.result:
        Updated results after merge
      mysql-test/r/grant.result:
        Updated results after merge
      mysql-test/r/loaddata.result:
        Updated results after merge
      mysql-test/r/lowercase_table.result:
        Updated results after merge
      mysql-test/r/mix_innodb_myisam_binlog.result:
        Updated results after merge (note that this is still not correct; Need patch to mysqld to fix this properly)
      mysql-test/r/myisam.result:
        Updated results after merge
      mysql-test/r/range.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata_rule_m.result:
        Updated results after merge
      mysql-test/r/rpl_loaddata_rule_s.result:
        Updated results after merge
      mysql-test/r/rpl_log.result:
        Updated results after merge
      mysql-test/r/union.result:
        Updated results after merge
      mysql-test/t/lowercase_table.test:
        Update after merge
      mysql-test/t/myisam.test:
        Update after merge
      mysql-test/t/union.test:
        Update after merge
      sql-bench/compare-results.sh:
        Fix for now output format
      sql/field.h:
        Added is_null_in_record() to make ha_innodb.cc code more general
      sql/ha_innodb.cc:
        Removed some functions that uses inernal (private) MySQL information
      sql/item_cmpfunc.cc:
        After merge fix
      sql/log_event.cc:
        After merge fix; (Some code should be checked by Guilhem)
      sql/opt_range.cc:
        Simple optimzation and after merge fixes
      sql/slave.cc:
        After merge fix
      sql/sql_acl.cc:
        After merge fix + code cleanup
      sql/sql_select.cc:
        After merge fix
      sql/sql_show.cc:
        After merge fix
      sql/sql_table.cc:
        After merge fix
        Cleanup of mysql_checksum_table()
      sql/sql_union.cc:
        After merge fixes.
        Note that after this the union test still fails; Will be fixed shortly...
      tests/client_test.c:
        mysql_prepare_result() -> mysql_get_metadata()
      d574e99c
  34. 27 Aug, 2003 1 commit
    • unknown's avatar
      fixed bug #910 (right type of ifnull function) · f6f23208
      unknown authored
      mysql-test/r/create.result:
        added test for bug #910 (right type of ifnull function)
      mysql-test/t/create.test:
        added test for bug #910 (right type of ifnull function)
      sql/field.h:
        added new constructors of Field_decimal, Field_tiny, Field_short, Field_float,
        Field_null, Field_year
        for using in Item::tmp_table_field_from_field_type
      sql/item.cc:
        added Item::tmp_table_field_from_field_type
      sql/item.h:
        added Item::tmp_table_field_from_field_type
      f6f23208
  35. 11 Aug, 2003 1 commit
    • unknown's avatar
      Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a · bddc6175
      unknown authored
      The above query created a field of koi8r charset, not cp1251
      
      Change:
      CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
      Length now means character length, not byte length.
      The above creates a field that guarantees can store a multibyte value
      1 character long. For utf8 the above creates a field that can store
      3 bytes.
      
      bddc6175
  36. 28 Jul, 2003 1 commit