Commit graph

6123 commits

Author SHA1 Message Date
unknown
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
unknown
27282ed325 - don't override CXX if it's already defined 2003-04-09 14:53:20 +02:00
unknown
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
unknown
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
unknown
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
unknown
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
unknown
02270252fe Documented undocumented replication options, now that the manual is up-to-date. 2003-04-04 17:43:54 +02:00
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
dba3a0b031 After merge fix
sql/log_event.cc:
  Fixed a wrong && test -> &
2003-04-03 21:19:11 +03:00
unknown
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
unknown
5b67416a0b add test file for rpl_loaddata.test 2003-04-03 14:19:09 -04:00
unknown
6376b0a8b8 Fixed a bug when printing error messages. stdout and stderr were
mixed wrongly sometimes.
2003-04-03 19:55:37 +03:00
unknown
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
unknown
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
unknown
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
unknown
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
unknown
f34b63ac49 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0
2003-04-03 10:30:41 -04:00
unknown
1834b6ff49 Updated results after merge 2003-04-03 13:21:39 +03:00
unknown
7bc65cd823 Merge narttu.mysql.fi:/my/mysql-3.23 into narttu.mysql.fi:/my/mysql-4.0
mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged
2003-04-03 13:08:28 +03:00
unknown
2090bc6e43 Fixed bug in memory allocation that could affect 64 bit systems (affected hammer)
mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix
2003-04-03 13:07:42 +03:00
unknown
f5feb33773 Merge with 3.23 to get fixes for:
mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23
2003-04-03 12:33:13 +03:00
unknown
68fc04c423 Portability fix (for AMD hammer)
sql/log.cc:
  Portability fix (for hammer)
2003-04-03 12:10:38 +03:00
unknown
e9635c95af Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
unknown
584b4caa66 Safer stack checking 2003-04-03 11:29:10 +03:00
unknown
3258bb7248 Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
unknown
241b6c058d Small-and-safe fix for bug #218: "LOAD DATA INFILE IGNORE is well
logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.


sql/log_event.cc:
  & instead of && when testing flags
sql/slave.cc:
  & instead of && when testing flags
2003-04-01 18:19:15 +02:00
unknown
7bf6bd51ff Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-31 11:28:41 -05:00
unknown
3294aac1bf Add new XDC file for NetWare pre-emption, drop old build scripts, libmysqld.def
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Delete: netware/nwbootstrap
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def
2003-03-31 11:28:20 -05:00
unknown
45802e08b1 - Fix for bug #200 (added missing @WRAPLIBS@ to LIBS in
libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)


libmysqld/examples/Makefile.am:
   - added missing @WRAPLIBS@ to LIBS
2003-03-31 14:50:29 +02:00
unknown
a424d01173 fixed bug 209 (SQL_SELECT_LIMIT and query cache incompatibility)
mysql-test/r/query_cache.result:
  test of SET OPTION SQL_SELECT_LIMIT
mysql-test/t/query_cache.test:
  test of SET OPTION SQL_SELECT_LIMIT
sql/sql_cache.cc:
  layout fixed
  SQL_SELECT_LIMIT stored in query cache now
sql/sql_parse.cc:
  room for SQL_SELECT_LAYOUT storing added
2003-03-31 09:49:09 +03:00
unknown
280a1e4ad3 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-03-30 17:16:39 +03:00
unknown
5380411728 truncating REPLACE result bug fix
mysql-test/r/func_str.result:
  test result for truncating REPLACE result
mysql-test/t/func_str.test:
  test with long arguments for REPLACE
sql/item_strfunc.cc:
  fix for counting REPLACE result length
2003-03-30 18:36:01 +05:00
unknown
c15f1acd82 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-03-28 15:36:42 +02:00
unknown
420686dd8e Improve make_binary_distribution from Novell code at Monty's request
netware/BUILD/create-patch:
  Change mode to -rwxrwxr-x
scripts/make_binary_distribution.sh:
  Split BIN_FILES into more generic parts, with no repetition
2003-03-27 18:13:37 -05:00
unknown
2de9dc132e Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-27 16:36:07 -05:00
unknown
e61bbc45ec Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-27 13:54:22 +02:00
unknown
2e6c3197a9 mysqld.cc:
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction


sql/mysqld.cc:
  Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
2003-03-27 12:17:27 +02:00
unknown
712ea880a8 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/mysql-4.0
2003-03-26 16:23:28 -05:00
unknown
f149c2776d fixed problem of port without host in SHOW PROCESSLIST (bug 189)
sql/sql_show.cc:
  fixed problem of port without host in SHOW PROCESSLIST
2003-03-26 22:04:20 +02:00
unknown
221dfec1a4 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
unknown
10b0edf399 Fix for glibc with small stack size (fixes bug when running crash-me)
sql-bench/limits/mysql.cfg:
  Update to new crash me
2003-03-26 14:11:17 +02:00
unknown
592a398f75 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2003-03-25 19:58:40 -04:00