Commit graph

3351 commits

Author SHA1 Message Date
unknown
e92c075475 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


include/my_sys.h:
  Auto merged
2002-03-08 09:33:15 -07:00
unknown
4873f9ab2f DBUG_ASSERT_LOCK
include/my_sys.h:
  added DBUG_ASSERT_LOCK()
sql/slave.cc:
  use DBUG_ASSERT_LOCK()
2002-03-08 09:26:56 -07:00
unknown
d3ab09af71 Processed docs@ feedback about typos in manual. 2002-03-08 15:21:38 +10:00
unknown
95d01af6a8 norway.eps, norway.gif, turkey.eps, turkey.gif:
Update
mirrors.texi:
  Add new mirrors
manual.texi:
  Remove link to mxODBC


Docs/manual.texi:
  Remove link to mxODBC
Docs/mirrors.texi:
  Add new mirrors
Docs/Flags/turkey.gif:
  Update
Docs/Flags/turkey.eps:
  Update
Docs/Flags/norway.gif:
  Update
Docs/Flags/norway.eps:
  Update
2002-03-07 21:27:44 +02:00
unknown
81254025b8 tests for bug fix 2002-03-07 15:36:14 +02:00
unknown
18a68a6208 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_yacc.yy:
  Auto merged
2002-03-07 14:01:18 +02:00
unknown
0d50a93fb7 better fix for a bug fix from yesterday 2002-03-07 13:57:52 +02:00
unknown
defcaaf46b Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Docs/manual.texi:
  Auto merged
2002-03-07 00:23:22 +02:00
unknown
3d490dcb27 Update test results 2002-03-07 00:21:37 +02:00
unknown
47e83fde9a manual.texi Document when --xml was added to mysql/mysqldump.
Docs/manual.texi:
  Document when --xml was added to mysql/mysqldump.
2002-03-06 16:14:06 -06:00
unknown
a36d59bc57 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-06 16:08:30 -06:00
unknown
873963d4ca merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2002-03-06 23:41:18 +02:00
unknown
4d710469be merge
configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged
2002-03-06 22:16:29 +02:00
unknown
749246cc29 Portability fixes
Fix bug when using option groups


libmysql/libmysql.c:
  Fix bug when using option groups
myisam/myisamchk.c:
  Portability fix
mysys/my_getopt.c:
  Portability fix
2002-03-06 22:12:08 +02:00
unknown
c13baf70ec Fix for --enable-local-infile
Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client
2002-03-06 22:06:18 +02:00
unknown
b707a1ab6b merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged
2002-03-06 19:53:31 +02:00
unknown
d6998363af Fixed bug in DATE_FORMAT when used with GROUP BY
Build-tools/Do-compile:
  Fixed typo
Docs/manual.texi:
  Changelog
mysql-test/r/type_date.result:
  Added test of bug in DATE_FORMAT
mysql-test/t/type_date.test:
  Added test of bug in DATE_FORMAT
scripts/mysqlhotcopy.sh:
  Fix for RAID files
sql/table.cc:
  Fixed typo in last patch
2002-03-06 18:36:31 +02:00
unknown
e578a2e231 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-03-06 14:41:26 +02:00
unknown
0980b8744d iA fix for small bug that returns wrong index instead of enf of file 2002-03-06 14:39:16 +02:00
unknown
a5deff2bc9 Use portable comments in assembler files
Docs/manual.texi:
  Updated autoconf information
2002-03-05 19:19:00 +02:00
unknown
169ecafd31 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-03-05 08:49:12 -07:00
unknown
cc1ad5ea32 replication documentation update 2002-03-05 08:48:03 -07:00
unknown
39cdb786fd Corrected fix for not freed memory when using corrupted tables
Docs/manual.texi:
  Changelog
configure.in:
  Version change
sql/sql_base.cc:
  Correct fix for not freed memory when using corrupted tables
sql/table.cc:
  Correct fix for not freed memory when using corrupted tables
