Commit graph

20714 commits

Author SHA1 Message Date
unknown
78757c18b3 ndb - testBitfield
remove unused method that gave compile error -pedantic


ndb/test/ndbapi/testBitfield.cpp:
  remove unused method that gave compile error -pedantic
2005-02-22 11:09:04 +01:00
unknown
f7c60b9f03 Fix name of ndb-cache-check-time
sql/mysqld.cc:
  Change _ to - for ndb-cache-check-time variable
2005-02-22 10:59:24 +01:00
unknown
a277a9eca6 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-02-22 10:25:30 +01:00
unknown
8094ac95d5 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-02-22 10:23:24 +01:00
unknown
e84aaa8b0d Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1


BitKeeper/deleted/.del-example.conf:
  Delete: ndb/test/run-test/example.conf
BitKeeper/deleted/.del-ndb-autotest.sh:
  Delete: ndb/test/run-test/ndb-autotest.sh
2005-02-22 10:20:35 +01:00
unknown
029f10dd85 wl1292 - ndb autotest scripts
split into script/conf for easier deployment
2005-02-22 10:18:38 +01:00
unknown
e57c76a4fe Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 08:25:01 +01:00
unknown
f58d5b037d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-22 08:21:24 +01:00
unknown
14707d71c3 ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.


mysys/charset.c:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/t/ctype_latin1.test:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/r/ctype_latin1.result:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
unknown
1329f063c0 field.cc:
optimize test_if_minus() when not UCS2 support is compiled.


sql/field.cc:
  optimize test_if_minus() when not UCS2 support is compiled.
2005-02-22 08:35:15 +04:00
unknown
17cca96ec9 MYSQL_LOG::recover was trying to allocate 0 bytes - bug#8661 2005-02-22 00:43:37 +01:00
unknown
fe82f47405 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


mysql-test/mysql-test-run.pl:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 00:32:33 +01:00
unknown
595b46efd1 Merge. 2005-02-21 17:28:33 -06:00
unknown
06f3307b45 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 00:17:56 +01:00
unknown
3ad8d4ba88 bug#8646 - deadlock if long transaction causes binlog rotate
sql/sql_yacc.yy:
  duplicated symbol removed
2005-02-22 00:15:31 +01:00
unknown
8a3c137b5e corrected errors in how ndbcluster handler closes down in case of error 2005-02-21 23:29:07 +01:00
unknown
8a40c5c71d corrected error in ndb programs debug switch 2005-02-21 23:15:30 +01:00
unknown
0c1dc07df0 Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 23:05:13 +01:00
unknown
9785419d1e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-21 23:05:12 +01:00
unknown
45064a4acc removed double declaration of opt_connect_str 2005-02-21 19:50:13 +01:00
unknown
7eefd9d635 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 20:42:34 +02:00
unknown
8cb6031dd7 Generate warning in ha_delete_table() if files is missing in handler
mysql-test/r/myisam.result:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/r/ndb_autodiscover.result:
  Update test results
mysql-test/r/rpl_EE_error.result:
  Change test to conform with new handling of drop table when handler file is missing
mysql-test/t/myisam.test:
  Test of DROP TABLE when .MYI or .MYD is missing
mysql-test/t/rpl_EE_error.test:
  Change test to conform with new handling of drop table when handler file is missing
sql/handler.cc:
  Generate a warning in ha_delete_table() if we get an error from 'delete_table()'
sql/handler.h:
  More parameters to ha_delete_table() so that we can generate better error messages
sql/sql_table.cc:
  Generate warning in ha_delete_table()
2005-02-21 20:41:48 +02:00
unknown
5eaa8cef88 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/item.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-21 19:11:11 +01:00
unknown
4062f0d67d Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-qc_item_view-5.0


BitKeeper/etc/logging_ok:
  auto-union
sql/sp_head.cc:
  Auto merged
