mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28015 commits 2791 branches 343 tags 1.7 GiB
Commit graph

9024 commits

Author SHA1 Message Date
msvensson@devsrv-b.mysql.com
75bd92f1c6 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 21:06:35 +01:00
konstantin@mysql.com
6f63650d72 Add a test case for Bug#5967 "Stored procedure declared variable 
used instead of column", the bug is to be fixed later.
 2005-12-02 22:43:56 +03:00
evgen@moonbone.local
b7d7f78fd0 query_cache.result: 
After merge fix
 2005-12-02 21:05:23 +03:00
msvensson@devsrv-b.mysql.com
17cc99470b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug11731/my50-bug11731 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 18:37:16 +01:00
msvensson@neptunus.(none)
c753df999c Bug #11731 mysqltest in multi-statement queries ignores errors in non-1st queries 
- Add tests to mysqltest.test
 - Problem no longer exists
 2005-12-02 18:29:15 +01:00
evgen@moonbone.local
00b902b065 Manually merged 2005-12-02 19:42:14 +03:00
evgen@moonbone.local
151350536c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/15028-bug-4.1-mysql
 2005-12-02 18:42:05 +03:00
pem@mysql.com
035c24beeb Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14376/mysql-5.0
 2005-12-02 15:04:50 +01:00
ramil@mysql.com
681252c82d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12956
 2005-12-02 11:57:26 +04: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
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
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
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
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
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