mskold@mysql.com
78263507ab
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
jimw@mysql.com
518f644204
Fix 'mysql_client_test' with embedded server. (Bug #9634 )
2005-04-27 17:50:48 -07:00
monty@mysql.com
b40756c27e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-28 00:41:39 +03:00
msvensson@neptunus.(none)
bdb1441a65
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 21:40:11 +02:00
sergefp@mysql.com
1d8fe5acef
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9298
2005-04-27 22:51:02 +04:00
mskold@mysql.com
5f9843aeee
Fix for avoiding gettin Invalid schema object version when doing local changes
2005-04-27 18:17:41 +02:00
ramil@mysql.com
82fc2ce8b7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b9803
2005-04-27 17:20:29 +05:00
monty@mysql.com
e18a155fd6
Fixed core dump bug when hot link list in key cache was empty. Bug #10167
2005-04-27 14:31:04 +03:00
msvensson@neptunus.(none)
631f035ee9
Merge neptunus.(none):/home/msvensson/mysql/bug9911
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 12:17:07 +02:00
Sinisa@sinisa.nasamreza.org
edf2a16049
union.result:
...
Results for the above test case
union.test:
A test case for bug #10032 involving UNION's and ORDER BY clause
sql_yacc.yy:
Fix for a bug #10032 involving a parser bug with UNION's and ORDER BY
2005-04-26 21:27:06 +03:00
monty@mysql.com
3ca23bd918
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
gbichot@quadita2.mysql.com
a95571875c
checking that statements get into binlog even when they were affecting
...
no rows of the blackhold engine (for this engine to be a binlog propagator).
NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
person who fixes the hang will correct the merged blackhole.result or ask me to).
2005-04-26 15:52:04 +02:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
msvensson@neptunus.(none)
8d370fbcf9
BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
...
- Implemented ha_archive::rename_table
- Added testcases for rename
2005-04-26 11:35:52 +02:00
mskold@mysql.com
9457551616
Fix for Bug #9318 drop database does not drop ndb tables
2005-04-22 15:28:23 +02:00
mskold@mysql.com
e0fe3e75c7
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
igor@rurik.mysql.com
20250dc497
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-04-20 15:08:22 -07:00
ingo@mysql.com
8faed37945
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 12:24:22 +02:00
mskold@mysql.com
8f7bb4eced
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-20 11:26:57 +02:00
sergefp@mysql.com
f284512ce0
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9103
2005-04-20 12:11:06 +04:00
igor@rurik.mysql.com
25c396628a
sql_select.cc:
...
Fixed bug #9681 .
The bug happened with queries using derived tables specified by
a SELECT with ROLLUP, such as:
SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
if column a of table t1 is declared as NOT NULL.
This was to the fact that the first column of the temporary table
created to contain the derived table erroneously inherited the NOT NULL
attribute from column a.
olap.result, olap.test:
Added a test case for bug #9681 .
2005-04-19 16:54:30 -07:00
mskold@mysql.com
dbd035818b
Disabled ndb tests for embedded
2005-04-19 17:23:49 +02:00
ingo@mysql.com
792b816b1b
Bug#7806 - insert on duplicate key and auto-update of timestamp
...
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
2005-04-19 15:12:32 +02:00
mskold@mysql.com
d4b862f076
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-19 12:51:20 +02:00
ramil@mysql.com
775010a40d
A fix (bug #9837 : round(1, 6) delivers wrong value in create table context).
2005-04-19 14:44:54 +05:00
mskold@mysql.com
4193a314fb
Fix for Bug #9691 UPDATE fails on attempt to update primary key
2005-04-19 11:21:26 +02:00
dlenev@brandersnatch.localdomain
91c482e4a1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 13:54:42 +04:00
sergefp@mysql.com
9fbdd4e03f
Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long
2005-04-18 07:26:23 +04:00
sergefp@mysql.com
a76ecc5bc7
Fix for BUG#9103:
...
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
2005-04-18 05:21:44 +04:00
sergefp@mysql.com
39f412d329
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9439
2005-04-17 20:56:36 +04:00
sergefp@mysql.com
5147f85c62
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-look-range
2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91
Fix for BUG#9348: when computing union of two intervals set lower bound to
...
minimum of lower bounds of two joined intervals.
2005-04-17 02:05:09 +04:00
sergefp@mysql.com
6b4e759cf7
Fix for BUG#9439:
...
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
2005-04-16 23:35:39 +04:00
ingo@mysql.com
e0e3def7c7
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 17:44:04 +02:00
ingo@mysql.com
990ebef7f6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
serg@serg.mylan
b07b5f7a6d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-14 22:09:38 +02:00
serg@serg.mylan
4757803662
merged
2005-04-14 21:31:22 +02:00
serg@serg.mylan
533e0551f2
TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
...
bug#8151
2005-04-14 18:14:54 +02:00
mleich@mysql.com
7880393b39
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/matthias/Arbeit/mysql-4.1/src-clean
2005-04-14 10:48:43 +02:00
jimw@mysql.com
0162702290
Fix ctype_ucs_binlog test when ucs2 not available
2005-04-13 09:02:12 -07:00
mleich@mysql.com
d1806d7870
Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan
2005-04-13 11:47:28 +02:00
jimw@mysql.com
3dcfc31e76
Remove references to result.es files
2005-04-12 18:04:32 -07:00
serg@serg.mylan
98601055b6
backport kill.test fix from 5.0
2005-04-11 22:36:07 +02:00
dlenev@mysql.com
b0dd388190
Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
...
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274
Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
...
function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f
ctype_collate.result, ctype_collate.test, union.result, union.test:
...
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
2005-04-10 12:40:33 +05:00
ingo@mysql.com
3add511de7
Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
...
Since 4.1 keys are compared with trailing spaces.
Thus, a "x " key can be inserted between a couple of "x" keys.
The existing code did not take this into account. Though the
comments in the code claimed it did.
2005-04-08 14:13:02 +02:00
mskold@mysql.com
817f2c6a13
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
mskold@mysql.com
813cc0eaf0
Added more tests for auto_increment
2005-04-08 11:38:40 +02:00
msvensson@neptunus.(none)
960410274c
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-07 20:21:17 +02:00