Commit graph

1476 commits

Author SHA1 Message Date
unknown
546b6a679f Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-03-31 18:12:25 +03:00
unknown
d2da68d259 Fix core dump bug in innodb after merge from 3.23 2002-03-31 18:12:24 +03:00
unknown
72f1fc7e36 replication fix
sql/log_event.cc:
  do not complain if the expected error was on the ignore list but we did not
  get it
2002-03-30 13:42:01 -07:00
unknown
af75d3914d Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-03-30 12:38:23 -07:00
unknown
5449b03bc8 replication updates. This changeset seems to be working fine on test systems.
If no problems are discovered in the next week, this will make the replication
code ready for 4.0.2 release.


dbug/dbug.c:
  cleanup of my previous fix
sql/mysqld.cc:
  fixed a REALLY NASTY BUG - slave threads were being launched before 
  initialization of global thread keys. Thus if the slave thread was slow
  to start everything worked fine, but if it started quickly, we would get
  into trouble using the unitinialized keys
sql/net_pkg.cc:
  make net_printf() work with 0 error code taking the third argument as 
  format string in that case
sql/slave.cc:
  misc fix-ups and debugging instrumentations
sql/slave.h:
  added skip_log_purge member
sql/sql_class.cc:
  debugging instrumentation to track down random memory corruption
sql/sql_class.h:
  added debugging sentry to THD to track down memory corruption
sql/sql_repl.cc:
  fixed bugs in CHANGE MASTER
2002-03-30 12:36:05 -07:00
unknown
b344dbc2da Two bug fixes
Docs/manual.texi:
  Added text fof bug fixes
readline/Makefile.am:
  Bug fix for coredump of mysql program with some Ctrl+keys
sql/convert.cc:
  A bug fix for using SET CHAR... SET on columns > 64K
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2002-03-28 18:35:21 +02:00
unknown
c1291234c3 Bug fixes
Docs/manual.texi:
  I have to document my bug fixes ...
readline/Makefile.am:
  Fix for core dump in mysql monitor program when some Ctrl keys are
  pressed
sql/convert.cc:
  Fix of the bug with columns > 64 K when SET CHAR.. SET is used
2002-03-28 15:37:06 +02:00
unknown
ef261914d3 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-03-26 22:23:51 -07:00
unknown
079a551ca7 coverted my_thread_init() /end to use my_malloc()/my_free() to help track
down replication corruption


dbug/dbug.c:
  fixed DBUG_ macros to not crash if my_thread_init() had not been called
include/my_sys.h:
  keep track of shutdown, main, and signal threads for safemalloc
mysys/my_static.h:
  keep track of thread in safemalloc blocks
mysys/my_thr_init.c:
  use my_malloc()/my_free() in my_thread_init()
mysys/safemalloc.c:
  keep track of threads
  do not fuss if main,signal, or shutdown thread still has allocated blocks 
   when we call TERMINATE() as some blocks are freed later and there is no
   easy way to make TERMINATE() wait for those threads
sql/mysqld.cc:
  keep track of signal, main, and shutdown threads
2002-03-26 22:19:23 -07:00
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
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
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
3136a7aeea Fix compiler error on mysqld.cc
sql/mysqld.cc:
  Fix compiler error adding a missed )
2002-03-26 18:47:50 -03: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
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
739b4da888 Fixes for --enable-named-pipe
Docs/manual.texi:
  Added information about --enable-named-pipe
2002-03-25 18:10:36 +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
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
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
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
unknown
5b26594a97 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-03-22 13:28:13 +02:00
unknown
f34e7d709b Fixes for offset bug in UNION's and making UNION's obey
SELECT_DEFAULT_LIMIT


Docs/manual.texi:
  Monty  forced me  to do this
2002-03-22 13:26:13 +02:00
unknown
91443b080b Move back set_user after chroot
Docs/manual.texi:
  Updated SCO information
2002-03-22 07:23:01 +02:00
unknown
51076279af Merge
Docs/manual.texi:
  SCCS merged
2002-03-22 06:58:07 +02:00
unknown
a333c33f7e Fix for load data infile when no active database
Fix for Solaris and gethostbyname_r


Docs/manual.texi:
  Changelog
client/mysql.cc:
  Cleanup
configure.in:
  Fix for Solaris and gethostbyname_r
sql/log_event.h:
  Fix for load data infile when no active database
sql/sql_load.cc:
  Fix for load data infile when no active database
2002-03-22 01:03:34 +02:00
unknown
c0a5e47071 Quote names to SHOW CREATE for mysqldump
Fix thread-related bug when doing DROP TABLE
Fix bug in RENAME TABLE on windows


