monty@mysql.com
10a4a16654
Turn off EOLN_NATIVE flag of some test files
2005-09-15 17:59:01 +03:00
monty@mysql.com
9727fe5abf
Merge mysql.com:/home/my/mysql-4.0
...
into mysql.com:/home/my/mysql-4.1
2005-09-15 17:17:26 +03:00
monty@mysql.com
444dbfaf17
Turn off EOLN_NATIVE flag for all test files
...
Ignored some generated files
2005-09-15 17:14:39 +03:00
pekka@mysql.com
af1ddc205b
ndb - bug#9994 backpatch fixes from 5.0
...
IGNORE on merge 4.1->5.0
2005-09-15 14:48:49 +02:00
ingo@mysql.com
410043a8b4
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 16:30:48 +02:00
joerg@mysql.com
b4d4e7a306
Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).
2005-09-14 13:55:53 +02:00
ingo@mysql.com
6e725adc00
Bug#12920 - key_read_requests counter appears to re-set
...
After merge fix.
2005-09-14 13:18:16 +02:00
joerg@mysql.com
eee616d122
Minor output format change of the Perl test suite script (align with the shell script).
2005-09-14 13:12:30 +02:00
ingo@mysql.com
8130641e8e
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-14 10:34:41 +02:00
ingo@mysql.com
7314307762
Bug#12920 - key_read_requests counter appears to re-set
...
Enlarged the counter variables to ulonglong.
2005-09-14 09:56:49 +02:00
ingo@mysql.com
53683ef76c
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-13 20:47:00 +02:00
ingo@mysql.com
e31c488d6d
Bug#12845 - Stress test: Server crashes on CREATE .. SELECT statement
...
Solution for 4.0 and 4.1.
If the caller cannot re-open table(s), it gives a NULL
'refresh' argument to open_table(). We used to ignore
flushes then. Now we ignore drops too.
2005-09-13 20:19:59 +02:00
jani@ua141d10.elisa.omakaista.fi
cb4f132075
Merged code. Removed unneccessary repeating.
2005-09-13 18:11:51 +03:00
tulin@dl145c.mysql.com
5f122007fa
minor compile error fix
2005-09-13 10:03:50 +02:00
jimw@mysql.com
0eec7c3cf4
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 16:48:00 -07:00
kent@mysql.com
b3446746b9
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-09-13 01:12:17 +02:00
jimw@mysql.com
d7dc2f68db
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
jimw@mysql.com
7efd9582a2
Update test result
2005-09-12 12:45:03 -07:00
ndbdev@dl145b.mysql.com
e17e8b38a3
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
SergeyV@selena.
2ca1a688cd
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-12 22:19:04 +04:00
paul@kite-hub.kitebird.com
d6f32f1361
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
paul@kite-hub.kitebird.com
7e03e3c88b
Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
...
into kite-hub.kitebird.com:/tmp/merge-4.0
2005-09-12 12:47:31 -05:00
paul@kite-hub.kitebird.com
bbb8e309de
Merge kite-hub.kitebird.com:/tmp/merge-4.0
...
into kite-hub.kitebird.com:/tmp/merge-4.1
2005-09-12 12:44:52 -05:00
paul@kite-hub.kitebird.com
7240863009
README:
...
Update README (2nd try)
2005-09-12 12:44:13 -05:00
jimw@mysql.com
16e5f22162
Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 10:19:56 -07:00
tulin@dl145b.mysql.com
63aef9d58b
Corrected construct of faked Node fail signals in ndb SignalSender
2005-09-12 17:49:48 +02:00
gluh@mysql.com
c398940326
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
monty@mishka.mysql.com
bdc33e2356
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
monty@mishka.mysql.com
0965bfa832
Review fixes since last pull
...
Fix for bug #13025 ; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
gluh@mysql.com
96e2471a32
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
gluh@mysql.com
d91fb61b37
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
jonas@eel.(none)
40cc9e5c42
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
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4
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
2005-09-12 17:09:19 +05:00
tulin@dl145c.mysql.com
f80e113d0e
removed a few aborts from mgmapi
...
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
lars@mysql.com
fd85a82559
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
jonas@eel.(none)
f9134bd920
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
gluh@eagle.intranet.mysql.r18.ru
2a07350854
ps_6bdb, ps_7ndb tests failure fix
2005-09-12 14:21:38 +05:00
lars@mysql.com
683edc6599
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
jonas@eel.(none)
d00732d97d
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
lars@mysql.com
e5503c277f
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
jani@a193-229-222-105.elisa-laajakaista.fi
27373d1d11
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
jonas@eel.(none)
8840301681
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
lars@mysql.com
eff11c53a6
Removed redundant reset_one_shot_variables calls
2005-09-11 00:57:31 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
2917515afc
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
jonas@eel.(none)
38b77e395e
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
evgen@moonbone.local
94f5e80c86
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
evgen@moonbone.local
99c0bf333c
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.
2005-09-10 02:30:26 +04:00
jonas@eel.(none)
c6e0e89405
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
jani@a193-229-222-105.elisa-laajakaista.fi
960802928c
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
aivanov@mysql.com
19d836e235
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