database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-16 03:24:47 +03:00
Code
30,150 Commits 2,984 Branches 353 Tags
Commit Graph

9884 Commits

Author SHA1 Message Date
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
andrey@lmy004.
96f9681c6f add test case with \n at EOF 2005-12-02 13:28:14 +01:00
bell@sanja.is.com.ua
68a20f3ef7 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 14:00:12 +02:00
gluh@eagle.intranet.mysql.r18.ru
e9d70e4b97 Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE 
-issue more correct message for incorrect date|datetime|time values
  -ER_WARN_DATA_OUT_OF_RANGE message is changed
  -added new error message
 2005-12-02 15:01:44 +04: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
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
elliot@mysql.com
36c45752e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/emurphy/src/mysql-5.1-new
 2005-12-02 06:16:24 +01:00
elliot@mysql.com
66a5dfa62f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/emurphy/src/mysql-5.1-new
 2005-12-02 01:23:26 +01:00
elliot@mysql.com
36936ecd64 BUG#15406: Adding support for transactions to blackhole. 
Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.
 2005-12-02 01:11:49 +01:00
jimw@mysql.com
01ac5172dd Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-01 15:14:51 -08:00
jimw@mysql.com
3d223afb28 Post-merge result file cleanup 2005-12-01 15:10:35 -08:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0 
into  selena.:H:/MYSQL/bkt/mysql-5.1
 2005-12-01 23:47:44 +03: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
timour@mysql.com
27e962764d Merge mysql.com:/home/timka/mysql/src/5.1-virgin 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
 2005-12-01 14:47:02 +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
gluh@eagle.intranet.mysql.r18.ru
21cc3ae561 Fix for bug#11491 Misleading error message if not NULL column set to NULL, 
SQL mode TRADITIONAL
  Message is chenged from 'ER_WARN_NULL_TO_NOTNULL' to 'ER_BAD_NULL_ERROR'
 2005-12-01 15:30:11 +04: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
timour@mysql.com
aa864660d7 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.1-dbg
 2005-12-01 12:12:24 +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
gluh@eagle.intranet.mysql.r18.ru
fb057f13fb Fix for bug#9785 SELECT privilege for the whole database 
is needed to do SHOW CREATE DATABASE
  To allow SHOW CREATE DATABASE when the user can use the database
 2005-12-01 13:04:19 +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@mysql.com
55ee78ed86 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2005-12-01 11:08:13 +04: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
0538845963 Merge mysql.com:/home/jimw/my/mysql-5.1-release 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:51:23 -08:00
jimw@mysql.com
5ccc2c0b05 After-merge cleanups to alter_table test 2005-11-30 13:41:40 -08:00
jimw@mysql.com
b3ba66495c Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:12:35 -08:00
jimw@mysql.com
37ff730866 Fix union.result 2005-11-30 13:10:08 -08:00
jimw@mysql.com
0597c510c8 Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 12:17:01 -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
patg@krsna.patg.net
094d91fdec Worklog #2983 Mysqlslap load emulator tool and accompanied test, results 
and modifications to mysql-test-run(.pl/.sh)
 2005-11-29 16:02:21 -08:00