jimw@mysql.com
eae275ea46
Disable a few failing NDB tests until they can be investigated
2005-11-29 10:22:17 -08:00
joerg@mysql.com
18a3374347
Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M51/merge-5.1
2005-11-29 17:05:48 +01:00
bar@mysql.com
23c4c3abc0
Merge mysql.com:/usr/home/bar/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2005-11-29 09:30:29 +04:00
bar@mysql.com
0f73558ee3
Merge mysql.com:/usr/home/bar/mysql-4.1.b10446
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b10446
2005-11-29 09:21:57 +04:00
pem@mysql.com
b2a9961abf
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-11-28 20:14:12 +01:00
jimw@mysql.com
9df4951acb
Merge mysql.com:/home/jimw/my/mysql-5.0-14956
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4
Merge mysql.com:/home/jimw/my/mysql-4.1-14155
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-28 10:50:23 -08:00
joerg@mysql.com
379d3ee98c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-11-28 17:26:56 +01:00
joerg@mysql.com
fc57b9c548
Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0
2005-11-28 17:17:17 +01:00
joerg@mysql.com
41e9dc8352
mysql-test/t/alter_table.test
...
Care for case-insignificant platforms (Mac OS X, Windows).
2005-11-28 17:07:54 +01:00
pem@mysql.com
341f941209
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14643/mysql-5.0
2005-11-28 15:11:26 +01:00
pem@mysql.com
df553710df
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14643/mysql-5.0
2005-11-28 13:20:15 +01:00
bar@mysql.com
8f33adc13d
Merge mysql.com:/usr/home/bar/mysql-4.1.b14406
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-11-28 15:31:11 +04:00
bar@mysql.com
5ab6d98e98
Merge mysql.com:/usr/home/bar/mysql-5.0.b14146.sep
...
into mysql.com:/usr/home/bar/mysql-5.1-new
2005-11-28 15:03:41 +04:00
bar@mysql.com
63b038f2e6
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 12:45:40 +04:00
serg@serg.mylan
8d6811def7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-27 09:39:45 +01:00
igor@rurik.mysql.com
5c93bf90f3
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into rurik.mysql.com:/home/igor/mysql-5.0
2005-11-26 13:54:21 -08:00
serg@serg.mylan
1cf71d0585
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 20:56:05 +01:00
serg@serg.mylan
c246aa1635
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-11-26 20:50:22 +01:00
serg@serg.mylan
6a83b75764
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-11-26 20:23:20 +01:00
serg@serg.mylan
701de9be0a
followup for for the bug#5686
2005-11-26 19:36:11 +01:00
dlenev@mysql.com
ca8c984e50
Enabled back bunch of tests for stored routines which were disabled
...
earlier because of various features/checks missing (these features/checks
are now implemented).
2005-11-26 19:15:17 +03:00
igor@rurik.mysql.com
881e6e681c
Fixed bug #15106 .
...
A typo bug caused loss of a predicate of the form field=const in some cases.
2005-11-25 18:51:44 -08:00
konstantin@mysql.com
c779c2c809
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 19:27:20 +03:00
konstantin@mysql.com
9fd6204ad1
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
konstantin@mysql.com
f57dffe453
A fix and a test case for Bug#14410 "Crash in Enum or Set type in
...
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are
created in the statement memory root.
2005-11-25 13:25:31 +03:00
mskold@mysql.com
6d5ef98adc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-11-25 10:56:01 +01:00
mskold@mysql.com
c2acc2da99
Updated expected error
2005-11-25 10:41:22 +01:00
bar@mysql.com
e6708aa0df
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b14146
2005-11-25 10:08:00 +04:00
evgen@moonbone.local
7a21129691
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/13293-bug-5.0-mysql
2005-11-24 22:41:52 +03:00
brian@zim.(none)
802f32c1dd
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.(none):/home/brian/mysql/mysql-5.1-new
2005-11-24 11:23:44 -08:00
pem@mysql.com
01de5ef5af
Remove t3 in join_nested.test
2005-11-24 19:51:52 +01:00
pem@mysql.com
7d232f01e3
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9
Some post-merge cleaning, and made assert THD::store_globals() work at all times.
2005-11-24 19:13:13 +01:00
brian@zim.(none)
33076b8782
Its funny, I am reading through the forums and someone asks "Can I please have a REPLACE INTO, instead an INSERT INTO?" and I remember how often I have used a sed script to modify MySQL dumps to have exactly that.
...
So, use --replace and instead of getting INSERT INTO you will INSTEAD get REPLACE INTO. Buyer beward, REPLACE is a MySQL SQL, so you will not end up with a dump that can be used for other databases.
Though I hear you could just use a sed line to modify it back :)
2005-11-24 09:56:40 -08:00
evgen@moonbone.local
e093fb1fd7
Fix bug#13293 Wrongly used index results in endless loop.
...
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.
get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
2005-11-24 19:54:02 +03:00
evgen@moonbone.local
e3cab037bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14482-bug-4.1-mysql
2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44
Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
...
crash
resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.
resolve_const_item() now substitutes constants for items with
result_type == ROW_RESULT only for Item_rows.
2005-11-24 19:16:51 +03:00
timour@mysql.com
7397abc0c7
table t7 was not dropped at the end
2005-11-24 16:11:59 +02:00
tomas@poseidon.ndb.mysql.com
a2bb99397d
added missing errorcode handling in NdbIndexStat causing test failure
2005-11-24 14:57:14 +01:00
msvensson@neptunus.(none)
183bf111d0
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2005-11-24 13:16:50 +01:00
monty@mysql.com
fb82332bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/my/mysql-5.1
2005-11-24 13:36:43 +02:00
pem@mysql.com
c5475706f9
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug13729/mysql-5.0
2005-11-24 12:12:49 +01:00
tomas@poseidon.ndb.mysql.com
aeb0512e2c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2005-11-24 11:37:09 +01:00
tomas@poseidon.ndb.mysql.com
68d6b96dd0
added missing drop view at end of test
2005-11-24 09:56:48 +01:00
monty@mysql.com
188295114c
Clear variable
2005-11-24 06:17:38 +02:00
monty@mysql.com
a3436bd7de
Merge mysql.com:/home/my/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1-TDC
2005-11-24 04:08:07 +02:00
jimw@mysql.com
81cb8ad37d
Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug #14155 )
2005-11-23 17:05:59 -08:00
monty@mysql.com
aa37b75768
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-24 02:56:12 +02:00