bell@sanja.is.com.ua
c98fbc0320
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 08:43:05 +02:00
jimw@mysql.com
3d223afb28
Post-merge result file cleanup
2005-12-01 15:10:35 -08:00
evgen@moonbone.local
3f72e7645f
Fix bug#15028 Multitable update returns different numbers of matched rows
...
depending on table order
multi_update::send_data() was counting updates, not updated rows. Thus if one
record have several updates it will be counted several times in 'rows matched'
but updated only once.
multi_update::send_data() now counts only unique rows.
2005-12-01 23:22:20 +03:00
jimw@mysql.com
beed6147ad
Merge mysql.com:/home/jimw/my/mysql-4.1-13318
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:21:29 -08:00
jimw@mysql.com
fb1200a0a3
Merge mysql.com:/home/jimw/my/mysql-4.1-12612
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:07:25 -08:00
jimw@mysql.com
e7fe779ddf
Merge mysql.com:/home/jimw/my/mysql-5.0-keysize
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-01 12:03:46 -08:00
jimw@mysql.com
e86048ce59
Enable key lengths of up to 3K on 32-bit platforms.
2005-12-01 11:11:03 -08:00
SergeyV@selena.
22b43351f8
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into selena.:H:/MYSQL/src/#14902-mysql-5.0
2005-12-01 20:29:48 +03:00
bell@sanja.is.com.ua
ac26e14e99
postmerge fix
2005-12-01 17:13:54 +02:00
bell@sanja.is.com.ua
8cbf1e5119
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 17:12:42 +02:00
bell@sanja.is.com.ua
7796a79477
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:38:29 +02:00
bell@sanja.is.com.ua
e3f2a63308
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 14:29:12 +02:00
bell@sanja.is.com.ua
12d1bf1231
We should skip beggining '(' characters when test query on possibility
...
to be in the query cache. (BUG#14652)
2005-12-01 14:26:19 +02:00
ramil@mysql.com
ab04ceafc7
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-12-01 14:31:28 +04:00
ramil@mysql.com
37cfade0b4
Fix for bug #14304 : auto_increment field incorrect set from within stored procedure (insert select).
2005-12-01 14:26:46 +04:00
bell@sanja.is.com.ua
2c666b32db
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 12:16:45 +02:00
bell@sanja.is.com.ua
2ff98e0586
View creation code fixed to expect empty TABLE_LIST::table pointer (BUG#15096).
2005-12-01 12:15:48 +02:00
bell@sanja.is.com.ua
513d055076
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-01 12:04:01 +02:00
bell@sanja.is.com.ua
39689634ac
We should not skip temptable view along with other derived
...
tables during query tables registration. (BUG#15119)
2005-12-01 12:01:38 +02:00
timour@mysql.com
d80feb9e21
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-14920
2005-12-01 09:26:17 +02:00
gluh@eagle.intranet.mysql.r18.ru
1faac904f5
Fix for bug#14476 information_schema.TABLES.TABLE_TYPE with empty value
...
store TABLES.TABLE_TYPE in case of error during table opening
2005-12-01 11:00:33 +04:00
jimw@mysql.com
37ff730866
Fix union.result
2005-11-30 13:10:08 -08:00
jimw@mysql.com
70c30c8d93
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 10:18:11 -08:00
timour@mysql.com
ecb78b4d10
WL#2486 - natural/using join according to SQL:2003
...
Commented out one failing query in the regression test (reported as a bug).
2005-11-30 19:13:29 +02:00
timour@mysql.com
3b672d7e67
WL#2486 - natural/using join according to SQL:2003.
...
Implemented specialized regression test for the WL.
2005-11-30 19:06:58 +02:00
timour@mysql.com
999a73ace5
Fix for BUG#14920 Ordering aggregated result sets corrupts resultset.
...
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).
The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.
2005-11-30 12:52:12 +02:00
jimw@mysql.com
f8afbe6f0c
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-29 15:33:58 -08:00
jimw@mysql.com
f353bec511
Merge mysql.com:/home/jimw/my/mysql-4.1-14216
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-29 11:52:58 -08:00
ingo@mysql.com
76861ac6ad
BUG#5390 - problems with merge tables
...
Problem #1 : INSERT...SELECT
INSERT ... SELECT with the same table on both sides (hidden
below a MERGE table) does now work by buffering the select result.
The duplicate detection works now after open_and_lock_tables()
on the locks.
I did not find a test case that failed without the change in
sql_update.cc. I made the change anyway as it should in theory
fix a possible MERGE table problem with multi-table update.
2005-11-29 19:17:39 +01:00
knielsen@mysql.com
6246425ef1
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0
2005-11-29 14:08:49 +01:00
holyfoot@deer.(none)
655c9b93a0
test fixed
2005-11-29 16:46:51 +04:00
knielsen@mysql.com
4fc659bf49
Moved long running query to type_newdecimal-big.test
...
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
2005-11-29 13:42:45 +01:00
holyfoot@mysql.com
c60b8e3027
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.14693
2005-11-29 13:33:56 +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
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
bar@mysql.com
2b18be14ca
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b14406
2005-11-28 17:16:39 +04:00
bar@mysql.com
814f6c6cf0
grant.result:
...
After merge fix.
2005-11-28 17:06:57 +04: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
ramil@mysql.com
65e6ecb861
Fix for bug #12956 : cast make differ rounding.
2005-11-28 14:52:38 +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
kent@mysql.com
114cf11218
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-11-28 09:44:47 +01: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