Commit graph

3511 commits

Author SHA1 Message Date
unknown
4252578b68 Fix after MERGE
Fixed use of unitialized key
2002-03-27 06:53:25 +02:00
unknown
e82a6417c4 merge (remove conflicting zip files)
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ChangeLog:
  Delete: zlib/ChangeLog
BitKeeper/deleted/.del-descrip.mms:
  Delete: zlib/descrip.mms
BitKeeper/deleted/.del-zlib.def:
  Delete: zlib/os2/zlib.def
BitKeeper/deleted/.del-example.c:
  Delete: zlib/example.c
BitKeeper/deleted/.del-faq:
  Delete: zlib/faq
BitKeeper/deleted/.del-gzio.c:
  Delete: zlib/gzio.c
BitKeeper/deleted/.del-index:
  Delete: zlib/index
BitKeeper/deleted/.del-infblock.c:
  Delete: zlib/infblock.c
BitKeeper/deleted/.del-infblock.h:
  Delete: zlib/infblock.h
BitKeeper/deleted/.del-infcodes.c:
  Delete: zlib/infcodes.c
BitKeeper/deleted/.del-infcodes.h:
  Delete: zlib/infcodes.h
BitKeeper/deleted/.del-inffast.c:
  Delete: zlib/inffast.c
BitKeeper/deleted/.del-Make_vms.com:
  Delete: zlib/Make_vms.com
BitKeeper/deleted/.del-inffast.h:
  Delete: zlib/inffast.h
BitKeeper/deleted/.del-inffixed.h:
  Delete: zlib/inffixed.h
BitKeeper/deleted/.del-inflate.c:
  Delete: zlib/inflate.c
BitKeeper/deleted/.del-inftrees.c:
  Delete: zlib/inftrees.c
BitKeeper/deleted/.del-inftrees.h:
  Delete: zlib/inftrees.h
BitKeeper/deleted/.del-infutil.c:
  Delete: zlib/infutil.c
BitKeeper/deleted/.del-infutil.h:
  Delete: zlib/infutil.h
BitKeeper/deleted/.del-maketree.c:
  Delete: zlib/maketree.c
BitKeeper/deleted/.del-minigzip.c:
  Delete: zlib/minigzip.c
BitKeeper/deleted/.del-readme:
  Delete: zlib/readme
BitKeeper/deleted/.del-Makefile.riscos:
  Delete: zlib/Makefile.riscos
BitKeeper/deleted/.del-trees.c:
  Delete: zlib/trees.c
BitKeeper/deleted/.del-trees.h:
  Delete: zlib/trees.h
BitKeeper/deleted/.del-uncompr.c:
  Delete: zlib/uncompr.c
BitKeeper/deleted/.del-zconf.h:
  Delete: zlib/zconf.h
BitKeeper/deleted/.del-zlib.3:
  Delete: zlib/zlib.3
BitKeeper/deleted/.del-zlib.dsp:
  Delete: zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.h:
  Delete: zlib/zlib.h
BitKeeper/deleted/.del-zlib.html:
  Delete: zlib/zlib.html
BitKeeper/deleted/.del-zutil.c:
  Delete: zlib/zutil.c
BitKeeper/deleted/.del-zutil.h:
  Delete: zlib/zutil.h
BitKeeper/deleted/.del-adler32.c:
  Delete: zlib/adler32.c
BitKeeper/deleted/.del-Makefile.pup:
  Delete: zlib/amiga/Makefile.pup
BitKeeper/deleted/.del-Makefile.sas:
  Delete: zlib/amiga/Makefile.sas
BitKeeper/deleted/.del-README.contrib:
  Delete: zlib/contrib/README.contrib
BitKeeper/deleted/.del-visual-basic.txt:
  Delete: zlib/contrib/visual-basic.txt
BitKeeper/deleted/.del-gvmat32.asm:
  Delete: zlib/contrib/asm386/gvmat32.asm
BitKeeper/deleted/.del-gvmat32c.c:
  Delete: zlib/contrib/asm386/gvmat32c.c
BitKeeper/deleted/.del-mkgvmt32.bat:
  Delete: zlib/contrib/asm386/mkgvmt32.bat
BitKeeper/deleted/.del-zlibvc.def:
  Delete: zlib/contrib/asm386/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp:
  Delete: zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw:
  Delete: zlib/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-algorithm.txt:
  Delete: zlib/algorithm.txt
BitKeeper/deleted/.del-match.s:
  Delete: zlib/contrib/asm586/match.s
BitKeeper/deleted/.del-readme.586:
  Delete: zlib/contrib/asm586/readme.586
BitKeeper/deleted/.del-match.s~1:
  Delete: zlib/contrib/asm686/match.s
