1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-18 23:03:28 +03:00
Commit Graph

6099 Commits

Author SHA1 Message Date
480dbf0f30 buf0buf.c:
Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings


innobase/buf/buf0buf.c:
  Do not set buffer pool to zero when we start up: that takes too much time for big buffer pools; Purify users must define UNIV_SET_MEM_TO_ZERO in univ.i to eliminate spurious (?) Purify warnings
2003-04-19 20:09:01 +03:00
b09b7a1f19 ha_innodb.cc:
Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
  Initialize active_index to a sensible value: prevent crash if we restore it to the original value after an table scan


sql/ha_innodb.cc:
  Prevent crash if MySQL calls rnd_end WITOUT calling rnd_init first: only restore active_index if it the old value was pushed in rnd_init
2003-04-18 22:06:10 +03:00
4643820397 ha_innodb.h, ha_innodb.cc:
Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes


innobase/log/log0recv.c:
  Use fflush to make sure report of a corrupt log record is printed to .err log before mysqld crashes
sql/ha_innodb.cc:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
sql/ha_innodb.h:
  Make InnoDB to restore old active_index value after a table scan: MySQL may assume that a scan does NOT change active_index; this partially fixes bug 241 of UPDATE ... ORDER BY ... but it still remains that MySQL actually ignores the ORDER BY for both MyISAM and InnoDB tables
2003-04-18 18:42:43 +03:00
88ebdaaa0c row0sel.c:
Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor


innobase/row/row0sel.c:
  Do not allow InnoDB to cache result set in HANDLER because user can use PREV and NEXT and scroll the cursor
2003-04-17 02:51:50 +03:00
01545bd472 ha_innodb.cc, row0sel.c, row0mysql.c, row0mysql.h:
Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key


innobase/include/row0mysql.h:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0mysql.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
innobase/row/row0sel.c:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
sql/ha_innodb.cc:
  Allow HANDLER PREV and NEXT also after positioning the cursor with a unique search on the primary key
2003-04-17 02:28:40 +03:00
7214d07baf row0ins.c:
Better fix for the ON DELETE SET NULL problem


innobase/row/row0ins.c:
  Better fix for the ON DELETE SET NULL problem
2003-04-16 23:05:22 +03:00
31d0d6e5bd row0ins.c:
Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations


innobase/row/row0ins.c:
  Fix bug: we did not allow ON DELETE SET NULL to modify the same table where the delete was made; we can allow it because that cannot produce infinite loops cascaded operations
2003-04-16 22:50:12 +03:00
6e13c4e255 row0sel.c:
Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next


innobase/row/row0sel.c:
  Fix crash in HANDLER PREV or NEXT if the cursor was positioned using a unique search condition on the primary key: in that case InnoDB does NOT store the cursor position for later fetch prev or next
2003-04-16 21:36:42 +03:00
fecbc44eb6 Fix for #126
sql/ha_myisam.cc:
  Flag added to turn on check sum recounting
2003-04-16 21:37:22 +05:00
a5101be1e8 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.mysql.r18.ru:/home/hf/work/mysql-4.0.erf
2003-04-16 20:43:05 +05:00
2eaaae7abb Exported functions required by MySQLCC
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Delete: VC++Files/libmysql/libmysql.def
2003-04-16 11:43:04 -04:00
0d898379a7 fix for bug #212
sql/sql_list.h:
  We should reset list::last here
2003-04-16 19:48:58 +05:00
33ac47279b Many files:
Merge InnoDB-4.0.13; DROP FOREIGN KEY now works


innobase/buf/buf0flu.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0crea.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0dict.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/dict/dict0load.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/db0err.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/dict0dict.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/include/row0ins.h:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/lock/lock0lock.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/os/os0file.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0ins.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0mysql.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0sel.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/row/row0upd.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/srv/srv0srv.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
innobase/ut/ut0ut.c:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
sql/ha_innodb.cc:
  Merge InnoDB-4.0.13; DROP FOREIGN KEY now works