2002-03-05 17:38:16 +02:00
unknown
bceab09f00 Merge hundin:/my/mysql-3.23 into tik.mysql.fi:/home/my/mysql-3.23
configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
2002-03-05 15:49:34 +02:00
unknown
326d80ea64 Update scripts for new POSIX spec
Fix for --enable-local-infile
Portability fix for bison


bdb/dist/s_recover:
  Update for new POSIX spec
configure.in:
  Fix for --enable-local-infile
libmysql/libmysql.c:
  Cleanup
mysql-test/mysql-test-run.sh:
  Update for new POSIX spec
scripts/safe_mysqld.sh:
  Update for new POSIX spec
sql-bench/server-cfg.sh:
  Update for new POSIX spec
sql/sql_yacc.yy:
  Portability fix for bison
2002-03-05 15:46:30 +02:00
unknown
d2e442f5d2 Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-03-05 14:24:34 +02:00
unknown
a02a98c401 several bug fixes and tests
mysql-test/mysql-test-run.sh:
  Fix for LOAD DATA LOCAL ...
mysql-test/r/select_found.result:
  Added result for a new test of combo of options for FOUND_ROWS and
  BUFFER_RESULT
mysql-test/t/select_found.test:
  Added test for combo of options for BUFFER_RESULT and FOUND_ROWS
sql/sql_select.cc:
  Added fix for combo of options for BUFFER_RESULT and FOUND_ROWS
2002-03-05 14:22:32 +02:00
unknown
46283d59c1 Merge arjen@work.mysql.com:/home/bk/mysql-4.0
into co3064164-a.bitbike.com:/home/arjen/mysql-4.0


Docs/manual.texi:
  Auto merged
2002-03-05 15:16:53 +10:00
unknown
b34acfc4fb Fixup of some titles (length and caps). 2002-03-05 15:14:05 +10:00
unknown
04843417b8 Support for running different versions of mysqld with mysqld_multi 2002-03-04 23:16:43 +02:00
unknown
5f98914d75 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-04 09:58:18 -06:00
unknown
d737186f30 Additional minor patch for indexterms inside para handling
Docs/Support/docbook-fixup.pl:
  Altered regex to catch all indexterms - not just role='cp|fn'
2002-03-04 02:16:37 -07:00
unknown
ce2b249935 fixed the use of unitialized variable - code now works on the test system
of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)


sql/slave.cc:
  added DBUG_ASSERT()
sql/slave.h:
  fixed cache initialization problem
2002-03-02 22:00:37 -07:00
unknown
7e1edb01db load local fix
overrun sentry in my_vsnprintf() test
will not be pushed yet


BUILD/FINISH.sh:
  load local fix
BUILD/SETUP.sh:
  load local fix
BUILD/compile-pentium-debug-max:
  load local fix
configure.in:
  load local fix
mysys/my_vsnprintf.c:
  added overrun sentry to the test
2002-03-02 12:45:44 -07:00
unknown
df663f5072 merge
sql/sql_acl.cc:
  Auto merged
Docs/manual.texi:
  Merge
sql/sql_select.cc:
  Merge
2002-03-02 13:59:26 +02:00
unknown
ad4fcb8a01 Fix sorting of NULL values (Should always be first)
Fix problem with HAVING and MAX() IS NOT NULL


Docs/manual.texi:
  Changelog & NULL usage with ORDER BY
client/mysqldump.c:
  Cleanup disable keys
mysql-test/r/distinct.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/group_by.result:
  Fix results after ORDER BY with NULL fix
mysql-test/r/having.result:
  Testcase for bug with HAVING
mysql-test/t/distinct.test:
  Test for DISTINCT + ORDER BY DESC bug
mysql-test/t/having.test:
  Test of HAVING and MAX IS NOT NULL
sql/filesort.cc:
  Fix sorting of NULL values (Should always be first)
sql/item.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/item_sum.h:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.cc:
  Fix problem with HAVING and MAX() IS NOT NULL
sql/opt_range.h:
  Fix sorting of NULL values
sql/sql_select.cc:
  Fix sorting of ORDER BY ... DESC on NULL values.
