Commit graph

20192 commits

Author SHA1 Message Date
unknown
bf912125a3 mysqltest.test:
Add real_sleep tests.


mysql-test/t/mysqltest.test:
  Add real_sleep tests.
2006-02-28 17:54:11 -06:00
unknown
8d5f0fcddc mysql-test-run.sh:
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.


client/mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
mysql-test/r/mysqltest.result:
  Update test result for real_sleep error message.
mysql-test/README:
  Fix URL.
mysql-test/mysql-test-run.sh:
  Fix URLs.
2006-02-28 15:08:16 -06:00
unknown
9099fb2d06 mysqltest.c:
Correct/clarify comments.


client/mysqltest.c:
  Correct/clarify comments.
2006-02-28 14:00:17 -06:00
unknown
46c82ab153 mysqltest.c:
Fix typos.


client/mysqltest.c:
  Fix typos.
2006-02-28 12:01:24 -06:00
unknown
a7abbd918b Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-15 07:36:33 -08:00
unknown
4f9faf5ef8 Merge mysql.com:/home/jimw/my/mysql-4.1-16389
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2006-02-14 18:12:30 -08:00
unknown
3cebcd159e Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 21:47:23 +02:00
unknown
bdb953bd9d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/rpmspec-4.1
2006-02-13 18:23:08 +01:00
unknown
32d32b6eca Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
2006-02-13 19:15:02 +02:00
unknown
1c1e157628 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#06536-mysql-4.1
2006-02-13 17:29:35 +03:00
unknown
39bfc560a1 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/usr/local/mysql/mysql-4.1-fixrace
2006-02-12 00:19:59 +01:00
unknown
18faf00262 mysql-test-run.{pl,sh}:
Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port
2006-02-11 23:35:23 +01:00
unknown
503193867e Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.
2006-02-11 22:50:59 +01:00
unknown
34d8502a51 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-02-10 19:18:45 +01:00
unknown
9a68ba18c7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-02-10 17:53:13 +01:00
unknown
26287714d5 Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead


mysql-test/r/ndb_basic.result:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
unknown
b4d38aa0c6 support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
support-files/mysql.spec.sh:
  Use "-i" on "make test-force";
  this will prevent "make" from writing "***" which in turn was treated as a _build_ error
  by the log evaluation tool, causing it not to list the failing tests.
2006-02-10 17:40:04 +01:00
unknown
a68f171585 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part.
This changeset is assumed to stay in 4.1.


client/mysql.cc:
  BUG#16217 forced to introduce a separate mysql client command.
  Feature is backported from 5.0, precisely 
  ChangeSet 1.2034 06/02/09 16:23:09 aelkin@mysql.com
  (under second review at the moment)
mysql-test/r/mysqlbinlog.result:
  changed in 5.0
mysql-test/t/mysqlbinlog.test:
  backported from 5.0. The last part of the test to mimic bug#16217
sql/log_event.cc:
  Inserting exclaiming comment command for mysql client made differently than in 5.0.
  Parsing still is cheap enough not to think to modify server code instead.
2006-02-10 15:12:27 +02:00
unknown
c1a6def279 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-10 09:42:35 +01:00
unknown
165d539069 bug#10987 - ndb - unable to find restorable replica
Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
  
  This variable is used when cutting redo (calcKeepGci)
  Also make sure complete GCI is run inbetween LCP's
2006-02-10 09:37:36 +01:00
unknown
bbcb4a567a bug#17295 - ndb - error while reading REDO log
fix corruption due to page 0, file 0 gets released


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure that page 0, file 0 isnt released
2006-02-10 09:17:53 +01:00
unknown
1a27a433fc Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
unknown
2408644096 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2006-02-07 14:23:16 +02:00
unknown
26f7afaf35 kill.test fixed for kill on Mac OS X (which do not send OK)
mysql-test/r/kill.result:
  This result chenged because of the correspondent test change.
mysql-test/t/kill.test:
  This test fixed for kill on Mac OS X (which do not send OK)
2006-02-07 13:45:16 +02:00
unknown
a525b29470 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 14:49:57 +04:00
unknown
523d97f4dd Bug #17081 "LOAD DATA INFILE" may not load all the data 2006-02-07 11:30:42 +01:00
unknown
16c564a390 Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1


sql/item_func.h:
  Auto merged
2006-02-07 13:49:55 +04:00
unknown
0b9270009c Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
2006-02-07 13:49:03 +04:00
unknown
8deb6616bc Bug #17154 load data infile of char values into a table of char(PK) hangs
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data


mysql-test/r/ndb_load.result:
  New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
  New BitKeeper file ``mysql-test/t/ndb_load.test''
2006-02-07 00:03:39 +01:00
unknown
db4d82bad4 bug#13966 - ndb
better error message on invalid config change


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Change error message...note that this is a guess
2006-02-06 11:42:44 +01:00
unknown
c9147c5ecb bug#13965
ndb - error while restarting in dict
        improve error message when changed config leads to failed restart


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  improve error message
2006-02-06 11:30:56 +01:00
unknown
1076e176ce ndb - bug#16693 (4.1) test + workaround, analyze later
ndb/test/ndbapi/testBlobs.cpp:
  do batched deletes + list commit across open cursor test cases
ndb/tools/delete_all.cpp:
  if blobs, no commit across open cursor (single trans)
  cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)
2006-02-05 22:12:06 +01:00
unknown
b301e65883 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ]
mysql-test/r/ndb_blob.result:
  replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
  replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
  replace+tinyblob back-patch from 5.0