2003-04-16 16:45:01 +03:00
07c29cc91a Memory leak fixed. 2003-04-16 17:47:36 +05:00
797d9de9cd Fix bug (273):The x509 cert issuer seems not to be checked against the CA 2003-04-16 17:25:05 +05:00
3cb207ec4b Fix bug: Crash server when grant ssl options are used and ssl handshake is not set 2003-04-16 15:05:47 +05:00
35459cb7f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-04-15 22:10:49 +03:00
3ac05ea481 Fixed bug in SUM() with NULL:s
Added logging of warnings for failed connections with ssl.
Fixed bug in symbolic link handling on Windows


include/my_global.h:
  Added replication flags from 4.1
mysql-test/r/func_group.result:
  Added test for SUM(NULL)
mysql-test/t/func_group.test:
  Added test for SUM(NULL)
sql/item_sum.cc:
  Fixed bug in SUM() with NULL:s
sql/item_sum.h:
  Fixed bug in SUM() with NULL:s
sql/mysqld.cc:
  Added option --symbolic-links
  Fixed bug in symbolic link handling on Windows
sql/net_serv.cc:
  Code cleanup
sql/sql_acl.cc:
  Added logging of warnings for failed connections with ssl.
sql/sql_show.cc:
  Changed to use HAVE_REPLICATION instead of EMBEDDED_LIBRARY
