into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1


sql/sql_select.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci)

compile even without InnoDB


mysql-test/t/system_mysql_db_fix.test:
  remove ^M's
mysql-test/t/system_mysql_db_refs.test:
  remove ^M's
sql/mysqld.cc:
  compile even without InnoDB !

mysql-test/r/ps.result:
  test of prepared EXPLAIN
mysql-test/t/ps.test:
  fix layout and table removing of previous tests
  test of prepared EXPLAIN
sql/sql_prepare.cc:
  explain pave to be prepared, too
  cleanup options after explain execution
sql/sql_select.cc:
  removed unneed assignment

  new file

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.

anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

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.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root

into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1


client/mysqldump.c:
  Auto merged

an error code if the output device is filled"

Makefile.am:
  Previous commit didn't make it: I'd forgotten semicolon.

into mysql.com:/home/kostja/mysql/mysql-4.1-root

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.

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged

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

into mysql.com:/space/my/mysql-4.1-build


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged

   build thread

into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1


sql/sql_yacc.yy:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1

   project file


VC++Files/sql/mysqld.dsp:
   - added missing file tztime.cpp to the mysqld project file

result of SHOW TABLE STATUS


BitKeeper/etc/ignore:
  added libmysqld/my_time.c

into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1


sql/sql_select.cc:
  Auto merged

into mysql.com:/space/my/mysql-4.1-build

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

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)"