Commit graph

17777 commits

Author SHA1 Message Date
unknown
92db4a838f Fix reconnect when using prepared statements, and add
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)


client/mysqltest.c:
  Add support for --disable_reconnect and --enable_reconnect
mysql-test/r/kill.result:
  Update results
mysql-test/t/kill.test:
  Fix test to actually verify that killing a connection is working,
  and that automatic reconnect is working as desired.
sql-common/client.c:
  Clean up MYSQL->stmts on reconnect by invalidating statements
  not in the MYSQL_STMT_INIT_DONE state, and reconnecting others
  to the new MYSQL object.
2005-03-28 09:59:41 -08:00
unknown
3785d2188f Merge mysql.com:/home/jimw/my/mysql-4.1-9323
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
unknown
ad869ebda4 Merge mysql.com:/home/jimw/my/mysql-4.1-8499
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:30 -08:00
unknown
e4c529d9b5 mysql_client_test.c:
Don't run GBK test if not GBK support was compiled.


tests/mysql_client_test.c:
  Don't run GBK test if not GBK support was compiled.
2005-03-25 17:30:51 +04:00
unknown
90aa6e00a7 Allow inserting of extra HKSCS and cp950 characters into a Big5 column. 2005-03-25 16:08:54 +04:00
unknown
cdf8e293d9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-24 20:17:08 +01:00
unknown
ed124ab6b7 myisamchk.c:
Wrong help string fix.


myisam/myisamchk.c:
  Wrong help string fix.
