Commits · e82a6417c4687bc2d3bf9e3405f48e5a6fca7051 · nexedi / MariaDB

27 Mar, 2002 2 commits

merge (remove conflicting zip files) · e82a6417

unknown authored Mar 27, 2002


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

e82a6417

Updated results · 1681f502
unknown authored Mar 27, 2002

1681f502

26 Mar, 2002 11 commits

merge with 3.23.50 · 36b38aa5

unknown authored Mar 27, 2002


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

36b38aa5

Added InnoDB changes to changelog. · d2ef10f1
unknown authored Mar 27, 2002

d2ef10f1

support for unsigned FLOAT/DOUBLE · 6229932f

unknown authored Mar 27, 2002


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

6229932f

Re-fixup of line length in InnoDB examples. Should be <76. · cd9643f3
unknown authored Mar 27, 2002

cd9643f3
manual.texi: · c0b9afcb
unknown authored Mar 26, 2002
```
  Cleanup


Docs/manual.texi:
  Cleanup
```
c0b9afcb
manual.texi: · d92ce47a
unknown authored Mar 26, 2002
```
  Cleanup


Docs/manual.texi:
  Cleanup
```
d92ce47a

Fixed overflow bug · bbedc5eb

unknown authored Mar 26, 2002


Docs/manual.texi:
  Changelog
include/mysql_com.h:
  cleanup
sql/mysqld.cc:
  Fixed overflow bug in startup parameters to MySQL

bbedc5eb

Fixed myslqdumpslow for new log format. · ef63b4c0
unknown authored Mar 26, 2002
```
scripts/mysqldumpslow.sh:
  Fix for new slow log format
```
ef63b4c0
Move test of gcc 3.0 from BUILD to configure · e2255e84
unknown authored Mar 26, 2002

e2255e84
Fix path to enable compile with other gcc version · 061038b7
unknown authored Mar 26, 2002

061038b7
Fixups for REPAIR ... USE_FRM additions to manual. · 0077d501
unknown authored Mar 26, 2002

0077d501

25 Mar, 2002 15 commits
- manual.texi Use "e-mail" consistently, not "email" sometimes · 2578d6d3
  unknown authored Mar 25, 2002
```
manual.texi	and "e-mail" other times.


Docs/manual.texi:
  Use "e-mail" consistently, not "email" sometimes
  and "e-mail" other times.
```
  2578d6d3
- Fixed typo · fb8e70c2
  unknown authored Mar 26, 2002
  
  fb8e70c2
- Fix for compilation on fast machine · 80e31ddb
  unknown authored Mar 26, 2002
  
  80e31ddb
- Fixed typo · 529712a0
  unknown authored Mar 26, 2002
  
  529712a0
- Portability fixes · 407d0ead
  unknown authored Mar 25, 2002
  
  407d0ead
- Print compiler version · 8bf5ad42
  unknown authored Mar 25, 2002
```
Optimize for pentiumpro for RPM's.


Build-tools/Do-rpm:
  Use compiler option -mpentiumpro
configure.in:
  Print compiler version
```
  8bf5ad42
- manual.texi fix oops in mysql_data_seek() prototype. · 15057901
  unknown authored Mar 25, 2002
```
Docs/manual.texi:
  fix oops in mysql_data_seek() prototype.
```
  15057901
- Fixes for --enable-named-pipe · 739b4da8
  unknown authored Mar 25, 2002
```
Docs/manual.texi:
  Added information about --enable-named-pipe
```
  739b4da8
- Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql · d0f53451
  unknown authored Mar 25, 2002
  
  d0f53451
- Fixed that RPM can be recompiled even if there is not another glibc in /usr/local/mysql-glibc · 9ee0658a
  unknown authored Mar 25, 2002
```
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
```
  9ee0658a
- Fixed quoting problem in mysqldump · 9ed83bda
  unknown authored Mar 25, 2002
  
  9ed83bda
- Merge tfr@work.mysql.com:/home/bk/mysql-4.0 · 406845c8
  unknown authored Mar 25, 2002
```
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
```
  406845c8
- armenia.txt, armenia.eps, armenia.gif: · 7bd5274e
  unknown authored Mar 25, 2002
```
  new file
```
  7bd5274e
- manual.texi: · 754eb8f5
  unknown authored Mar 25, 2002
```
  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
```
  754eb8f5
- Changing on NT the default named pipe for an optional user · 71b76531
  unknown authored Mar 24, 2002
```
variable
```
  71b76531
24 Mar, 2002 4 commits

mirrors.texi: · 134a1bb8
unknown authored Mar 24, 2002
```
  Update


Docs/mirrors.texi:
  Update
```
134a1bb8
manual.texi INET_ATON() formula was documented incorrectly. · 475bc6ed
unknown authored Mar 24, 2002
```
Docs/manual.texi:
  INET_ATON() formula was documented incorrectly.
```
475bc6ed

manual.texi mysql_real_query() third arg is unsigned long, · 3efabab2

unknown authored Mar 23, 2002

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.

3efabab2

manual.texi Add SET_FLAG to manual. It's deprecated, but there's · fb541012

unknown authored Mar 23, 2002

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.

fb541012

23 Mar, 2002 5 commits
- manual.texi Change note mods, 3.23.25 to 3.23.38. · 91dd803d
  unknown authored Mar 23, 2002
```
Docs/manual.texi:
  Change note mods, 3.23.25 to 3.23.38.
```
  91dd803d
- manual.texi Change note mods, 4.0.2. · 278b14c2
  unknown authored Mar 22, 2002
```
Docs/manual.texi:
  Change note mods, 4.0.2.
```
  278b14c2
- Merge paul@work.mysql.com:/home/bk/mysql-4.0 · bffcc6e3
  unknown authored Mar 22, 2002
```
into teton.kitebird.com:/home/paul/mysql-4.0
```
  bffcc6e3
- manual.texi Change note mods, 3.23.21 to 3.23.24. · 53cad25d
  unknown authored Mar 22, 2002
```
Docs/manual.texi:
  Change note mods, 3.23.21 to 3.23.24.
```
  53cad25d
- manual.texi Mods to data type sections. · 90bc20a6
  unknown authored Mar 22, 2002
```
Docs/manual.texi:
  Mods to data type sections.
```
  90bc20a6
22 Mar, 2002 3 commits

manual.texi Fix filename extensions that were written using · 3e0c9f93

unknown authored Mar 22, 2002

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.

3e0c9f93

manual.texi Change note mods, 3.23.10 to 3.23.20. · c36e023e
unknown authored Mar 22, 2002
```
Docs/manual.texi:
  Change note mods, 3.23.10 to 3.23.20.
```
c36e023e
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0 · 4dd4b1e8
unknown authored Mar 23, 2002
```
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0


sql/sql_table.cc:
  Auto merged
```
4dd4b1e8