BitKeeper/deleted/.del-readme.686:
  Delete: zlib/contrib/asm686/readme.686
BitKeeper/deleted/.del-zlib.mak:
  Delete: zlib/contrib/delphi/zlib.mak
BitKeeper/deleted/.del-zlibdef.pas:
  Delete: zlib/contrib/delphi/zlibdef.pas
BitKeeper/deleted/.del-d_zlib.bpr:
  Delete: zlib/contrib/delphi2/d_zlib.bpr
BitKeeper/deleted/.del-d_zlib.cpp:
  Delete: zlib/contrib/delphi2/d_zlib.cpp
BitKeeper/deleted/.del-readme.txt:
  Delete: zlib/contrib/delphi2/readme.txt
BitKeeper/deleted/.del-zlib.bpg:
  Delete: zlib/contrib/delphi2/zlib.bpg
BitKeeper/deleted/.del-compress.c:
  Delete: zlib/compress.c
BitKeeper/deleted/.del-zlib.bpr:
  Delete: zlib/contrib/delphi2/zlib.bpr
BitKeeper/deleted/.del-zlib.cpp:
  Delete: zlib/contrib/delphi2/zlib.cpp
BitKeeper/deleted/.del-zlib.pas:
  Delete: zlib/contrib/delphi2/zlib.pas
BitKeeper/deleted/.del-zlib32.bpr:
  Delete: zlib/contrib/delphi2/zlib32.bpr
BitKeeper/deleted/.del-zlib32.cpp:
  Delete: zlib/contrib/delphi2/zlib32.cpp
BitKeeper/deleted/.del-test.cpp:
  Delete: zlib/contrib/iostream/test.cpp
BitKeeper/deleted/.del-zfstream.cpp:
  Delete: zlib/contrib/iostream/zfstream.cpp
BitKeeper/deleted/.del-zfstream.h:
  Delete: zlib/contrib/iostream/zfstream.h
BitKeeper/deleted/.del-zstream.h:
  Delete: zlib/contrib/iostream2/zstream.h
BitKeeper/deleted/.del-zstream_test.cpp:
  Delete: zlib/contrib/iostream2/zstream_test.cpp
BitKeeper/deleted/.del-crc32.c:
  Delete: zlib/crc32.c
BitKeeper/deleted/.del-ChangeLogUnzip:
  Delete: zlib/contrib/minizip/ChangeLogUnzip
BitKeeper/deleted/.del-miniunz.c:
  Delete: zlib/contrib/minizip/miniunz.c
BitKeeper/deleted/.del-minizip.c:
  Delete: zlib/contrib/minizip/minizip.c
BitKeeper/deleted/.del-readme.txt~1:
  Delete: zlib/contrib/minizip/readme.txt
BitKeeper/deleted/.del-unzip.c:
  Delete: zlib/contrib/minizip/unzip.c
BitKeeper/deleted/.del-unzip.def:
  Delete: zlib/contrib/minizip/unzip.def
BitKeeper/deleted/.del-unzip.h:
  Delete: zlib/contrib/minizip/unzip.h
BitKeeper/deleted/.del-zip.c:
  Delete: zlib/contrib/minizip/zip.c
BitKeeper/deleted/.del-zip.def:
  Delete: zlib/contrib/minizip/zip.def
BitKeeper/deleted/.del-zip.h:
  Delete: zlib/contrib/minizip/zip.h
BitKeeper/deleted/.del-deflate.c:
  Delete: zlib/deflate.c
BitKeeper/deleted/.del-zlibvc.def~1:
  Delete: zlib/contrib/minizip/zlibvc.def
BitKeeper/deleted/.del-zlibvc.dsp~1:
  Delete: zlib/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~1:
  Delete: zlib/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-makefile.w32:
  Delete: zlib/contrib/untgz/makefile.w32
BitKeeper/deleted/.del-untgz.c:
  Delete: zlib/contrib/untgz/untgz.c
BitKeeper/deleted/.del-Makefile.b32:
  Delete: zlib/msdos/Makefile.b32
BitKeeper/deleted/.del-Makefile.bor:
  Delete: zlib/msdos/Makefile.bor
BitKeeper/deleted/.del-Makefile.dj2:
  Delete: zlib/msdos/Makefile.dj2
BitKeeper/deleted/.del-Makefile.emx:
  Delete: zlib/msdos/Makefile.emx
BitKeeper/deleted/.del-Makefile.msc:
  Delete: zlib/msdos/Makefile.msc
BitKeeper/deleted/.del-deflate.h:
  Delete: zlib/deflate.h
BitKeeper/deleted/.del-Makefile.tc:
  Delete: zlib/msdos/Makefile.tc
BitKeeper/deleted/.del-Makefile.w32:
  Delete: zlib/msdos/Makefile.w32
