1. 21 Jun, 2004 1 commit
    • unknown's avatar
      Small cleanup in time zone handling code: · 6c960c40
      unknown authored
      Now we are using time zone abbreviations in debug builds or in utlities only.
      Tried to remove warnings generated by compiler by using more proper types for
      members of time zone describing structures. Removed unused variables. 
      Fixed test_time to be able to build on FreeBSD without much problems.
      Portability fix: resolved ambiguity of abs() function.
      
      6c960c40
  2. 19 Jun, 2004 2 commits
  3. 18 Jun, 2004 13 commits
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · c4930750
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-874
      
      
      include/mysql.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      c4930750
    • unknown's avatar
      API change: mysql_shutdown() now requires a 2nd argument, the shutdown level. · ceb1f65b
      unknown authored
      mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
      And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
      (it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
      So this change is just to make the 4.1 API suitable before it is frozen. Later
      we will actually implement the shutdown levels.
      
      
      VC++Files/winmysqladmin/main.cpp:
        2nd argument to mysql_shutdown()
      VC++Files/winmysqladmin/mysql.h:
        2nd argument to mysql_shutdown()
      VC++Files/winmysqladmin/mysql_com.h:
        Several types of shutdown now.
      include/mysql_com.h:
        SHUTDOWN_DEFAULT is now 0 instead of 255, this saves one test in sql_parse.cc
      libmysql/libmysql.c:
        correcting mistake (how come that my tests still all worked with this? - should recheck, for curiosity).
      sql/sql_parse.cc:
        with SHUTDOWN_DEFAULT==0, no need for testing packet_length.
      ceb1f65b
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · ae8e4b86
      unknown authored
      into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
      
      ae8e4b86
    • unknown's avatar
      perror.c: · 45d595a6
      unknown authored
        MySql -> MySQL (Bug #4182)
      
      
      extra/perror.c:
        MySql -> MySQL (Bug #4182)
      45d595a6
    • unknown's avatar
      No commit message · b99ac15c
      unknown authored
      No commit message
      b99ac15c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 0ea5a3c2
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
      
      0ea5a3c2
    • unknown's avatar
      configure.in: · 743bdc9b
      unknown authored
        New collations were added.
      
      
      configure.in:
        New collations were added.
      743bdc9b
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 8268b5c9
      unknown authored
      into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
      
      
      sql/item.cc:
        Auto merged
      8268b5c9
    • 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
    • unknown's avatar
      ctype-uca.c: · 1f244c30
      unknown authored
        Code optimization to make it look better and work faster.
      
      
      strings/ctype-uca.c:
        Code optimization to make it look better and work faster.
      1f244c30
    • unknown's avatar
      ctype-uca.c: · d6c07c9c
      unknown authored
        Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
      
      
      strings/ctype-uca.c:
        Fix for compilation failure when HAVE_CHARSET_ucs2 is not defined.
      d6c07c9c
    • unknown's avatar
      Fix for bug#4105 "Server crash on attempt to prepare a statement with · 26c53376
      unknown authored
      character set introducer": add new item type to be returned before from 
      Item_param until it's value is set.
      This way items like Item_bool_func2 and udf_handler won't treat this item
      as constant literal when statement is prepared.
      
      
      mysql-test/r/ps.result:
        Test results fixed (test case for bug #4105)
      mysql-test/t/ps.test:
        Followup to bug #4105: a test case.
      sql/item.cc:
        Fix for bug#4105 "Server crash on attempt to prepare a statement with 
        character set introducer": add new item type to be returned before from 
        Item_param until it's value is set.
      sql/item.h:
        Fix for bug#4105 "Server crash on attempt to prepare a statement with 
        character set introducer": add new item type to be returned before from 
        Item_param until it's value is set.
      26c53376
    • unknown's avatar
      4e76a0c5
  4. 17 Jun, 2004 12 commits
  5. 16 Jun, 2004 12 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · fc15a71f
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-4030
      
      fc15a71f
    • unknown's avatar
      e7c0d4d2
    • unknown's avatar
      fil0fil.c: · 8f3528c7
      unknown authored
        Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
      
      
      innobase/fil/fil0fil.c:
        Remove the use of mem_realloc in fil0fil.c; mem_alloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
      8f3528c7
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c93290b0
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-4030
      
      c93290b0
    • unknown's avatar
      Comments and cleanups in client library. · 00584b35
      unknown authored
      
      include/mysql.h:
        mysql_bind_param -> mysql_stmt_bind_param
      libmysql/libmysql.c:
        - more comments
        - trailing spaces stripped
        - update_statement_metadata moved to appropriate section (from 'Statement
        close and error reporting' section)
        - store_param_type moved to store_ functions
      00584b35
    • unknown's avatar
      Error message edits. · 842964ce
      unknown authored
      842964ce
    • unknown's avatar
      Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · e7f0dfb8
      unknown authored
      into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
      
      e7f0dfb8
    • unknown's avatar
      .del-mysqlclusterd~7ebaf8faea0a1100: · 15a07fdc
      unknown authored
        Delete: ndb/bin/mysqlclusterd
      .del-mysqlcluster_install_db~f363f803506081a6:
        Delete: ndb/bin/mysqlcluster_install_db
      .del-mysqlcluster~26c9c37938503734:
        Delete: ndb/bin/mysqlcluster
      
      
      BitKeeper/deleted/.del-mysqlcluster~26c9c37938503734:
        Delete: ndb/bin/mysqlcluster
      BitKeeper/deleted/.del-mysqlcluster_install_db~f363f803506081a6:
        Delete: ndb/bin/mysqlcluster_install_db
      BitKeeper/deleted/.del-mysqlclusterd~7ebaf8faea0a1100:
        Delete: ndb/bin/mysqlclusterd
      15a07fdc
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 39890c4d
      unknown authored
      into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1
      
      39890c4d
    • unknown's avatar
      bug fix in ndb make · d32c20f8
      unknown authored
      d32c20f8
    • unknown's avatar
      Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 · 2c97c3d3
      unknown authored
      into mysql.com:/space/my/mysql-4.1
      
      2c97c3d3
    • unknown's avatar
      Critical fixes after review: · dbabf926
      unknown authored
      - mutex was unlocked before the end of the critical sesion,
      - Portability issue: It's better to use (*alloc)(x) instead of alloc(x),
        if alloc is a function passed as an argument.
      - Use {} around if() block, to avoid possible problems with some Windows compilers.
      
      dbabf926