Commit graph

2893 commits

Author SHA1 Message Date
unknown
b5cfb7ac01 merge with 3.23.47
Docs/manual.texi:
  Auto merged
Build-tools/Do-compile:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
myisam/mi_locking.c:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysys/my_init.c:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/ha_innobase.h:
  Auto merged
sql/handler.h:
  Auto merged
configure.in:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join_outer.result:
  merge
mysql-test/r/myisam.result:
  merge
mysql-test/t/innodb.test:
  merge
mysys/mf_iocache2.c:
  Skip changes in 3.23
sql/sql_select.cc:
  merge
2001-12-06 01:16:28 +02:00
unknown
ff8c734864 Update of query cache code
Docs/manual.texi:
  Added information about RESET
sql/mysql_priv.h:
  Fixed wrong type
sql/sql_base.cc:
  Removed wrong info in DBUG output
sql/sql_class.cc:
  cleanup
sql/sql_parse.cc:
  Fixed wrong type
2001-12-06 01:05:30 +02:00
unknown
6f8f45e959 Small changes to mysql_config.sh
Docs/manual.texi:
  Changelog
scripts/mysql_config.sh:
  Fix script to search in different directories for include and lib
2001-12-05 23:56:56 +02:00
unknown
2a74eb824f Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql 2001-12-05 23:26:14 +02:00
unknown
e560311b9c Upgrade version number 2001-12-05 23:25:48 +02:00
unknown
e8d81970be Fixed bug in LEFT JOIN
Docs/manual.texi:
  ChangeLog
myisam/mi_locking.c:
  Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
  Release character sets at end
scripts/mysqlhotcopy.sh:
  RAID tables are now copied
2001-12-05 23:15:05 +02:00
unknown
84788e278f merge
Docs/manual.texi:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/ft_dump.c:
  Merge
2001-12-05 13:08:00 +02:00
unknown
eca2a1a3dc Update of query cache code.
Changed some sql_alloc() -> thd->alloc()
Removed a lot of compiler warnings on Linux Alpha (64 bit)
Fixed some core dumps on 64 bit systems (wrong type for packet_len)


Docs/manual.texi:
  Added base information about the query cache.
include/hash.h:
  Export hash_replace
include/myisam.h:
  Update of query cache code
libmysql/net.c:
  Add casts to make things safe on 64 bit systems.
myisam/mi_write.c:
  Update of query cache code
myisammrg/myrg_extra.c:
  Update of query cache code
mysys/hash.c:
  Added safety check to hash_replace
sql/field.cc:
  Removed compiler warnings.
sql/field.h:
  Removed compiler warnings
sql/ha_myisam.cc:
  Fixed wrong type of packet_len
sql/item.h:
  Remove warnings
sql/log_event.cc:
  Cleanup
sql/log_event.h:
  Cleanup to make code more readable
sql/mf_iocache.cc:
  Fixed wrong type
sql/mysql_priv.h:
  Update of query cache code
sql/mysqld.cc:
  Update of query cache code
sql/net_serv.cc:
  Remove compiler warnings
sql/opt_range.h:
  Remove compiler warnings
sql/sql_cache.cc:
  Update of query cache code
sql/sql_cache.h:
  Update of query cache code
sql/sql_class.h:
  Cleanup
sql/sql_insert.cc:
  Use thd->alloc() instead of sql_alloc()
sql/sql_parse.cc:
  Fixed compiler warnings.
  Changed some sql_alloc() -> thd->alloc()
sql/sql_select.cc:
  Changed sql_alloc() -> thd_alloc()
sql/sql_select.h:
  Faster alloc()
sql/sql_show.cc:
  Update of query cache code
sql/sql_table.cc:
  Faster alloc()
sql/table.cc:
  Faster alloc()
2001-12-05 13:03:00 +02:00
unknown
7aab8d6d2a Updated Sinisa's contribution items. 2001-12-05 12:15:40 +10:00
unknown
0831ce1c61 myisam_bulk_insert_tree_size clarification 2001-12-04 16:52:28 +01:00
unknown
bc26e18dc5 buf0buf.ic, mtr0log.ic:
Add diagnostic code to catch possible space id or page no errors in the log


innobase/include/mtr0log.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
innobase/include/buf0buf.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
2001-12-04 17:03:24 +02:00
unknown
d12413f6f6 log0recv.c:
Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there


innobase/log/log0recv.c:
  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there