Docs/manual.texi:
  Changelog
client/mysqldump.c:
  Quote names to SHOW CREATE
mysql-test/t/range.test:
  Test case for range bug
sql/lock.cc:
  Fix thread-related bug when doing DROP TABLE
sql/sql_base.cc:
  Fix thread-related bug when doing DROP TABLE
sql/sql_rename.cc:
  Fix bug in RENAME TABLE on windows
2002-03-21 23:06:48 +02:00
unknown
6ecd34e6ab merged
sql/sql_yacc.yy:
  Auto merged
2002-03-21 18:18:53 +00:00
unknown
a1e774d277 ha_innodb.cc:
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
2002-03-21 19:52:13 +02:00
unknown
b7ee7877e7 commit to pull 2002-03-21 17:32:37 +00:00
unknown
b83d55d9c5 sql_show.cc, handler.h, handler.cc:
Add foreign key defs to SHOW CREATE TABLE


sql/handler.cc:
  Add foreign key defs to SHOW CREATE TABLE
sql/handler.h:
  Add foreign key defs to SHOW CREATE TABLE
sql/sql_show.cc:
  Add foreign key defs to SHOW CREATE TABLE
2002-03-21 18:05:46 +02:00
unknown
d3c0752b6a Many files:
Merge InnoDB-3.23.50


innobase/btr/btr0btr.c:
  Merge InnoDB-3.23.50
innobase/btr/btr0cur.c:
  Merge InnoDB-3.23.50
innobase/btr/btr0sea.c:
  Merge InnoDB-3.23.50
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.50
innobase/buf/buf0flu.c:
  Merge InnoDB-3.23.50
innobase/dict/dict0dict.c:
  Merge InnoDB-3.23.50
innobase/dict/dict0load.c:
  Merge InnoDB-3.23.50
innobase/fil/fil0fil.c:
  Merge InnoDB-3.23.50
innobase/fsp/fsp0fsp.c:
  Merge InnoDB-3.23.50
innobase/include/buf0flu.h:
  Merge InnoDB-3.23.50
innobase/include/dict0dict.h:
  Merge InnoDB-3.23.50
innobase/include/fil0fil.h:
  Merge InnoDB-3.23.50
innobase/include/fsp0fsp.h:
  Merge InnoDB-3.23.50
innobase/include/log0log.h:
  Merge InnoDB-3.23.50
innobase/include/log0recv.h:
  Merge InnoDB-3.23.50
innobase/include/mem0mem.h:
  Merge InnoDB-3.23.50
innobase/include/os0file.h:
  Merge InnoDB-3.23.50
innobase/include/row0mysql.h:
  Merge InnoDB-3.23.50
innobase/include/srv0srv.h:
  Merge InnoDB-3.23.50
innobase/include/srv0start.h:
  Merge InnoDB-3.23.50
innobase/include/trx0sys.h:
  Merge InnoDB-3.23.50
innobase/include/ut0byte.h:
  Merge InnoDB-3.23.50
innobase/include/ut0rnd.h:
  Merge InnoDB-3.23.50
innobase/include/ut0ut.h:
  Merge InnoDB-3.23.50
innobase/log/log0log.c:
  Merge InnoDB-3.23.50
innobase/log/log0recv.c:
  Merge InnoDB-3.23.50
innobase/mem/mem0mem.c:
  Merge InnoDB-3.23.50
innobase/os/os0file.c:
  Merge InnoDB-3.23.50
innobase/rem/rem0cmp.c:
  Merge InnoDB-3.23.50
innobase/row/row0ins.c:
  Merge InnoDB-3.23.50
innobase/row/row0mysql.c:
  Merge InnoDB-3.23.50
innobase/row/row0sel.c:
  Merge InnoDB-3.23.50
innobase/row/row0upd.c:
  Merge InnoDB-3.23.50
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.50
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.50
innobase/trx/trx0sys.c:
  Merge InnoDB-3.23.50
innobase/ut/ut0mem.c:
  Merge InnoDB-3.23.50
innobase/ut/ut0ut.c:
  Merge InnoDB-3.23.50
sql/ha_innobase.cc:
  Merge InnoDB-3.23.50
sql/ha_innobase.h:
  Merge InnoDB-3.23.50
2002-03-21 18:03:09 +02:00
unknown
7fc36355bc fix for the limit bug in UNION's and some additional syntax
checkings


mysql-test/r/union.result:
  fix for the limit bug in UNION's
