into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

  Cleanup


Docs/manual.texi:
  Cleanup

  Cleanup


Docs/manual.texi:
  Cleanup

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  fix typo

manual.texi	DEC is also a synonym for DECIMAL.


Docs/manual.texi:
  NUMERIC(M,D) arguments are optional.
  DEC is also a synonym for DECIMAL.

manual.texi	and "e-mail" other times.


Docs/manual.texi:
  Use "e-mail" consistently, not "email" sometimes
  and "e-mail" other times.

Docs/manual.texi:
  fix oops in mysql_data_seek() prototype.

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0

  new file

  Manual changes to reflect auto-extending data file and better foreign key support in 3.23.50


Docs/manual.texi:
  Manual changes to reflect auto-extending data file and better foreign key support in 3.23.50

  Update


Docs/mirrors.texi:
  Update

Docs/manual.texi:
  INET_ATON() formula was documented incorrectly.

manual.texi	not unsigned int.
manual.texi	mysql_real_escape_string() return value and third arg
manual.texi	now are unsigned long, not unsigned int.


Docs/manual.texi:
  mysql_real_query() third arg is unsigned long,
  not unsigned int.

manual.texi	an alternative non-deprecated way to test for SET.


Docs/manual.texi:
  Add SET_FLAG to manual.  It's deprecated, but there
  an alternative non-deprecated way to test for SET.

Docs/manual.texi:
  Change note mods, 3.23.25 to 3.23.38.

Docs/manual.texi:
  Change note mods, 4.0.2.

into teton.kitebird.com:/home/paul/mysql-4.0

Docs/manual.texi:
  Change note mods, 3.23.21 to 3.23.24.

Docs/manual.texi:
  Mods to data type sections.

manual.texi	@code{.ext} rather than @file{.ext} so they're
manual.texi	all consistent.


Docs/manual.texi:
  Fix filename extensions that were written using
  @code{.ext} rather than @file{.ext} so they're
  all consistent.

Docs/manual.texi:
  Change note mods, 3.23.10 to 3.23.20.

into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_table.cc:
  Auto merged

into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged

manual.texi	small cleanups


Docs/manual.texi:
  Change note mods, 4.0.0 - 4.0.2

configure.in:
  new configure parameter (now only for embeded server)
include/my_global.h:
  now query cache always included in server, because of problrms with test suit
mysql-test/r/flush.result:
  removed double testing
mysql-test/t/flush.test:
  removed double testing
mysql-test/t/grant_cache.test:
  now it is only memo about query cache
mysql-test/t/query_cache.test:
  now it is only memo about query cache

client/mysqlimport.c:
  Added --ignore-lines=# to mysqlimport

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  REPAIR ... USE_FRM documented
include/myisam.h:
  cleanup

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


Docs/manual.texi:
  Auto merged

SELECT_DEFAULT_LIMIT


Docs/manual.texi:
  Monty  forced me  to do this

into fred.bitbike.com:/home/arjen/mysql-4.0

Copyright ...-2002

sql/sql_yacc.yy:
  Auto merged

  Change the default innodb_data_file_path to create a 16M file and define it as auto-extending


sql/ha_innodb.cc:
  Change the default innodb_data_file_path to create a 16M file and define it as auto-extending