2001-12-04 16:01:30 +02:00
unknown
1d55c88e08 ft_boolean_search.c bugfix "+(aaa bbb) +ccc"
ft_dump.c	-l option - report word length distribution (for ft_max_word_len_for_sort)


myisam/ft_boolean_search.c:
  bugfix "+(aaa bbb) +ccc"
myisam/ft_dump.c:
  -l option - report word length distribution (for ft_max_word_len_for_sort)
2001-12-04 14:24:47 +01:00
unknown
eb4c0fe780 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2001-12-03 23:31:59 +01:00
unknown
bc8cb978d9 tags: target added for Sasha
BitKeeper/deleted/.del-build-tags~7afb7e785b80f97:
  Delete: build-tags
2001-12-03 23:30:44 +01:00
unknown
7c999bb032 Query cache.
Remove some warnings


Docs/manual.texi:
  Solaris and gcc
include/ft_global.h:
  Remove warnings
include/myisam.h:
  Query cache
include/myisammrg.h:
  Query cache
include/mysql_com.h:
  Query cache
libmysqld/lib_sql.cc:
  Query cache
myisam/ft_boolean_search.c:
  Remove warnings
myisam/ft_dump.c:
  Remove warnings
myisam/ft_parser.c:
  Remove warnings
myisam/ft_static.c:
  Remove warnings
myisam/ft_update.c:
  Remove warnings
myisam/ftdefs.h:
  Remove warnings
myisam/mi_delete.c:
  Query cache
myisam/mi_locking.c:
  Query cache
myisam/mi_update.c:
  Query cache
myisam/myisamdef.h:
  Optimize for Ia64
myisammrg/myrg_extra.c:
  Query cache
mysys/mf_keycache.c:
  DBUG statements
regex/cclass.h:
  Remove warnings
regex/cname.h:
  Remove warnings
regex/main.c:
  Remove warnings
regex/regcomp.c:
  Remove warnings
regex/regcomp.ih:
  Remove warnings
regex/regerror.c:
  Remove warnings
regex/reginit.c:
  Remove warnings
regex/split.c:
  Remove warnings
sql-bench/test-connect.sh:
  Make tests query-cache safe.
sql-bench/test-transactions.sh:
  Fix for old perl versions
sql/convert.cc:
  Query cache
sql/ha_myisammrg.cc:
  Query cache
sql/ha_myisammrg.h:
  Query cache
sql/handler.cc:
  Query cache
sql/item_create.cc:
  Query cache
sql/item_func.cc:
  Remove warnings
sql/item_func.h:
  Remove warnings
sql/lex.h:
  Query cache
sql/mysql_priv.h:
  Query cache
sql/mysqld.cc:
  Query cache
sql/net_serv.cc:
  Query cache
sql/sql_cache.cc:
  Query cache
sql/sql_class.cc:
  Query cache
sql/sql_class.h:
  Query cache
sql/sql_db.cc:
  Query cache
sql/sql_delete.cc:
  Query cache
sql/sql_insert.cc:
  Query cache
sql/sql_parse.cc:
  Query cache
sql/sql_select.cc:
  Query cache
sql/sql_table.cc:
  Query cache
sql/sql_update.cc:
  Query cache
sql/sql_yacc.yy:
  Query cache
2001-12-02 14:34:01 +02:00
unknown
89b0b23464 get correct paths in mysql_config even if the user moves basedir
scripts/mysql_config.sh:
  get correct paths even if the user moves basedir
2001-12-01 19:37:30 -07:00
unknown
d06b344ab5 use $MASTER_PORT 2001-12-01 15:00:32 -07:00
unknown
9dae47bbae added build-tags
added test case that supposedly will crash mysqld built with 2.96
2001-11-30 22:09:44 -07:00
unknown
cf87803b09 manual.texi mysql_store_results() -> mysql_store_result()
Docs/manual.texi:
  mysql_store_results() -> mysql_store_result()
2001-11-30 10:50:14 -06:00
unknown
95e94560ea Update test results
mysql-test/r/fulltext.result:
  Update results
2001-11-29 22:27:58 +02:00
unknown
38e439d819 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2001-11-29 22:05:53 +02:00
unknown
c2689648cf Fix not critical MyISAM bug in locking.
Free character sets properly (for embedded).
Add missing mutex in HANDLER CLOSE


Build-tools/Do-compile:
  Update for gcc 3.0