BitKeeper/deleted/.del-Makefile.wat:
  Delete: zlib/msdos/Makefile.wat
BitKeeper/deleted/.del-zlib.def~1:
  Delete: zlib/msdos/zlib.def
BitKeeper/deleted/.del-zlib.rc:
  Delete: zlib/msdos/zlib.rc
BitKeeper/deleted/.del-Makefile.emx~1:
  Delete: zlib/nt/Makefile.emx
BitKeeper/deleted/.del-Makefile.gcc:
  Delete: zlib/nt/Makefile.gcc
BitKeeper/deleted/.del-Makefile.nt:
  Delete: zlib/nt/Makefile.nt
BitKeeper/deleted/.del-zlib.dnt:
  Delete: zlib/nt/zlib.dnt
BitKeeper/deleted/.del-Makefile.os2:
  Delete: zlib/os2/Makefile.os2
configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
Docs/manual.texi:
  merge
sql/ha_innodb.cc:
  merge
2002-03-27 06:44:23 +02:00
unknown
1681f502bd Updated results 2002-03-27 06:29:07 +02:00
unknown
36b38aa503 merge with 3.23.50
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
configure.in:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/btr/btr0sea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/t/range.test:
  Auto merged
scripts/mysqldumpslow.sh:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/share/Makefile.am:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
Docs/manual.texi:
  merge
client/mysql.cc:
  merge
client/mysqldump.c:
  merge
innobase/buf/buf0buf.c:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/range.result:
  merge
sql/ha_innodb.cc:
  merge
sql/log_event.h:
  merge
sql/mysqld.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_load.cc:
  merge
2002-03-27 01:56:10 +02:00
unknown
d2ef10f11b Added InnoDB changes to changelog. 2002-03-27 09:37:02 +10:00
unknown
6229932f10 support for unsigned FLOAT/DOUBLE
Docs/manual.texi:
  Updated STRCMP and UNION information
configure.in:
  Portability fix
include/config-win.h:
  Fix for WIN64
include/mysql_com.h:
  Cleanup
libmysql/libmysql.c:
  Cleanup
myisam/ft_boolean_search.c:
  Cleanup
mysys/array.c:
  Cleanup
mysys/thr_alarm.c:
  Cleanup
sql/ha_innodb.cc:
  Cleanup
2002-03-27 00:50:54 +02:00
unknown
cd9643f3c1 Re-fixup of line length in InnoDB examples. Should be <76. 2002-03-27 08:37:02 +10:00
unknown
c0b9afcbd3 manual.texi:
Cleanup


Docs/manual.texi:
  Cleanup
2002-03-26 20:39:39 +02:00
unknown
d92ce47a8b manual.texi:
Cleanup


Docs/manual.texi:
  Cleanup
2002-03-26 20:33:55 +02:00
unknown
bbedc5ebbf Fixed overflow bug
Docs/manual.texi:
  Changelog
include/mysql_com.h:
  cleanup
sql/mysqld.cc:
  Fixed overflow bug in startup parameters to MySQL
2002-03-26 13:24:50 +02:00
unknown
ef63b4c03b Fixed myslqdumpslow for new log format.
scripts/mysqldumpslow.sh:
  Fix for new slow log format
2002-03-26 11:54:05 +02:00
unknown
e2255e848f Move test of gcc 3.0 from BUILD to configure 2002-03-26 11:40:18 +02:00
unknown
061038b7f0 Fix path to enable compile with other gcc version 2002-03-26 08:35:07 +02:00
unknown
0077d501cf Fixups for REPAIR ... USE_FRM additions to manual. 2002-03-26 11:49:05 +10:00
unknown
2578d6d391 manual.texi Use "e-mail" consistently, not "email" sometimes
manual.texi	and "e-mail" other times.


Docs/manual.texi:
  Use "e-mail" consistently, not "email" sometimes
  and "e-mail" other times.
2002-03-25 17:55:27 -06:00
unknown
fb8e70c2c9 Fixed typo 2002-03-26 01:33:41 +02:00
unknown
80e31ddba4 Fix for compilation on fast machine 2002-03-26 01:31:26 +02:00
unknown
529712a079 Fixed typo 2002-03-26 00:28:33 +02:00
unknown
407d0ead8c Portability fixes 2002-03-25 23:08:15 +02:00
unknown
8bf5ad427c Print compiler version
Optimize for pentiumpro for RPM's.


Build-tools/Do-rpm:
  Use compiler option -mpentiumpro
configure.in:
  Print compiler version
2002-03-25 21:23:30 +02:00
unknown
150579010c manual.texi fix oops in mysql_data_seek() prototype.
Docs/manual.texi:
  fix oops in mysql_data_seek() prototype.