2003-04-15 22:04:16 +03:00
592c30bdef - Updated variable names that have been renamed in my.cnf example files
(bug #223)
 - Added more detailed info about how to set up replication


support-files/my-huge.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-large.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-medium.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added more detailed info about how to set up replication (suggestion
     made by Guilhem)
support-files/my-small.cnf.sh:
   - updated variable names that have been renamed in 4.0 (bug #223)
   - added hint and commented out sample about skip-networking option
     (security enhancement)
2003-04-15 17:34:56 +02:00
bf09c10a6e - added missing dashes to parameter "open-files-limit" in mysqld_safe
(bug #264)
2003-04-15 16:11:37 +02:00
ffb7fb400e Distribution cleanups:
- added Dummy file Docs/manual_toc.html to make "make dist" happy if the
   real manual.texi has not been copied into Docs/ (which would make sure
   a "real" manual_toc.html would be created
 - fixed symlinking in the bdb subdirectory (docs are not included anyway)
 - added dist-hook to Makefile.am to remove superfluous SCCS directories
   from the source distribution


Makefile.am:
   - added dist-hook to remove superfluous SCCS directories from the source
     distribution
bdb/dist/s_symlink:
   - don't try to create symlinks to nonexisting doc files
2003-04-11 17:07:58 +02:00
a96a8137c6 - corrected shutdown priority on Red Hat (should be shut down very early)
- adjusted LSB run levels to be identical as on Red Hat (2-5)
2003-04-11 13:02:16 +02:00
8b8d313504 - Fixed bug in "make DESTDIR=<dir> install" - the InnoDB static
libraries always ended up in "dir..", even though they were not supposed
   to be installed anyway (they are only required at link time). Fixed it by
   replacing libs_LIBRARIES with noinst_LIBRARIES for all InnoDB Makefile.am 
   files and by removing "libsdir = " from innobase/include/Makefile.i .


innobase/btr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/buf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/com/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/data/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dict/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/dyn/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/eval/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fil/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fsp/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/fut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ha/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ibuf/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/include/Makefile.i:
   - removed libsdir = ../libs to fix a bug in "make DESTDIR=<dir> install"
     (the libs always got installed in "dir../")
innobase/lock/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/log/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mach/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/mtr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/odbc/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/os/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/page/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/pars/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/que/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/read/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/rem/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/row/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/srv/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/sync/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/thr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/trx/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/usr/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
innobase/ut/Makefile.am:
   - replaced libs_LIBRARIES with noinst_LIBRARIES (they are not supposed to
     be installed anyway)
2003-04-10 20:03:52 +02:00
d1048a22bb - worked around bug #235 (my-huge.cnf error) by reformatting the comments
in the sample configuration files
 - reworked the replication options and comments a bit
 - added option "skip-networking" (commented out by default) to the
   sample configuration files (enhancement request from bug report #234)


support-files/my-huge.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-large.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
support-files/my-medium.cnf.sh:
   - work around bug #235 (comments at the end of configuration options lead
     to errors) by reformatting the comments to be above the options instead
   - enhanced comments on the replication options a bit
   - added option "skip-networking" (commented out by default) with an
     appropriate comment (bug #234)
2003-04-09 22:14:21 +02:00
0606f5bb1b - applied patch from provided by Christian Hammers from Debian to be able
to run the script even if mysqld is not up and running on upgrade


scripts/mysql_fix_privilege_tables.sh:
   - applied Patch provided by Christian Hammers from Debian to be able to run
     this script on every upgrade without having to worry that the server
     is really running. Therefore "mysqld --bootstrap" is used to make the
     changes. For this to work all SQL statements are sent to stderr when
     "--sqlonly" is given and the echo's are piped to /dev/null.
     The echo_stderr that is used is just a "#!/bin/sh\necho "$*" >&2"
     script.
2003-04-09 21:19:53 +02:00
1bdf085159 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-04-09 20:59:49 +02:00
8cad4f7090 fix for #254
(3.23 master, 4.0 slave. 
Slave loss temp tables everytime FLUSH LOGS on master). 
This fix is less bad than the bug, it will cause a problem only maybe
if the master dies the hard way (I say maybe because I could not
cause a problem, and I don't see how it could happen).


sql/log_event.cc:
  fix for #254
  (3.23 master, 4.0 slave. 
  Slave loss temp tables everytime FLUSH LOGS on master). 
  This fix is less bad than the bug, it will cause a problem only maybe
  if the master dies the hard way. (I say maybe because I could not
  cause a problem, and I don't see how it could happen).
2003-04-09 15:16:12 +02:00
27282ed325 - don't override CXX if it's already defined 2003-04-09 14:53:20 +02:00
da0844b15f #244 bugfix (thread stack error message in embedded library)
sql/mysql_priv.h:
  stack checking suppressed in EMBEDDED case
sql/sql_parse.cc:
  code of check_stack_overrun ifdefed
2003-04-08 10:35:13 +05:00
909596e030 - don't add separate debug symbol file to the binary distribution,
if it's built with debugging enabled or not stripped (save disk
   space)
2003-04-07 19:05:00 +02:00
bfdaffb892 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.0
2003-04-06 12:26:04 +03:00
b2f51db6ac Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-04-05 09:06:45 +03:00
02270252fe Documented undocumented replication options, now that the manual is up-to-date. 2003-04-04 17:43:54 +02:00
a65aa6bce3 log.cc:
Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified


sql/log.cc:
  Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified
2003-04-04 10:14:06 +03:00
a31ff43462 crash-me.sh:
add sorted_group_by parameter


sql-bench/crash-me.sh:
  add sorted_group_by parameter
2003-04-04 02:54:07 +06:00
a3e8727c62 Merge akishkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/walrus/bk/40
2003-04-04 00:19:17 +06:00
3db98abc49 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-04-03 20:19:15 +02:00
e7b3accb48 More honest --master-ssl* options description. As these do nothing
yet, better say it and see no traffic on bugs@ and support@.
2003-04-03 20:19:14 +02:00
601780aec5 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0


sql/log.cc:
  Auto merged
2003-04-03 21:19:14 +03:00
e8c9045eeb Explicit message to warn that logging (e.g. binary) is permanently turned off
because of writing problems (such message would have been useful during a recent
support task).
2003-04-03 20:19:13 +02:00
ecd9e71291 log.cc:
Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled


sql/log.cc:
  Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled
2003-04-03 21:19:13 +03:00
36140349a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into hynda.(none):/home/my/bk/mysql-4.0
2003-04-03 21:19:12 +03:00
dba3a0b031 After merge fix
sql/log_event.cc:
  Fixed a wrong && test -> &
2003-04-03 21:19:11 +03:00
41ce5aaa50 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 21:19:10 +03:00
5b67416a0b add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
6376b0a8b8 Fixed a bug when printing error messages. stdout and stderr were
mixed wrongly sometimes.
2003-04-03 19:55:37 +03:00
5f5b6a7cea Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-04-03 19:55:37 +03:00
9c1c76bf2e Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 12:55:36 -04:00
4a1542d056 added test for replication load data into temporary table with additional options
sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)
2003-04-03 12:54:08 -04:00
aa588247c6 test-transactions.sh:
correct misprint in the test_update


sql-bench/test-transactions.sh:
  correct misprint in the test_update
2003-04-03 21:51:14 +06:00