Commit graph

20039 commits

Author SHA1 Message Date
unknown
4173610bd2 Remove redundant DROP TABLE from test case 2005-02-14 23:45:48 +03:00
unknown
3ca0e28ccc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/mysql-4.1
2005-02-14 23:30:03 +04:00
unknown
c042d67c90 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 18:48:50 +01:00
unknown
11eb4ab708 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 18:48:49 +01:00
unknown
48bc6ab2ce Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
2005-02-14 17:35:14 +01:00
unknown
3800536a83 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
2005-02-14 16:34:36 +01:00
unknown
cc2843e2fa Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/k/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-02-14 17:23:12 +02:00
unknown
28bb6893e9 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0


sql/ha_innodb.cc:
  Auto merged
2005-02-14 17:23:11 +02:00
unknown
b6a09ac0fa Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
Can't repeat information_schema test failure
Fix for lowercase_table3 only


mysql-test/r/lowercase_table3.result:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
mysql-test/t/lowercase_table3.test:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
sql/ha_innodb.cc:
  Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
2005-02-14 18:23:10 +03:00
unknown
2ad1624371 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-14 16:22:00 +01:00
unknown
4b4c887a02 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-14 16:19:57 +01:00
unknown
de3f93c6ff Bug#8351
Fix for crash when using a double quote in boolean fulltext query.


mysql-test/r/fulltext.result:
  Added a test case for bug #8351.
mysql-test/t/fulltext.test:
  Added a test case for bug #8351.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-14 18:54:12 +04:00
unknown
114487dd08 make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
Make sure that the node itself is set in the m_connected_nodes when connected


ndb/src/kernel/vm/Configuration.cpp:
  make sure we destroy the iterator before reusing the variable
ndb/src/mgmsrv/MgmtSrvr.cpp:
  make sure that the "conections are up to date" when exiting from MgmtSrvr::transporter_connect()
ndb/src/ndbapi/ClusterMgr.cpp:
  Make sure that the node itself is set in the m_connected_nodes when connected
2005-02-14 15:51:44 +01:00
unknown
c1085da6f8 ha_innodb.cc:
Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code


sql/ha_innodb.cc:
  Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code
