Commit graph

29819 commits

Author SHA1 Message Date
unknown
3ab267bf81 Bug#17284 erroneous temp table cleanup on slave.
Idea of the fix is for master to send FD event with `created' as 0
     to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
     In a case of a connect by slave to the master after its crash temp tables have been already
     cleaned up so that slave can not keep `orphan' temp tables.


mysql-test/r/rpl_temporary.result:
  results
mysql-test/t/rpl_temporary.test:
  wait-free addon to check temp tables are ok after slave reconnect.
sql/sql_repl.cc:
  Storing zero for assigning to `created' of FD event on the reconnecting slave.
mysql-test/include/get_binlog_dump_thread_id.inc:
  mysqltest's preudo-macro to calculate $id master dump thread id
2006-04-07 20:44:37 +03:00
unknown
a024fd69c0 Manual merge. 2006-04-07 19:42:46 +02:00
unknown
747f81c22c mysql-test/mysql-test-run.sh : Provide info about the options used.
mysql-test/mysql-test-run.sh:
  Provide info about the options used for this run to any evaluation tool.
2006-04-07 19:27:19 +02:00
unknown
e93fe1e4c5 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 10:19:09 -07:00
unknown
ec9b46a9b4 ndb - bug#11034
fix mem leak (not during running of transactions, but a few bytes when shutting down)


ndb/src/ndbapi/NdbLinHash.hpp:
  Make sure that getNext(0) actually finds first element
2006-04-07 17:10:56 +02:00
unknown
daac388624 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/generic/mysql-5.0-runtime
2006-04-07 16:55:49 +02:00
unknown
148cf113e5 Renaming sp_pcontext members and methods; less cryptic and more consistent.
Also added comments, and fixing some coding style (mostly in comments too).
There are no functional changes, so no tests or documentation needed.
(This was originally part of a bugfix, but it was decided to not include this
 in that patch; instead it's done separately.)


sql/sp_head.cc:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
sql/sp_head.h:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
sql/sp_pcontext.cc:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
  Also added comments, and fixing some coding style (mostly in comments too).
sql/sp_pcontext.h:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
  Also added comments, and fixing some coding style (mostly in comments too).
sql/sp_rcontext.cc:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
sql/sp_rcontext.h:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
sql/sql_yacc.yy:
  Renaming sp_pcontext members and methods; less cryptic and more consistent.
2006-04-07 16:53:15 +02:00
unknown
c3058a64cf ndb - bug#11033
silent valgrind warnings 5.0, ndb_autodiscover


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  append 4 bytes of 0's to end of buffer to shut valgrind up
2006-04-07 15:48:13 +02:00
unknown
48f9eb40a0 Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0 2006-04-07 15:43:39 +02:00
unknown
6a1ec62660 Remove #if 0 2006-04-07 14:21:00 +02:00
unknown
1ba7235e10 Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge (no idea why automatic merge failed ...).
2006-04-07 13:44:43 +02:00
unknown
7bb1882822 mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored).
mysql-test/mysql-test-run.pl:
  Add option "with-ndbcluster-only" (ignored) for compatibility with newer "Do-compile".
2006-04-07 13:34:39 +02:00
unknown
cab73a6009 Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections are cached
After FLUSH STATUS max_used_connections was reset to 0, and haven't
been updated while cached threads were reused, until the moment a new
thread was created.

The first suggested fix from original bug report was implemented:

  a) On flushing the status, set max_used_connections to
  threads_connected, not to 0.

  b) Check if it is necessary to increment max_used_connections when
  taking a thread from the cache as well as when creating new threads


mysql-test/r/status.result:
  Add result for bug#15933.
mysql-test/t/status.test:
  Add test case for bug#15933.
  Fixed typo.
sql/mysql_priv.h:
  Add declaration of refresh_status(), which is now external.
sql/mysqld.cc:
  Remove start_cached_thread() (code moved directly into create_new_thread()).
  Add comment for create_new_thread ().
  In create_new_thread() update max_used_connections when creating new thread
  and when reusing the cached one.
  Move refresh_status() from sql/sql_parse.cc here, on refresh set
  max_used_connections to the current number of connections.
sql/sql_parse.cc:
  refresh_status() moved to sql/mysqld.cc.
2006-04-07 15:30:40 +04:00
unknown
eb6b2bdc3e Manual merge.
mysql-test/lib/mtr_process.pl:
  Auto merged
2006-04-07 13:16:40 +02:00
unknown
8fc0c48d5e Perl test script: Avoid some aborts, which made the whole build/test process terminate.
mysql-test/lib/mtr_process.pl:
  Change from "mtr_error()" to "mtr_warning()" on some problems,
  because "error" makes the whole suite abort which then makes "Do-compile" terminate,
  so none of the following steps (including other etst suites) will be done.
2006-04-07 13:02:15 +02:00
unknown
6206e7c228 mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1)
mysql-test/mysql-test-run.sh:
  Manual merge from 4.0 (which was a 5.1 backport):
  "--with-ndbcluster" is already present,
  "--with-ndbcluster-only" is really usable here.
2006-04-07 12:22:55 +02:00
unknown
978c18b680 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-jonas
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-04-07 12:01:08 +02:00
unknown
cfee84be3a multi node shutdown adabtions for restart of management servers 2006-04-07 12:01:07 +02:00
unknown
94bfe767b2 Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2006-04-07 11:46:22 +02:00
unknown
1a72428ae0 BUG#18881 valgrind: kernel memory leak in vm/Emulator.cpp
ndb/src/kernel/vm/Emulator.cpp:
  destroy theShutdownMutex in the destructor
2006-04-07 19:28:18 +10:00
unknown
f7b039cc50 fix for wrong QUARTER calculation in EXTRACT() (Bug #18100)
mysql-test/r/func_time.result:
  expected test results for bug #18100 added
mysql-test/t/func_time.test:
  test case for bug #18100 added
sql/item_timefunc.cc:
  wrong formula for EXTRACT QUARTER, now uses the same calculus as the QUARTER()
  function
2006-04-07 11:15:15 +02:00
unknown
f3de57d982 Merge bk-internal:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-07 11:04:46 +02:00
unknown
aef9795719 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-04-07 10:52:35 +02:00
unknown
6caa249531 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-work
2006-04-07 10:51:21 +02:00
unknown
1de7807da9 Support for ndb multi-node shutdown 2006-04-07 10:39:47 +02:00
unknown
f3c792863c Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-07 10:26:53 +02:00
unknown
2f2607faef Fix for bug#18281 group_concat changes charset to binary
skip charset aggregation for order columns
2006-04-07 13:19:31 +05:00
unknown
47de160d65 ndb -
remove debug prinouts in Qmgr


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  remove debug prinouts
2006-04-07 10:10:09 +02:00
unknown
db7a88a2f4 Bug#18469 make test fails on information_schema
move test case for bug 14290 to ctype_ucs test
2006-04-07 12:32:24 +05:00
unknown
998b9d8b14 Fixed bug #15917: unexpected complain for a NIST test case.
The problem was due to the fact that with --lower-case-table-names set to 1 
the function find_field_in_group did not convert the prefix 'HU' in
HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
names in the group list were extended by the database name in lower case.


mysql-test/r/having.result:
  Added a test case for bug #15917.
mysql-test/t/having.test:
  Added a test case for bug #15917.
sql/item.cc:
  Fixed bug #15917: unexpected complain for a NIST test case.
  The problem was due to the fact that with --lower-case-table-names set to 1 
  the function find_field_in_group did not convert the prefix 'HU' in
  HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
  names in the group list were extended by the database name in lower case.
  The needed conversion was added to the code of find_field_in_group.
2006-04-06 15:29:15 -07:00
unknown
cc12c914ed Merge mysql.com:/home/greenman/workspace-mysql/mysql/mysql-5.0
into  mysql.com:/home/greenman/workspace-mysql/mysql/bug-5.0-16240
2006-04-06 10:42:34 -07:00
unknown
8ec7190dac Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
unknown
3daaa8d5f4 Remove redundant code in opt_sum_query() 2006-04-06 21:42:03 +04:00
unknown
caa16cbfe7 Fix for Bug #16240
support-files/mysql.server.sh:
  Fixed so that if the datadir has been set via the command line,
  it won't be reset by specifing the basedir after.
2006-04-06 10:13:46 -07:00
unknown
ff85ba77be Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored).
mysql-test/mysql-test-run.sh:
  Make "mysql-test-run.sh" accept (and ignore) the options "--with-ndbcluster" 
  and "--with-ndbcluster-only".
  This is necessary because newer build tools will issue them, and the test 
  script should tolerate that.
  Backport from 5.1 (Tomas Ulin, 2006-01-17)
2006-04-06 18:42:07 +02:00
unknown
2123006d3d BUG#15530: Cluster start up "show" shows all data nodes as master during start
along with the fix for 18843, this should fix the bug.


ndb/src/mgmclient/CommandInterpreter.cpp:
  Only show we have a master if one has been elected
2006-04-07 00:58:08 +10:00
unknown
2b5f62586d Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 16:31:34 +02:00
unknown
4c4afd225e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-04-06 16:19:22 +02:00
unknown
b96e8d7a97 ndb - bug#18612 - post review fixes
1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
2006-04-06 16:18:42 +02:00
unknown
3af116f187 BUG#18833 valgrind: Mismatched free()/delete/delete[] in SimBlockList
ndb/src/kernel/SimBlockList.cpp:
  NEW_BLOCK allocates the elements with new, we should free them with delete
  but only if we're not building with VM_TRACE
2006-04-06 21:59:20 +10:00
unknown
9cc12d65cd BUG#18843 valgrind: cond jump on uninit in Qmgr::execAPI_REGREQ
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Also init a few internals before start phase 1 as they can be accessed before that
2006-04-06 21:59:13 +10:00
unknown
b3dad93478 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
2006-04-06 15:25:39 +05:00
unknown
ee3cf23b5c Fix for bug#14945 "Truncate table doesn't reset the auto_increment
counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).


mysql-test/r/sp.result:
  Test case for BUG#14945.
mysql-test/t/sp.test:
  Test case for BUG#14945.
sql/sql_delete.cc:
  Handle TRUNCATE in stored procedures exactly in the same way as straight
  TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
  this by rolling back the fix for bug 8850, which is no longer relevant
  since stored procedures don't require prelocked mode anymore
  (and TRUNCATE is not allowed in stored functions or triggers).
sql/sql_parse.cc:
  Handle TRUNCATE in stored procedures exactly in the same way as straight
  TRUNCATE (i.e. without falling back to DELETE if possible). We achieve
  this by rolling back the fix for bug 8850, which is no longer relevant
  since stored procedures don't require prelocked mode anymore
  (and TRUNCATE is not allowed in stored functions or triggers).
2006-04-06 15:19:01 +05:00
unknown
1b5ce33861 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas
2006-04-06 12:01:50 +02:00
unknown
71a1864f8c Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/50-jonas


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-04-06 11:55:36 +02:00
unknown
86ca1bc3b5 post merge fixes 2006-04-06 11:51:24 +02:00
unknown
be0d6c94de ndb - wl1760/bug#18216
add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Expand CmRegReq with lots of stuff
ndb/include/mgmapi/ndb_logevent.h:
  Add Start report during sp1
ndb/src/common/debugger/EventLogger.cpp:
  Add Start report during sp1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Init cntrref
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix small bugs related to partial initial start
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Remove timeouts as they are handled in QMGR nowadays
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/vm/Configuration.cpp:
  Add new flags
    --initial-start
    --nowait-nodes
2006-04-06 11:43:31 +02:00
unknown
9a1d80e90e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-04-06 10:34:41 +02:00
unknown
a0f7e7558f Moving mysql_get_server_version() from libmysql.c to client.c,
as it is now required by mysql_set_character_set()


libmysql/libmysql.c:
  Removing mysql_get_server_version()
sql-common/client.c:
  Adding mysql_get_server_version()
2006-04-06 13:03:22 +05:00
unknown
f53c12c833 client.c:
Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.


sql-common/client.c:
  Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.
2006-04-06 12:43:13 +05:00