2002-03-25 10:59:25 -06:00
unknown
739b4da888 Fixes for --enable-named-pipe
Docs/manual.texi:
  Added information about --enable-named-pipe
2002-03-25 18:10:36 +02:00
unknown
d0f534515c Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-03-25 18:10:35 +02:00
unknown
9ee0658adc Fixed that RPM can be recompiled even if there is not another glibc in /usr/local/mysql-glibc
Build-tools/Do-compile:
  Fix to build mysqlcom
Build-tools/Do-rpm:
  Fixes for building with gcc 3.0.4
Docs/manual.texi:
  Small bug fix
configure.in:
  Cleanup
2002-03-25 18:10:34 +02:00
unknown
9ed83bda3d Fixed quoting problem in mysqldump 2002-03-25 18:10:33 +02:00
unknown
406845c826 Merge tfr@work.mysql.com:/home/bk/mysql-4.0
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
2002-03-25 12:45:12 +02:00
unknown
7bd5274ebd armenia.txt, armenia.eps, armenia.gif:
new file
2002-03-25 12:44:45 +02:00
unknown
754eb8f597 manual.texi:
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
2002-03-25 10:36:26 +02:00
unknown
71b7653129 Changing on NT the default named pipe for an optional user
variable
2002-03-24 23:39:03 -03:00
unknown
134a1bb86f mirrors.texi:
Update


Docs/mirrors.texi:
  Update
2002-03-24 22:22:54 +02:00
unknown
475bc6ede0 manual.texi INET_ATON() formula was documented incorrectly.
Docs/manual.texi:
  INET_ATON() formula was documented incorrectly.
2002-03-24 13:14:45 -06:00
unknown
3efabab21e manual.texi mysql_real_query() third arg is unsigned long,
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.
2002-03-23 22:50:07 -06:00
unknown
fb54101282 manual.texi Add SET_FLAG to manual. It's deprecated, but there's
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.
2002-03-23 21:53:59 -06:00
unknown
91dd803d2d manual.texi Change note mods, 3.23.25 to 3.23.38.
Docs/manual.texi:
  Change note mods, 3.23.25 to 3.23.38.
2002-03-23 14:41:34 -06:00
unknown
278b14c21e manual.texi Change note mods, 4.0.2.
Docs/manual.texi:
  Change note mods, 4.0.2.
2002-03-22 22:20:33 -06:00
unknown
bffcc6e3ce Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-03-22 18:14:32 -06:00
unknown
53cad25da6 manual.texi Change note mods, 3.23.21 to 3.23.24.
Docs/manual.texi:
  Change note mods, 3.23.21 to 3.23.24.
2002-03-22 18:12:35 -06:00
unknown
90bc20a6d0 manual.texi Mods to data type sections.
Docs/manual.texi:
  Mods to data type sections.
2002-03-22 18:01:21 -06:00
unknown
3e0c9f936d manual.texi Fix filename extensions that were written using
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.
2002-03-22 17:02:56 -06:00
unknown
c36e023e26 manual.texi Change note mods, 3.23.10 to 3.23.20.
Docs/manual.texi:
  Change note mods, 3.23.10 to 3.23.20.
2002-03-22 16:59:09 -06:00
unknown
4dd4b1e8f2 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_table.cc:
  Auto merged
2002-03-23 00:18:20 +02:00
unknown
7505d6945f Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-03-22 15:52:42 -06:00
unknown
ea1748505d manual.texi Change note mods, 4.0.0 - 4.0.2
manual.texi	small cleanups


Docs/manual.texi:
  Change note mods, 4.0.0 - 4.0.2
2002-03-22 15:47:05 -06:00
unknown
3d2ac023a0 added building without query cache
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
2002-03-22 22:55:08 +02:00
unknown
420e06e24b Added --ignore-lines=# to mysqlimport.
client/mysqlimport.c:
  Added --ignore-lines=# to mysqlimport
2002-03-22 15:35:46 +02:00
unknown
9b1c44cf9d merged 2002-03-22 12:46:45 +00:00
unknown
80edcb8902 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-03-22 12:42:04 +00:00
unknown
14e76e2855 REPAIR ... USE_FRM
Docs/manual.texi:
  REPAIR ... USE_FRM documented
include/myisam.h:
  cleanup
2002-03-22 12:40:29 +00:00
unknown
8f2f159750 Fix for bug in WHERE key='j' or key='J'
Docs/manual.texi:
  Changelog
myisam/myisampack.c:
  Delete tmp file on error.
mysql-test/r/range.result:
  Updated test case
mysql-test/t/range.test:
  Updated test case
2002-03-22 14:03:42 +02:00
unknown
30016518c3 Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2002-03-22 13:40:46 +02:00