mysql-test/t/union.test:
  fix for the limit bug in UNION's
sql/sql_union.cc:
  fix for the limit bug in UNION's
sql/sql_yacc.yy:
  Syntax checking for options that should appear in main select only.
2002-03-19 14:07:52 +02:00
unknown
e8cc84628b Merge sanja.is.com.ua:/home/bell/mysql/mysql-4
into sanja.is.com.ua:/home/bell/mysql/work.etalon


sql/sql_class.h:
  Auto merged
sql/table.h:
  Auto merged
2002-03-16 10:38:35 +02:00
unknown
5c6902a495 added some comments 2002-03-16 10:36:27 +02:00
unknown
9c435716a9 replication updates and bugfixes. Still not perfect - there is some strange
memory corruption I can only repeat on one system.


mysql-test/r/multi_update.result:
  extended test trying to find why the old one was failing
mysql-test/r/rpl000015.result:
  result update
mysql-test/t/multi_update.test:
  updated test to do more intermediate result checks
mysql-test/t/rpl000014.test:
  cosmetic change
mysql-test/t/rpl000015-slave-master-info.opt:
  reduce connect retry trying to simulate a bug
mysql-test/t/rpl000015.test:
  cosmetic change
sql/lex.h:
  added RELAY_LOG_FILE and RELAY_LOG_POS to CHANGE MASTER TO
sql/log.cc:
  fixed replication bug
sql/log_event.cc:
  properly ignore replication errors according to error mask
sql/mysqld.cc:
  handle SIGFPE in the coredump handler
sql/slave.cc:
  do not kick slave if it has already exited and freed the structures
sql/sql_lex.cc:
  fixed initialization bug in CHANGE MASTER TO
sql/sql_lex.h:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_repl.cc:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
sql/sql_yacc.yy:
  CHANGE MASTER TO .. RELAY_LOG_FILE=,RELAY_LOG_POS=
2002-03-15 18:44:44 -07:00
unknown
dad9a12b3d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4
into sanja.is.com.ua:/home/bell/mysql/work-qc


Docs/manual.texi:
  Auto merged
sql/handler.cc:
  Auto merged
sql/table.h:
  Auto merged
2002-03-15 23:59:51 +02:00
unknown
0510e98e11 processing trunsactional tables in query cache
mysql-test/r/innodb_cache.result:
  new test for query cache with transactions
mysql-test/t/innodb_cache.test:
  new test for query cache with transactions
sql/sql_cache.cc:
  processing trunsactional tables in query cache & removing strlen
sql/sql_class.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_class.h:
  processing trunsactional tables in query cache & added transaction-live memory
sql/sql_parse.cc:
  processing trunsactional tables in query cache & added transaction-live memory
sql/table.h:
  removing strlen operation from query cache
2002-03-15 23:57:31 +02:00
unknown
38e14c0371 Fixed problem with WHERE key=const ORDER BY key DESC
Docs/manual.texi:
  Changelog
myisam/ft_boolean_search.c:
  Portability fix
sql/ha_myisam.cc:
  Cleanup
sql/sql_union.cc:
  cleanup
2002-03-15 21:30:50 +02:00
unknown
b509821d51 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-03-15 18:15:42 +02:00
unknown
7070f6ef7a Do chroot() after changing user. 2002-03-15 18:15:41 +02:00
unknown
3b2e1fd276 Making full-text queries working with UNION's 2002-03-15 14:11:11 +02:00
unknown
226169b10b merged
sql/ha_myisam.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2002-03-13 17:27:45 +00:00
unknown
d556096f73 mi_check flags cleanup
CHECK/REPAIR syntax cleanup
REPAIR ... USE_FRM syntax


include/myisam.h:
  mi_check flags cleanup
myisam/mi_check.c:
  mi_check flags cleanup
myisam/myisamchk.c:
  mi_check flags cleanup
mysql-test/r/check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/r/show_check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/t/check.test:
  CHECK/REPAIR syntax cleanup
mysql-test/t/show_check.test:
  CHECK/REPAIR syntax cleanup
sql/ha_myisam.cc:
  mi_check flags cleanup
sql/handler.h:
  mi_check flags cleanup
sql/lex.h:
  REPAIR ... USE_FRM syntax
sql/slave.cc:
  mi_check flags cleanup
2002-03-13 17:20:17 +00:00
unknown
6288ebb699 merge
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
client/mysqlimport.c:
  Auto merged
sql/ha_isam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/table.cc:
  Auto merged
2002-03-12 12:21:51 +02:00