2005-02-21 19:51:10 +02:00
unknown
edaf33a14e BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
unknown
7a43b4c665 ha_innodb.cc:
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited


sql/ha_innodb.cc:
  Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
unknown
9cba39cab4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 20:54:05 +04:00
unknown
25b205cec8 BUG#6676: Added comment for the fix 2005-02-21 17:52:15 +01:00
unknown
9c1130e27b Fix for bug #8651 (cast(sum(distinct) as decimal) crashes the server)
sql/item_sum.cc:
  curr_dec_buff should be set to 0 here
2005-02-21 20:50:56 +04:00
unknown
0baf8fabee show automatic commits in general log 2005-02-21 16:28:05 +01:00
unknown
df1b674a69 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
unknown
ce793fbf1d Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 16:23:05 +01:00
unknown
ac1852b403 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 17:23:05 +02:00
unknown
80ddfccfa7 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 16:23:04 +01:00
unknown
9a1482739e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-21 19:23:03 +04:00
unknown
cd32f96095 Tests modified to coved decimal-related code
mysql-test/r/analyse.result:
  test result extended
mysql-test/r/cast.result:
  test result extended
mysql-test/r/func_group.result:
  test result extended
mysql-test/r/subselect.result:
  test result extended
mysql-test/t/analyse.test:
  test extended
mysql-test/t/cast.test:
  test extended
mysql-test/t/func_group.test:
  test extended
mysql-test/t/subselect.test:
  test extended
2005-02-21 19:20:05 +04:00
unknown
aef137bc81 sql_parse.cc:
Fix compiler complaint.


sql/sql_parse.cc:
  Fix compiler complaint.
2005-02-21 09:15:43 -06:00
unknown
a2bb52c748 Merge
sql/ha_ndbcluster.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-21 16:13:29 +01:00
unknown
4ef3e54b94 postreview changes
sql/sql_cache.cc:
  typo fixed
  comment added
  small optimisation
2005-02-21 17:07:40 +02:00
unknown
ae8c3e130a Fix -ansi -pedantic compilation failure. 2005-02-21 17:27:36 +03:00
unknown
c596940e3c bug#8645 - ndb - ndb_mgmd nodeid handling
(not to be merged as code has changed in 5.0)


ndb/src/mgmapi/LocalConfig.cpp:
  Allow connecstring = "nodeid=X"
ndb/src/mgmsrv/MgmtSrvr.cpp:
  remove incorrect asserts
2005-02-21 15:22:01 +01:00
unknown
4dc49b956a Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-21 15:07:27 +01:00
unknown
f3d2090efb Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-02-21 15:04:41 +01:00
unknown
2be9619682 Cleanup.
mysql-test/t/type_bit.test:
  Cleanup (we don't need to have include/have_innodb.inc here).
2005-02-21 18:03:06 +04:00
unknown
3c2e7f1e97 A minor adjustment of the previous bug fix in sp_head.cc.
(Which btw also fixed BUG#7295: Server crash when executing stored procedure,
 I just forgot to include that before.)


sql/sp_head.cc:
  A minor adjustment of the previous bug fix; moved the rollback of item changes
  to a better place which will not miss some cases.
2005-02-21 14:57:43 +01:00
unknown
926826f5da Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-02-21 17:38:37 +04:00
unknown
65410bd0a1 ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same


strings/ctype-utf8.c:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/t/ctype_utf8.test:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/r/ctype_utf8.result:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
unknown
448a4fd1f1 ndb - fix TUP filtering of LIKE / NOT_LIKE
ndb/include/util/NdbSqlUtil.hpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/common/util/NdbSqlUtil.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  1. fix wild_* chars 2. use correct wildcmp return value
2005-02-21 14:17:21 +01:00
unknown
e7038f4339 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-02-21 14:17:20 +01:00
unknown
f36c4a9378 workaround for sun compiler on sol9x86 2005-02-21 14:04:35 +01:00