2005-02-14 16:00:15 +02:00
unknown
93fd45904a InnoDB: Small improvements to earlier patch (fix Bug #7350 better),
suggested in review by Heikki.


innobase/include/data0type.h:
  Improve comment of dtype_struct.
innobase/include/data0type.ic:
  Rename innobase_get_mb_cset() to innobase_get_cset_width().
  dtype_get_fixed_size(): Add an extra integrity check for
  type->prtype, type->mbminlen and type->mbmaxlen.
sql/ha_innodb.cc:
  Rename innobase_get_mb_cset() to innobase_get_cset_width()
2005-02-14 15:54:08 +02:00
unknown
802f0bb0c7 Removal of a not needed statement 2005-02-14 14:20:43 +01:00
unknown
c24523c87f corrected error in checking get() return value from config iterator 2005-02-14 11:29:46 +01:00
unknown
0fbd1d8f95 mgmapi to return connected port and interface _only_ if it is actually connected
use m_cofigMutex when configuration is accessed
   use c++ iteration interface everywhere in MgmtSrvr code
    use NDB_INVALID_SOCKET everywhere in Services.cpp


ndb/src/common/transporter/TransporterRegistry.cpp:
  removed warning
ndb/src/mgmapi/mgmapi.cpp:
  mgmapi to return connected port and interface _only_ if it is actually connected
ndb/src/mgmsrv/MgmtSrvr.cpp:
  use m_cofigMutex when configuration is accessed
  use c++ iteration interface everywhere
ndb/src/mgmsrv/Services.cpp:
  use NDB_INVALID_SOCKET everywhere
2005-02-14 11:15:00 +01:00
unknown
e2b6480162 remove passwordless remote accounts from windows distro 2005-02-14 11:14:04 +01:00
unknown
943c267709 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-14 10:23:53 +01:00
unknown
6d2a507343 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 09:05:55 +01:00
unknown
a0f6d69b91 Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 19:05:54 +11:00
unknown
96227c27cc connect_ndb_mgmd stilled some more mem leaks 2005-02-14 09:05:53 +01:00
unknown
8ca755591c fixed memory-leak in case of connect failure 2005-02-14 08:50:16 +01:00
unknown
1a7d87e33d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-14 08:30:52 +01:00
unknown
3794371069 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-14 08:29:43 +01:00
unknown
9f2240b479 wl1292 - ndb autotest
fix log reports


ndb/test/run-test/make-html-reports.sh:
  fix log reports
2005-02-14 08:28:47 +01:00
unknown
0e25e70971 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl5


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
2005-02-14 18:19:11 +11:00
unknown
1df41ff584 Transporter holds a signed port number so the check for a dynamic port in
connect_client thread will work more than just first-time.


ndb/src/common/transporter/Transporter.cpp:
  m_r_port is now m_s_port a SIGNED port. <0 is dynamic
ndb/src/common/transporter/Transporter.hpp:
  m_r_port is now m_s_port, a SIGNED port number (<0 is dynamic).
  
  We give the socket client a positive port though.
ndb/src/common/transporter/TransporterRegistry.cpp:
  Transporter now holds SIGNED port number (<0 dynamic)
2005-02-14 18:09:06 +11:00
unknown
a8d2152f97 Bug#2435
Alter handling for UNION syntax
  Tests for UNION and parentheses


mysql-test/r/union.result:
  Bug#2435
    Tests for UNION and parentheses
mysql-test/t/union.test:
  Bug#2435
    Tests for UNION and parentheses
sql/sql_yacc.yy:
  Bug#2435
    Amend handling of UNION with parentheses.
2005-02-13 22:35:52 +00:00
unknown
0d57871425 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1


innobase/row/row0mysql.c:
  Auto merged
sql/sql_cache.cc:
  Auto merged
2005-02-13 21:05:18 +02:00
unknown
4c21a10f27 row0mysql.c:
Backport the column prefix memory corruption fix from 5.0


innobase/row/row0mysql.c:
  Backport the column prefix memory corruption fix from 5.0
2005-02-13 21:00:07 +02:00
unknown
602d9a0329 row0mysql.c:
Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t


innobase/row/row0mysql.c:
  Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
2005-02-13 20:48:02 +02:00
unknown
f37290b960 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-02-13 18:22:38 +01:00
unknown
b7fadca152 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2005-02-13 11:18:55 +02:00
unknown
95d3d98b00 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-13 02:31:33 +04:00
unknown
faf5f25494 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-13 01:54:24 +04:00
unknown
a0d5302e17 Fix for bug 8416 (bigint test fails on PPC)
strings/decimal.c:
  <0 doesn't work properly on PPC in that case.
2005-02-13 01:36:35 +04:00
unknown
84d1199692 Fix for BUG#8218:
Remove TMP_TABLE_PARAM::copy_funcs_it. TMP_TABLE_PARAM is a member of JOIN which is 
copied via memcpy, and List_iterator_fast TMP_TABLE_PARAM::copy_funcs_it ends up 
pointing to the wrong List.


mysql-test/r/subselect.result:
  Testcase for BUG#8218
mysql-test/t/subselect.test:
  Testcase for BUG#8218
sql/sql_select.cc:
  Fix for BUG#8218: Create/use own iterator since TMP_TABLE_PARAM::copy_funcs_it is removed.
2005-02-12 22:58:54 +03:00
unknown
a8b9f30eb3 new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
(protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
and then calls archive_db_end() to clean up).


sql/examples/ha_archive.cc:
  new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before.
2005-02-12 19:17:33 +01:00
unknown
57eaefe9fb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-02-12 20:12:06 +04:00
unknown
4810f300d2 Fix for bug #8477 (Embedded query_cache test crashes)
libmysqld/emb_qcache.cc:
  Querycahce data transition fixed
2005-02-12 20:09:40 +04:00
unknown
c8510bf81b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2005-02-12 15:30:45 +01:00
unknown
f315e00e56 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-12 15:20:55 +01:00
unknown
d505ee0790 merge 2005-02-12 15:17:41 +01:00
unknown
e03b7bd879 wl1292 - ndb autotest
Fix 4.1 memleak in Hugo


ndb/test/include/HugoOperations.hpp:
  Fix mem leak in Hugo
ndb/test/src/HugoTransactions.cpp:
  Fix mem leak in Hugo
2005-02-12 15:12:53 +01:00
unknown
66d5e4e888 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-12 15:06:39 +01:00
unknown
3ca04269c9 wl1292 - ndb autotest
link to log if it exists, regardless of test result


ndb/test/run-test/make-html-reports.sh:
  link to log if it exists, regardless of test result
2005-02-12 15:05:33 +01:00
unknown
dd0f622416 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/triggers/post-commit:
  Auto merged
sql/item.cc:
  Auto merged
sql/log.cc:
  Auto merged
2005-02-12 14:57:39 +01:00
unknown
2d619d7cad Bug#8235 Connection collation change & table create with default result in crash
mysql-test/r/ctype_ucs.result:
  Test case
mysql-test/t/ctype_ucs.test:
  Test case
sql/field.cc:
  Fixed minus check to be UCS2-compatible
strings/ctype-ucs2.c:
  Missing my_scan_ucs2() was added.
2005-02-12 16:27:22 +04:00