2005-03-24 18:21:56 +04:00
unknown
73c6430a01 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1
2005-03-24 18:11:35 +04:00
unknown
9b2e4c7c60 Fixed that LEFT OUTER JOIN was replaced with a regulat join
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
unknown
fe5793342c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/bug9303
2005-03-24 14:26:39 +01:00
unknown
e7db877956 BUG#9303 blob field with specified length < 256 does not create tinyblob
mysql-test/r/type_blob.result:
  Test creates a blob(250 whcih is now displayed as tinyblob when SHOW COLUMNS is called.
sql/sql_parse.cc:
  Added missing else so that FIELD_TINY_BLOB can be selected
2005-03-24 13:48:38 +01:00
unknown
8287938b79 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/mysqld.cc:
  Auto merged
2005-03-24 12:21:55 +01:00
unknown
2621e38bf9 Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-03-23 19:50:42 +01:00
unknown
6bc324ed21 "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication":
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared


libmysql/Makefile.shared:
  When we "make clean" in libmysql/ we remove the symlinks there, so we
  need to mark that they have to be recreated later: this is done by removing
  ../linked_libmysql_sources. If we don't do this, 'make' will fail after 'cd libmysql;make clean'.
  This Makefile.shared is used by libmysql_r too.
  No reason to remove linked_client_sources as we don't remove the links in client/.
mysql-test/r/rpl_deadlock.result:
  result fix
mysql-test/t/rpl_deadlock.test:
  small test addition
sql/mysqld.cc:
  if active_mi could not be alloced, die. New SHOW STATUS LIKE "slave_retried_transactions".
sql/slave.cc:
  If slave retries automatically a transaction, no message on error log
  (too common situation); sleep 0 secs at first retry, then 1, 2, 3, 4,
  5, 5, 5... Sleeping 0 is to get the least possible late, as deadlocks
  are usually resolved at first try. New global counter rli->retried_trans
  (for SHOW STATUS: total number of times the slave had to retry
  any transaction). safe_sleep() is thread-safe, sleep() was not.
  I change the rli->trans_retries counter to go from 0 to max instead
  of the other way (better for new sleep()).
sql/slave.h:
  new global counter rli->retried_trans
sql/sql_show.cc:
  SHOW STATUS LIKE "slave_retried_transactions"; needs replication mutexes.
  Can't be a simple SHOW_LONG, because active_mi is unset (not alloced yet)
  when the static global status_vars is created (active_mi is set
  in init_slave()).
sql/structs.h:
  new SHOW_SLAVE_RETRIED_TRANS
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-23 19:19:36 +01:00
unknown
d2ab1393ff README:
Fix typo.


mysql-test/README:
  Fix typo.
2005-03-23 10:45:57 -06:00
unknown
3315fab91e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-23 09:41:01 +01:00
unknown
18e7d8f6d7 Fix calls to memset() with arguments out of order. (Bug #9323)
bdb/hash/hash_open.c:
  Fix order of arguments to memset()
bdb/btree/bt_open.c:
  Fix order of arguments to memset()
ndb/src/kernel/vm/VMSignal.cpp:
  Fix order of arguments to memset()
2005-03-22 16:00:02 -08:00
unknown
1c0c25e747 Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
unknown
677a9936a1 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
unknown
8d0393aae3 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
unknown
ce488b51e6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-22 16:16:10 +01:00
unknown
3a88de4321 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl


mysql-test/mysql-test-run.sh:
  Auto merged
2005-03-22 15:57:20 +01:00
unknown
27a711b4cb mysql-test-run.sh, mysql-test-run.pl:
InnoDB needs longer start time for second slave on slow hosts


mysql-test/mysql-test-run.pl:
  InnoDB needs longer start time for second slave on slow hosts
mysql-test/mysql-test-run.sh:
  InnoDB needs longer start time for second slave on slow hosts
2005-03-22 15:12:05 +01:00
unknown
5e598cced3 Merge neptunus.(none):/home/msvensson/mysql/bug9072
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-03-22 14:29:34 +01:00
unknown
bac0698065 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
unknown
6d0d2c7e1d trx0trx.c:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:21:55 +02:00
unknown
421907e932 Merge
BitKeeper/etc/logging_ok:
  auto-union
innobase/include/trx0trx.h:
  Auto merged
innobase/trx/trx0trx.c:
  SCCS merged
2005-03-21 22:14:00 +02:00
unknown
7656b6da71 trx0trx.c, trx0trx.h:
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)


innobase/include/trx0trx.h:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
innobase/trx/trx0trx.c:
  If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
2005-03-21 22:10:42 +02:00
unknown
9f47e08e03 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-03-21 17:46:20 +01:00
unknown
4da513f5e7 A fix for Netware. 2005-03-21 18:11:11 +02:00
unknown
a94a62cefb mtr_report.pl:
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log


mysql-test/mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
mysql-test/lib/mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test/lib/mtr_report.pl:
  Made --timer work
2005-03-21 16:01:39 +01:00
unknown
11e01bfa2d BUG#9072 'Max_error_count' system variable cannot be set to zero
- Chaned min value in mysqld.cc
 - Added testcase to warnings.test


mysql-test/r/warnings.result:
  Added testcase for testing max and min value of max_error_count
mysql-test/t/warnings.test:
  Added testcase for testing max and min value of max_error_count
sql/mysqld.cc:
  Change min value of max_error_count from 1 to 0
2005-03-21 11:07:31 +01:00
unknown
4b454c6eed Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-18 17:14:17 +01:00
unknown
8d29891138 Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
unknown
ee2633a7e2 olap.test:
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.


sql/sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
mysql-test/t/olap.test:
  Added a test case for bug #8617.
2005-03-17 20:18:19 -08:00
unknown
39a0645a8a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:48:11 -06:00
unknown
afe45b7328 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:43:56 -06:00
unknown
04d2521f7c Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/merge-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 11:42:51 -06:00
unknown
4878bc7449 Update URL. 2005-03-17 11:40:41 -06:00
unknown
6cd5a8c0be Update URL.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 11:33:07 -06:00
unknown
ba9a0fea50 Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
2005-03-17 17:00:44 +01:00
unknown
05534c4df0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon


BitKeeper/etc/logging_ok:
  auto-union
2005-03-17 15:51:52 +01:00
unknown
93c928d3a7 safer creation of temp files used in replication of LOAD DATA INFILE.
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-03-17 14:39:39 +01:00
unknown
3e4ae65a14 Merge
sql/key.cc:
  Auto merged
mysql-test/r/update.result:
  SCCS merged
mysql-test/t/update.test:
  SCCS merged
2005-03-17 10:59:25 +04:00
unknown
7ceb5c6cef A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
sql/key.cc:
  A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop).
  For "partial" key parts (e.g. key(a(20), ...) we create different
  key_part->field, see sql/table.cc; so we have to use the eq() 
  function here to compare fields.
2005-03-17 10:24:50 +04:00
unknown
a131e4d12d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0


sql/item.h:
  Auto merged
2005-03-16 17:50:03 -08:00
unknown
31f6b0dde8 olap.result, olap.test:
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.


sql/sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
mysql-test/t/olap.test:
  Added a test for bug #8615.
mysql-test/r/olap.result:
  Added a test for bug #8615.
2005-03-16 15:55:04 -08:00
unknown
2815daf7f7 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 23:44:47 +01:00
unknown
74007170b5 Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
unknown
5be39a0c95 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00