jonas@eel.(none)
fcdf7d792b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into eel.(none):/home/jonas/src/mysql-5.1-push
2005-08-21 21:06:11 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5e91e260e6
WL #2602 , #2603 , #2604
...
Added new syntax for partition management
2005-08-19 10:26:05 -04:00
joreland@mysql.com
f6ac0351da
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/jonas/src/mysql-5.1-push
2005-08-08 22:21:43 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ccbab519ac
Merge fix
2005-08-06 13:11:56 -04:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
hf@deer.(none)
56b91a8c15
testcase added to fix for bug #12281 (Geometry & trigger crash)
2005-08-05 20:26:55 +05:00
andrey@lmy004.
3a52916436
fix for bug #12315 - SHOW TABLE STATUS FROM information_schema; does not sort tablenames
2005-08-05 11:01:29 +02:00
jimw@mysql.com
995b5dd02d
Fix out-of-order results in view results file
2005-08-04 16:33:29 -07:00
jimw@mysql.com
b0c5b625d1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-04 14:41:16 -07:00
jimw@mysql.com
2da798c991
Update test results
2005-08-04 14:38:48 -07:00
evgen@moonbone.local
1894cff045
Manual merge of #11335 bugfix
2005-08-05 00:34:42 +04:00
jimw@mysql.com
fa94e5389a
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-04 12:49:23 -07:00
jimw@mysql.com
b9da417688
Update test to deal with more relaxed datetime parsing.
2005-08-04 12:45:32 -07:00
jimw@mysql.com
5ad0c87dd0
Merge mysql.com:/home/jimw/my/mysql-4.1-12328
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-04 11:00:07 -07:00
jimw@mysql.com
d0c8e929c8
Merge mysql.com:/home/jimw/my/mysql-4.1-7308
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-04 10:48:53 -07:00
hf@deer.(none)
570c754993
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-04 18:24:18 +05:00
hf@deer.(none)
176bfcab13
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-04 18:22:53 +05:00
kent@mysql.com
468c3ad532
mysql-test-run.pl:
...
Back ported ndbcluster_support() from 5.0
Corrected the server id handling
2005-08-04 13:54:39 +02:00
hf@deer.(none)
293cfafd37
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-08-04 16:36:14 +05:00
hf@deer.(none)
0a3a6137d8
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.9508
2005-08-04 16:33:28 +05:00
hf@deer.(none)
b16812e6ca
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.11083
2005-08-04 16:30:36 +05:00
jimw@mysql.com
f58e5033fb
Skip two tests that fail on Windows that just reflect limitations of
...
that platform, not real failures. (Bug #12328 , Bug #11569 )
2005-08-03 17:38:55 -07:00
georg@lmy002.wdf.sap.corp
e5514f361a
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-08-04 02:07:53 +02:00
elliot@mysql.com
48ded4ab3d
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-08-03 16:15:05 -04:00
elliot@mysql.com
fc5829d651
BUG#12330 Adding updated result file which I missed in last changeset.
...
Adds --replace_column to make test results deterministic.
2005-08-03 16:12:06 -04:00
elliot@mysql.com
68b9b8802b
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-08-03 15:30:33 -04:00
elliot@mysql.com
fcaff839de
BUG#12330 Add --replace_column in order to make test deterministic.
2005-08-03 15:08:03 -04:00
evgen@moonbone.local
05d4c0c748
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/mysql-5.0-bug-11934
2005-08-03 14:14:02 +04:00
sergefp@mysql.com
31a73da815
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-sp-no-lock-r7
2005-08-03 10:14:01 +00:00
georg@lmy002.wdf.sap.corp
812ea21748
Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
2005-08-03 07:36:06 +02:00
georg@lmy002.wdf.sap.corp
7251e9dbd8
Fix for bug #6859 (after Sanja's review)
...
Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)
2005-08-03 07:29:48 +02:00
sergefp@mysql.com
f595847ec0
Manual merge
2005-08-03 03:47:07 +00:00
sergefp@mysql.com
b6a6fe0849
Prelocking-free SPs, post-review fixes:
...
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
2005-08-03 03:37:32 +00:00
jimw@mysql.com
6557fca0bd
Update out-of-date test result
2005-08-02 18:27:05 -07:00
jimw@mysql.com
de46ae18c2
Merge mysql.com:/home/jimw/my/mysql-5.0-11602
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:12 -07:00
jimw@mysql.com
42b5135c84
Merge mysql.com:/home/jimw/my/mysql-5.0-11568
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:11 -07:00
jimw@mysql.com
698f209917
Fix test to avoid spurious failure message. (Bug #11233 )
2005-08-02 16:50:10 -07:00
jimw@mysql.com
71a0d0ad4c
Make lowercase_table3 get skipped on Windows, as intended. (Bug #11568 )
2005-08-02 15:58:41 -07:00
evgen@moonbone.local
706247caae
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
...
Bug was introduced by cset 1.1659.14.1. Before it server was silently
ignoring that lock can't be acquired because it already acquired.
This patch makes make_global_read_lock_block_commit() return without error
if lock already acquired.
2005-08-03 02:01:27 +04:00
igor@rurik.mysql.com
b5f33d2bc4
Manual merge
2005-08-02 12:09:49 -07:00
jimw@mysql.com
4340fa114e
Fix parsing of dates with 'T' between date and time, as in ISO-8601
...
date format. (Bug #7308 )
2005-08-02 11:31:01 -07:00
svoj@mysql.com
007de019ce
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/BUG12075/mysql-4.1
2005-08-02 14:28:30 +05:00
svoj@mysql.com
315e4efc3f
Fix for BUG#12075.
...
FULLTEXT non-functional for big5 strings
2005-08-02 14:27:52 +05:00
svoj@mysql.com
0f98bf44ef
Merge mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/BUG11684/mysql-4.1
2005-08-02 12:12:37 +05:00
svoj@mysql.com
19fe33e16c
BUG#11684 fix.
...
Repair crashes mysql when table has fulltext index.
2005-08-02 11:33:26 +05:00
jimw@mysql.com
fb903c1e2c
Fix two test results that were merged out-of-order.
2005-08-01 19:21:56 -07:00
jimw@mysql.com
48d111c8c2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:54:57 -07:00
jimw@mysql.com
c3e40306b7
Merge mysql.com:/home/jimw/my/mysql-4.1-11402
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:11:49 -07:00
jimw@mysql.com
9a5560683f
Merge mysql.com:/home/jimw/my/mysql-4.1-10724
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-01 17:10:35 -07:00
jimw@mysql.com
8d591d0189
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-01 17:08:38 -07:00