Docs/manual.texi:
  Update for gcc 3.0
myisam/mi_locking.c:
  Fix not critical bug in locking
myisam/myisamdef.h:
  Fix not critical bug in locking
mysys/my_init.c:
  Free character sets properly
mysys/my_seek.c:
  Remove warning
sql-bench/server-cfg.sh:
  Fix benchmarks to run with MySQL
sql/sql_handler.cc:
  Add missing mutex
sql/sql_update.cc:
  Clean up procinfo
2001-11-29 21:46:51 +02:00
unknown
ace649189d Better optimization for InnoDB and BDB tables for ORDER BY
Build-tools/Do-compile:
  Merge with 4.0
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  New tests cases for ORDER BY
mysql-test/r/myisam.result:
  New tests cases for ORDER BY
mysql-test/t/innodb.test:
  New tests cases for ORDER BY
mysql-test/t/myisam.test:
  New tests cases for ORDER BY
2001-11-29 15:34:37 +02:00
unknown
c90f67fb06 Extended manual section about MySQL states
Docs/manual.texi:
  Extended section about MySQL states.
client/get_password.c:
  Use stderr instead of stdout when asking for password
tests/mail_to_db.pl:
  Small cleanup
tools/mysqlmanager.c:
  Removed warning
2001-11-28 22:47:58 +02:00
unknown
273177d83d Merge jcole@work.mysql.com:/home/bk/mysql-4.0
into sarvik.tfr.cafe.ee:/usr/home/jcole/bk/mysql-4.0
2001-11-28 22:17:16 +02:00
unknown
f923000ac0 docbook-fixup.pl:
Fixed small bug


Docs/Support/docbook-fixup.pl:
  Fixed small bug
2001-11-28 22:16:26 +02:00
unknown
ef5efcf05e docbook-fixup.pl:
Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.


Docs/Support/docbook-fixup.pl:
  Fixed some issues for O'Reilly.
  * Remove "mailto:" from @email{} references in XML output. Good for normal XML of course, but bad when printing.
  * Removing (Cross)References for sections that have been excluded from printed manual.
  * In several titles, spaces are missing. You see a title like: <title>Speed of <command>INSERT</command>Queries</title>.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2001-11-28 22:11:14 +02:00
unknown
d987ee7651 Merge
sql/sql_select.cc:
  Auto merged
Docs/manual.texi:
  SCCS merged
2001-11-28 18:01:50 +01:00
unknown
f3918c8413 boolean fulltext search without an index
myisam/ft_dump.c:
  some help added
2001-11-28 17:55:45 +01:00
unknown
a7f23db340 Merge tfr@work.mysql.com:/home/bk/mysql-4.0
into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0
2001-11-28 17:18:52 +02:00
unknown
9c95ba4232 mirrors.texi:
Added a mirror in Spain


Docs/mirrors.texi:
  Added a mirror in Spain
2001-11-28 17:18:14 +02:00
unknown
caa13ea3e7 Fix of testcases after merge.
Small improvement to write caching.


Docs/manual.texi:
  Updated Changelog
mysql-test/r/rpl000013.result:
  Fix after merge
mysql-test/r/rpl000016.result:
  Fix after merge
mysys/mf_iocache2.c:
  Small improvement to write caching.
sql/sql_select.cc:
  Removed warning
2001-11-28 16:11:05 +02:00
unknown
00d80ffff1 Added read log caching and fixed a possible bug in write cacheing.
This should cause fewer seeks when using replication.


Docs/manual.texi:
  Changelog
2001-11-28 15:18:29 +02:00
unknown
b631ea0188 merge
Docs/manual.texi:
  Auto merged
mysql-test/t/rpl000013.test:
  Auto merged
mysql-test/t/rpl000016.test:
  Auto merged
extra/resolveip.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2001-11-28 14:52:11 +02:00
unknown
38da1f9853 Fix for IO_CACHE.
Portability fixes.


BUILD/compile-alpha-debug:
  Update to newer version
libmysqld/lib_vio.c:
  dbug_assert -> DBUG_ASSERT
mysql-test/r/symlink.result:
  Update for new tests
mysql-test/t/symlink.test:
  Update for new test format
mysys/mf_iocache2.c:
  Fixed bug when reading in old buffer
sql-bench/test-transactions.sh:
  Update with delete tests
sql/mysqld.cc:
  Updates for amiga
