1. 25 Jun, 2004 2 commits
    • unknown's avatar
      Many files: · b60230fc
      unknown authored
        new file
      
      b60230fc
    • unknown's avatar
      Small build fix. · ce4d2601
      unknown authored
      Add my_time.h to list of headers which should be put ot include/ during make dist.
      
      
      include/Makefile.am:
        Add my_time.h to list of headers which should be put ot include/ during make dist.
      ce4d2601
  2. 24 Jun, 2004 38 commits
    • unknown's avatar
      undone · edd1eafc
      unknown authored
      edd1eafc
    • unknown's avatar
      workaround for gcc 2.95.3 bug · ef819a1c
      unknown authored
      anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
      
      ef819a1c
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 96699b4d
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      96699b4d
    • unknown's avatar
      free open cursors · d23e25dd
      unknown authored
      d23e25dd
    • unknown's avatar
      One more const method. · 473538a9
      unknown authored
      473538a9
    • unknown's avatar
      Followup to cleanup in handler interface. · bd875d0f
      unknown authored
      
      sql/ha_myisam.h:
        - max_supported_key_part_length() is const now
      sql/ha_myisammrg.h:
        - max_supported_key_part_length() is const now
      sql/handler.h:
        - max_supported_key_part_length() is const now
        - removed warning about wrong order of initializer in handler ocnstructor.
      bd875d0f
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 8ba30379
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      8ba30379
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 719965a2
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      719965a2
    • unknown's avatar
      merged · a7fa4b68
      unknown authored
      a7fa4b68
    • unknown's avatar
      Merge · 9aaed9bd
      unknown authored
      9aaed9bd
    • unknown's avatar
      Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 · bdcd56ae
      unknown authored
      into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1
      
      
      client/mysqldump.c:
        Auto merged
      bdcd56ae
    • unknown's avatar
      fixed bug #1851 "mysqldump does not return · e365dae6
      unknown authored
      an error code if the output device is filled"
      
      e365dae6
    • unknown's avatar
      Previous commit didn't make it (tree fix): I'd forgotten semicolon. · eb8a0fb1
      unknown authored
      
      Makefile.am:
        Previous commit didn't make it: I'd forgotten semicolon.
      eb8a0fb1
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · c0dc9060
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      c0dc9060
    • unknown's avatar
      Fix of broken 4.1 tree: · 27d91192
      unknown authored
      Initially my_time.c was added to sql/ link_sources target only.
      As it turns out this target is sometimes not called; instead of it
      make calls one hard-coded in top-level Makefile.am.
      Now adding linking of my_time.c to the top-level Makefile.am
      to (hopefully) cover all cases.
      
      
      Makefile.am:
        Fix of broken 4.1 tree: 
        - my_time.c was added to link_sources target.
      27d91192
    • unknown's avatar
      Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · a579eb4a
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
      
      a579eb4a
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 02f202bc
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-root
      
      02f202bc
    • unknown's avatar
      ede7aacf
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 98e4c50e
      unknown authored
      into serg.mylan:/usr/home/serg/Abk/mysql-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      98e4c50e
    • unknown's avatar
      bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before · 7e15532d
      unknown authored
      
      sql/ha_myisam.h:
        cleanup
      mysql-test/r/bdb.result:
        bug#4089
      mysql-test/t/bdb.test:
        bug#4089
      sql/opt_range.cc:
        be sloppy
      sql/sql_select.cc:
        JOIN::join_free - pass it down the tree (of selects)
        call mysql_unlock_tables only in top-level select
      7e15532d
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · f53f8f72
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      
      VC++Files/libmysqld/libmysqld.dsp:
        Auto merged
      VC++Files/sql/mysqld.dsp:
        Auto merged
      f53f8f72
    • unknown's avatar
      fc28babb
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 · d2968dd3
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
      
      
      sql/sql_yacc.yy:
        Auto merged
      d2968dd3
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · ef10b07b
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
      
      ef10b07b
    • unknown's avatar
      - Windows compile fix: added missing file tztime.cpp to the mysqld · adc48c02
      unknown authored
         project file
      
      
      VC++Files/sql/mysqld.dsp:
         - added missing file tztime.cpp to the mysqld project file
      adc48c02
    • unknown's avatar
      - fixed test_frm_bug test to work with increased number of columns in · 03d3b0a1
      unknown authored
      result of SHOW TABLE STATUS
      
      
      BitKeeper/etc/ignore:
        added libmysqld/my_time.c
      03d3b0a1
    • unknown's avatar
      Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 04661417
      unknown authored
      into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
      
      
      sql/sql_select.cc:
        Auto merged
      04661417
    • unknown's avatar
      Merge mysql.com:/space/my/mysql-4.1 · 811357dc
      unknown authored
      into mysql.com:/space/my/mysql-4.1-build
      
      811357dc
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · e85de706
      unknown authored
      into mysql.com:/home/kostja/mysql/mysql-4.1-4030
      
      
      sql/field.cc:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/tztime.cc:
        Auto merged
      e85de706
    • unknown's avatar
      Fix for Bug#4030 "Client side conversion string -> date type doesn't · 04f3836f
      unknown authored
      work (prepared statements)" and after-review fixes:
      - str_to_TIME renamed to str_to_datetime to pair with str_to_time
      - functions str_to_time and str_to_TIME moved to sql-common
      - send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
        MYSQL_TIME_DATETIME types of user input buffers.
      - few more comments in the client library
      - a test case added.
      
      
      VC++Files/libmysql/libmysql.dsp:
        new file: my_time.c
      VC++Files/libmysqld/libmysqld.dsp:
        new file: my_time.c
      VC++Files/sql/mysqld.dsp:
        new file: my_time.c
      include/Makefile.am:
        - mysql_time.h added to the list of installed client library headers
      include/mysql.h:
        - declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to 
        mysql_time.h, which is in shared use of client library and mysys.
      libmysql/Makefile.shared:
        - my_time.lo added to the list of libmysql objects
      libmysql/libmysql.c:
        Fix for bug#4030 "Client side conversion string -> date type doesn't work
         (prepared statements)" and cleanup.
        - added case labels for TIME/DATE/DATETIME types to send_data_str
        - comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
      libmysqld/Makefile.am:
        - my_time.c added
      sql-common/Makefile.am:
        - my_time.c added to the list of files included into source distribution.
      sql/Makefile.am:
        my_time.c added to the list of mysqld sources.
      sql/field.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
      sql/item.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
      sql/item_timefunc.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
      sql/mysql_priv.h:
        - added typedefs for TIME and timestamp_type
        - removed declarations for str_to_time and str_to_TIME (now this functions
          reside in mysys)
      sql/mysqld.cc:
        - log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
        - enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
          MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
      sql/set_var.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
      sql/set_var.h:
        - fixed timestamp_type usage to be compatible with typedef.
      sql/sql_prepare.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
          MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
        - embedded library implementation of set_param_{time,date,datetime} is
        much simplier now, as MYSQL_TIME is the same as TIME.
      sql/sql_yacc.yy:
        - s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
      sql/structs.h:
        - declarations for TIME and timestamp_type replaced with typedefs
        - str_to_datetime arguments moved to mysys headers
      sql/time.cc:
        - str_to_time and str_to_TIME moved to mysys
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
          exported to client.
        - str_to_TIME renamed to str_to_datetime to pair with str_to_time
        - str_to_TIME_with_warn renamed accordingly
      sql/tztime.cc:
        - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
          MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
      tests/client_test.c:
        - a test case for Bug#4030 "Client side conversion string -> date type 
        doesn't work (prepared statements)"
      04f3836f
    • unknown's avatar
      Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f9976fe8
      unknown authored
      into mysql.com:/usr/home/bar/mysql-4.1
      
      
      sql/table.cc:
        Auto merged
      f9976fe8
    • unknown's avatar
      "Version" column in SHOW TABLE STATUS. · 5859ef05
      unknown authored
      5859ef05
    • unknown's avatar
      Merge mskold@build.mysql.com:/home/bk/mysql-4.1 · ad96ce8c
      unknown authored
      into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
      
      
      sql/handler.cc:
        Auto merged
      ad96ce8c
    • unknown's avatar
      Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 · 22652afd
      unknown authored
      into mysql.com:/home/mysql_src/mysql-4.1-1717
      
      22652afd
    • unknown's avatar
      Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8131326e
      unknown authored
      into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean
      
      8131326e
    • unknown's avatar
      added posr switch to mysql-test-run · 36b785bb
      unknown authored
      36b785bb
    • unknown's avatar
      Cosmetic fixes · dd656648
      unknown authored
      dd656648
    • unknown's avatar
      Enabling the --innodb-safe-binlog option in code. If you wish to disable it, · 1760dc7d
      unknown authored
      you just need to change this line of mysqld.cc:
      #if MYSQL_VERSION_ID >= 40103
      to, say,
      #if MYSQL_VERSION_ID > 40103
      I am noticing a failure of bdb.test; I believe this is not related to the
      code I added yesterday and today, but I am checking. In any case I push this
      changeset as it cannot by itself bring more mess that I *may* (or not)
      already have brought with previous pushes.
      
      
      sql/handler.cc:
        if innodb_active_trans is true then innobase_tid too.
      sql/mysqld.cc:
        only a warning if --innodb-safe-binlog without InnoDB (it's true this situation will not hurt).
        Enabling the --innodb-safe-binlog option.
      1760dc7d