andrey@lmy004.
533180d76c
WL#1034 update
...
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
- fix crash when the following is executed :
CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
(creation works as well as calling P() which creates the event).
2005-12-15 14:12:28 +01: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
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
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
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
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
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
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
marty@linux.site
0c8d641878
Fix for bug#5323, no bug, new error code
2005-11-29 22:54:16 +01: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
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
jimw@mysql.com
d0c2f3cfd6
Update list of authors with information from documentation.
2005-11-28 15:32:26 -08:00
pem@mysql.com
632d497c23
Updated show_check.result.
2005-11-28 21:27:46 +01: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
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
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
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