2002-03-02 09:51:24 +02:00
unknown
3eb9c0be7d post-merge fixup
BitKeeper/etc/ignore:
  Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
  post-merge fix
mysys/my_vsnprintf.c:
  fixed newly introduced bug
2002-03-01 21:14:13 -07:00
unknown
2c9879ca0c merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing.
Let's hope this did not break anything. Will not push this one until Monty
gets back


BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
client/mysql.cc:
  merged from 3.23
configure.in:
  merged from 3.23
mysql-test/mysql-test-run.sh:
  merged from 3.23
sql/mysqld.cc:
  merged from 3.23
support-files/mysql.spec.sh:
  merged from 3.23
2002-03-01 19:36:46 -07:00
unknown
80d375b156 Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
2002-03-01 17:14:40 -07:00
unknown
3b38d3d57a make my_vsnprintf() work with oversized strings
fixed replication bug - flush_master_info() needs to be called every time we read an 
    event from master

this is will not be pushed yet


mysys/my_vsnprintf.c:
  make my_vsnprintf() work with oversized strings
  corrected Swedish "skipp" in the comments
sql/log.cc:
  wrong change - to be undone
sql/slave.cc:
  fixed bug - flush_master_info() needs to be called every time we read an 
  event from master
2002-03-01 17:12:15 -07:00
unknown
19d37eca52 Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


Docs/manual.texi:
  Auto merged
sql/sql_select.cc:
  Auto merged
2002-03-01 16:58:06 +00:00
unknown
43a1ef6ce2 fulltext+const_table bug fixed
mysql-test/r/fulltext.result:
  test added
mysql-test/t/fulltext.test:
  test added
sql/item_func.cc:
  fulltext+const_table problem fixed once and forever
sql/item_func.h:
  fulltext+const_table problem fixed once and forever
sql/sql_select.cc:
  fulltext+const_table problem fixed once and forever
sql/table.h:
  fulltext+const_table problem fixed once and forever
2002-03-01 16:57:08 +00:00
unknown
e4e8b31cfa Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-03-01 13:59:00 +02:00
unknown
c8d8213d02 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-02-28 16:21:09 -06:00
unknown
a7df512a8f many fixes
libmysql/libmysql.c:
  Fixes a very rare bug when variable name (without '_') and it's 
  value are at the very end of the config file.
  
  I have tested it , but would liek little mobster to test it further
mysql-test/r/union.result:
  results for union test that proves that EXPLAIN UNION bugs are fixed
mysql-test/t/union.test:
  additional tests for EXPLAIN on UNION's that have previously failed
sql/sql_yacc.yy:
  Some small fixes for newer parsers.
  Only unsigned int yystacksize remains to be fixed.
  This I leave to Monty.
  Present fixes are only aesthetic and do not harm.
2002-02-28 21:58:32 +02:00
unknown
75a268a65b mirrors.texi:
Update
costarica.txt, costarica.gif, costarica.eps:
  new file


Docs/mirrors.texi:
  Update
2002-02-28 18:24:42 +02:00
unknown
ca2186187d Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
2002-02-28 13:51:52 +02:00
unknown
bf0b0d3e50 Surgical changes in sql_select and sql_union code in order to
accomodate EXPLAIN properly for all possible variant of UNION's
derived tables etc ...

This also fixes all reported (and unreported) bugs when EXPLAIN is
run on UNION's.

select_describe() now has a very dirty hack to avoid some problems
with transactional tables on table unlocking.

Code speedup is possible. For the moment all that was important was
that all tests are passed.
2002-02-28 13:50:00 +02:00
unknown
d091c5e031 InnoDB stable notice (from 3.23.49). 2002-02-28 20:07:03 +10:00
unknown
78ea4ef1ed Final set of changes for the docbook patching scripts for the MySQL
reference manual for O'Reilly.


Docs/Support/docbook-split:
  Give the output directory a more sensible, and automatically generated, name.
Docs/Support/make-docbook:
  Patch shell script to include patching the colspec tags and splitting the manual into it's components.
2002-02-27 07:25:43 -07:00