2006-02-03 15:23:58 +01:00
unknown
394c88df3a BUG#16893: Crash in test 'fulltext_order_by'
Fixed that fulltext query + union results in unexpected behaviour.


sql/item_func.h:
  Remove access to table object from cleanup() as the table object
  may have been dropped earlier (In case of temporary tables or of
  close_thread_tables() is run before cleanup())
  This fixed a bug with access to already freed memory
sql/sql_base.cc:
  Reset variables used by fulltext
2006-02-03 14:09:33 +04:00
unknown
f7a6e24934 Fix mysqldump crash when encountering a VIEW (when used against a
5.0 or later server, obviously). (Bug #16389)


client/mysqldump.c:
  Prevent dumping data from a view (and crashing when we see one)
2006-02-01 12:28:39 -08:00
unknown
1e686ae770 fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
libmysql/libmysql.c:
  stmt->mysql could be 0x0 if the connection has failed between prepare and execute
  or any other operation. thus if the user decides to use mysql_stmt_reset()
  we should not segfault.
tests/mysql_client_test.c:
  test for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
2006-02-01 20:35:16 +01:00
unknown
e3c3086304 BUG#14496: Crash or strange results with prepared statement,
MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.


mysql-test/r/fulltext.result:
  Testcase for BUG#14496.
mysql-test/t/fulltext.test:
  Testcase for BUG#14496.
sql/item_func.h:
  In Item_func_match::cleanup() always reset ft_handler to 0.
2006-02-01 20:40:12 +04:00
unknown
c98077d610 Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my41-bug15302
into  devsrv-b.mysql.com:/space/magnus/my41-bug15302
2006-01-31 18:51:15 +01:00
unknown
c35be28149 Bug #15302 LOAD DATA FROM MASTER -> Packets out of order (Found: 2, expected 1)
- Change "mysql_create_db" to not call "send_ok" if in silent mode i.e. called from "load_master_data"
 - Change mysqltest to detect when there aren't as many warnings available as was reported.


client/mysqltest.c:
  Call "die" if warnings were reported but there weren't any warnings to retrieve
sql/sql_db.cc:
  Don't call "send_ok" if in silent mode.
2006-01-31 12:47:22 +01:00
unknown
97deac8b8c ndb - testBlobs 'perf test' fix
ndb/test/ndbapi/testBlobs.cpp:
  setValue buffer was not fullsize
2006-01-31 08:13:42 +01:00
unknown
2cb45da835 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 22:43:51 +03:00
unknown
8eaf6f1177 Fixed BUG#15653, BUG#16582.
Applied innodb-4.1-ss20 snapshot.


innobase/btr/btr0sea.c:
  Applied innodb-4.1-ss20 snapshot.
    Account for a race condition when dropping the adaptive
    hash index for a B-tree page (Bug #16582).
    btr_search_drop_page_hash_index(): Retry the operation if a hash
    index with different parameters was built meanwhile. Add
    diagnostics for the case that hash node pointers to the page
    remain. This fix is from Heikki.
    btr_search_info_update_hash(), btr_search_info_update_slow():
    Document the parameter "info" as in/out.
innobase/fil/fil0fil.c:
  Applied innodb-4.1-ss20 snapshot.
    Keep track on unflushed modifications to file spaces. When
    there are tens of thousnads of file spaces, flushing all files
    in fil_flush_file_spaces() would be very slow (Bug #16582).
    fil_flush_file_spaces(): Only flush unflushed file spaces.
    fil_space_t, fil_system_t: Add a list of unflushed spaces.
innobase/include/btr0sea.ic:
  Applied innodb-4.1-ss20 snapshot.
    btr_search_info_update_hash(), btr_search_info_update_slow():
    Document the parameter "info" as in/out.
2006-01-30 22:33:02 +03:00
unknown
43f122c410 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 15:31:35 +03:00
unknown
cc47eb7791 Fixed BUG#16387.
Applied innodb-4.1-ss17 snapshot.
  Do not mistake TABLENAME_ibfk_0 for auto-generated id.


innobase/dict/dict0dict.c:
  Applied innodb-4.1-ss17 snapshot.
    dict_table_get_highest_foreign_id(): Ignore foreign
    constraint identifiers starting with the pattern
    TABLENAME_ibfk_0 (BUG#16387).
mysql-test/r/innodb.result:
  Applied innodb-4.1-ss17 snapshot.
    Fixed results for added test case.
mysql-test/t/innodb.test:
  Applied innodb-4.1-ss17 snapshot.
    Added test case.
2006-01-30 15:17:33 +03:00
unknown
13896eaa84 mysql-test-run.pl:
Aligned the MTR_BUILD_THREAD policy to shell version


mysql-test/mysql-test-run.pl:
  Aligned the MTR_BUILD_THREAD policy to shell version
2006-01-28 13:04:01 +01:00
unknown
55ca11fec2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


mysql-test/mysql-test-run.sh:
  Auto merged
2006-01-28 12:39:25 +01:00
unknown
a73b7dc243 mysql-test-run.sh:
Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE


mysql-test/mysql-test-run.sh:
  Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
2006-01-28 12:35:46 +01:00
unknown
ae653f1be0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
2006-01-27 19:11:59 +01:00
unknown
27fb23c6eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 13:11:58 -05:00
unknown
7f3f9027d9 Added comments to specify why no much mutex is needed. 2006-01-27 12:44:33 -05:00