sql/sql_string.cc:
  Fix typo
sql/stacktrace.c:
  Portability fix
2001-11-28 03:47:15 +02:00
unknown
8c335b8a21 Merge work:/home/bk/mysql into mysql.sashanet.com:/reiser-data/mysql 2001-11-27 18:21:39 -07:00
unknown
08fc358542 fixed alias drop bug in binlog
fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.


mysql-test/r/rpl000016.result:
  updated test result
mysql-test/t/rpl000013.test:
  test alias bug
mysql-test/t/rpl000016.test:
  test for proper skip when the user messes up
sql/slave.cc:
  proper skip even when the user goofs up
sql/sql_base.cc:
  drop real name, not last used alias in the log
2001-11-27 18:20:24 -07:00
unknown
da9b7e0c87 Merge hundin:/my/mysql-4.0 into bitch.mysql.fi:/my/mysql-4.0 2001-11-28 02:59:54 +02:00
unknown
06e1e27557 New improved IO_CACHE
include/my_global.h:
  Remove dbug_assert()  (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
  Fixed that xterm works on Solaris 2.8.
  Fixed printing of errors
mysql-test/r/isam.result:
  Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
  Removed MyISAM test from ISAM test
mysys/my_alloc.c:
  Removed warnings
mysys/my_bitmap.c:
  Use DBUG_ASSERT
mysys/my_pthread.c:
  Use DBUG_ASSERT
mysys/my_seek.c:
  More DBUG
sql/ha_berkeley.cc:
  Use DBUG_ASSERT
sql/ha_innobase.cc:
  Use DBUG_ASSERT
sql/log.cc:
  Use DBUG_ASSERT
sql/opt_range.cc:
  Use DBUG_ASSERT
sql/sql_base.cc:
  Use DBUG_ASSERT
sql/sql_handler.cc:
  Use DBUG_ASSERT
sql/sql_load.cc:
  Cleanup
sql/sql_parse.cc:
  Use DBUG_ASSERT
sql/sql_repl.cc:
  Cleanup
sql/sql_select.cc:
  Use DBUG_ASSERT
tools/mysqlmanager.c:
  Cleanup
2001-11-28 02:55:52 +02:00
unknown
aaed141aa6 Small safety fix
Docs/manual.texi:
  Cleanup
extra/resolveip.c:
  Portability fix
man/safe_mysqld.1:
  Cleanup
mysys/mf_iocache2.c:
  Safety fix
scripts/make_binary_distribution.sh:
  Add mysqlbinlog
2001-11-28 02:24:22 +02:00
unknown
332570e879 mirrors.texi:
Added a mirror in Netherlands


Docs/mirrors.texi:
  Added a mirror in Netherlands
2001-11-27 19:05:42 +02:00
unknown
506ef5780a mirrors.texi:
Fix Australian mirror URL


Docs/mirrors.texi:
  Fix Australian mirror URL
2001-11-27 18:08:06 +02:00
unknown
312e5e82c0 Fixed bug when joining with caching.
Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.


Docs/manual.texi:
  Changelog
mysql-test/r/null_key.result:
  Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
  Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
  Fixed bug when joining with caching
2001-11-27 02:50:20 +02:00
unknown
9ed7fff20a Merge work.mysql.com:/home/bk/mysql-4.0
into volk.internalnet:/home/tonu/mysql-4.0
2001-11-27 02:33:46 +02:00
unknown
d34100d0e0 Changed incomplete testcase to another incomplete testcase which works even if localhost.localdomain is first in /etc/hosts file for 127.0.0.1 2001-11-27 02:33:15 +02:00
unknown
3731f6bfd8 Debugging added where needed.
sql/sql_acl.cc:
  Debugging added where needed
sql/sql_string.cc:
  Debugging added where needed
2001-11-27 02:21:44 +02:00
unknown
24285bd4b8 Updated manual about some processlist states.
Docs/manual.texi:
  Added information about some states in mysqladmin processlist into
  the manual.
2001-11-27 01:57:51 +02:00
unknown
37779e8bd5 Added quoting to XML in mysqldump.
client/mysqldump.c:
  Added quoting to XML option. <, >, & and " covered.
2001-11-26 19:14:26 +02:00
unknown
01f7289dba func_encrypt.result Drop table here too....
mysql-test/r/func_encrypt.result:
  Drop table here too....
2001-11-26 17:13:06 +02:00