Commit graph

19509 commits

Author SHA1 Message Date
unknown
f1cc9494b9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-mgmd
into  mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
2005-09-15 17:42:36 +10:00
unknown
abd4974fd5 Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
mysql-test/lib/mtr_process.pl:
  Handle errors in child processes separate from the parent process (patch supplied by Kent).
mysql-test/lib/mtr_report.pl:
  New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
  Expected to avoid HUP signals.
2005-09-14 13:55:53 +02:00
unknown
a5903ed9f3 Minor output format change of the Perl test suite script (align with the shell script).
mysql-test/lib/mtr_report.pl:
  Make the Perl test script output identical to that of the (old) shell script,
  so that reported differences compare as equal strings (for automatic analysis).
2005-09-14 13:12:30 +02:00
unknown
02fce1c316 Merged code. Removed unneccessary repeating. 2005-09-13 18:11:51 +03:00
unknown
b51879f169 minor compile error fix 2005-09-13 10:03:50 +02:00
unknown
accf5c264a Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
2005-09-12 16:48:00 -07:00
unknown
cc537b0766 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
2005-09-13 01:12:17 +02:00
unknown
03a5e223af corrected prev patch on ndb_mgmd usage of SignalSender 2005-09-13 00:22:06 +02:00
unknown
e63bb69650 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2005-09-12 22:53:31 +02:00
unknown
a100123ab3 adopted to corrected ndb SendSignal Node failrep 2005-09-12 22:51:44 +02:00
unknown
06c2d66e8d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 12:47:45 -07:00
unknown
38b2cd733b Update test result
mysql-test/r/ndb_autodiscover.result:
  Update results
2005-09-12 12:45:03 -07:00
unknown
333bc203d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-09-12 20:41:50 +02:00
unknown
c231cb6a04 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged
2005-09-12 22:19:04 +04:00
unknown
7254e748fe Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into  kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:53:49 -05:00
unknown
6c8e4044b3 Merge kite-hub.kitebird.com:/tmp/merge-4.0
into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged
2005-09-12 12:44:52 -05:00
unknown
d262a6e0a0 README:
Update README (2nd try)


README:
  Update README (2nd try)
2005-09-12 12:44:13 -05:00
unknown
4975a7f9f8 Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
2005-09-12 10:19:56 -07:00
unknown
3f40506633 Corrected construct of faked Node fail signals in ndb SignalSender 2005-09-12 17:49:48 +02:00
unknown
17233698fc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 20:49:48 +05:00
unknown
3ad213baca Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mishka.mysql.com:/home/my/mysql-4.1
2005-09-12 18:49:47 +03:00
unknown
90ca6d15b3 Review fixes since last pull
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level
2005-09-12 18:48:17 +03:00
unknown
45433e7813 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-09-12 16:08:59 +02:00
unknown
c1c2a8920c reengineered ndb_mgmd to use SignalSender and remove some multi user issues 2005-09-12 16:08:16 +02:00
unknown
49e734e67c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:43:02 +05:00
unknown
bab5cb7834 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:33:21 +05:00
unknown
c29e0f709c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
unknown
63080dc200 Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
unknown
0a3202bedf removed a few aborts from mgmapi
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
unknown
39c2107eb2 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-12 13:00:55 +02:00
unknown
c2bdd1c0e0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 11:43:22 +02:00
unknown
e98e15db9b ps_6bdb, ps_7ndb tests failure fix 2005-09-12 14:21:38 +05:00
unknown
eac9a33778 Reverted old fix with sync_slave_with_master and added a replace commands
to eliminate nondeterminism in slave start
2005-09-12 10:50:42 +02:00
unknown
01587e479a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 10:40:40 +02:00
unknown
e21f484390 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
into  mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-11 13:46:36 +02:00
unknown
e6f860aad0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-11 10:31:55 +03:00
unknown
fe75dc51b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-11 08:41:33 +02:00
unknown
e6560c0da0 Removed redundant reset_one_shot_variables calls
sql/sql_parse.cc:
  Optimization, this reset is executed below anyway
2005-09-11 00:57:31 +02:00
unknown
53043f535a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-10 18:41:37 +03:00
unknown
dc06ac31d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-10 08:22:24 +02:00
unknown
8c129f5012 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/12695-bug-4.1-mysql
2005-09-10 02:31:42 +04:00
unknown
fa13c29b2e insert_select.result, insert_select.test:
Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.


mysql-test/t/insert_select.test:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
mysql-test/r/insert_select.result:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
2005-09-10 02:30:26 +04:00
unknown
330aa99e5b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 21:02:24 +02:00
unknown
c1a3b5be0a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-09 21:30:03 +03:00
unknown
1e77e26359 Merge mysql.com:/home/alexi/mysql-4.1
into  mysql.com:/home/alexi/dev/mysql-4.1-12101
2005-09-09 21:02:13 +04:00
unknown
8a9d9e7950 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-09 19:02:13 +02:00
unknown
19fa54f04e Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
Added test case.
2005-09-09 20:02:13 +03:00
unknown
6c7f692d2c Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
2005-09-09 13:02:12 -04:00
unknown
26f8e9c933 BUG #12101: Additional fix.
sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.
2005-09-09 19:06:15 +04:00
unknown
b1fab24ce2 ndb
new testprogram testSRBank


BitKeeper/etc/ignore:
  Added ndb/test/ndbapi/testSRBank to the ignore list
ndb/test/include/NDBT_Test.hpp:
  incProperty
ndb/test/ndbapi/Makefile.am:
  new test program
ndb/test/ndbapi/bank/Bank.cpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/ndbapi/bank/Bank.hpp:
  remove endless wait until ready loop
  fix lots of retry loops to better handle error
ndb/test/src/NDBT_Test.cpp:
  incProperty
ndb/test/src/UtilTransactions.cpp:
  close transaction if failed
ndb/test/ndbapi/testSRBank.cpp:
  New BitKeeper file ``ndb/test/ndbapi/testSRBank.cpp''
2005-09-09 12:39:06 +02:00