serg@sergbook.mysql.com
a9c7fb9dfd
post-merge
2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
sergefp@mysql.com
98ccc21011
Make test results independent on who runs them
2004-12-31 15:48:19 +03:00
sergefp@mysql.com
849d1203ff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
2004-12-31 15:13:48 +03:00
sergefp@mysql.com
b572374c0b
Remove display of join buffer size, test fails when someone changes the minimum
2004-12-31 15:11:07 +03:00
serg@sergbook.mysql.com
b8cbe63bfe
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2004-12-31 12:55:42 +01:00
sergefp@mysql.com
91ab26eaf1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 14:55:34 +03:00
sergefp@mysql.com
034c59ed59
Fix test results to account for difference between release BDB, debug BDB and MyISAM.
2004-12-31 14:48:11 +03:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-1339
2004-12-31 13:33:00 +03:00
sergefp@mysql.com
a09df7488d
Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 13:15:54 +03:00
monty@mysql.com
78da7196ad
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-12-31 12:05:43 +02:00
monty@mysql.com
1bd22faa05
Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag
...
This allows use to use INSERT IGNORE ... ON DUPLICATE ...
2004-12-31 12:04:35 +02:00
monty@mysql.com
e4ffff2918
Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
...
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
2004-12-31 11:56:50 +02:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
joreland@mysql.com
7f6fb4d9de
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:07:49 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f
Merge bk-internal:/home/bk/mysql-5.0
...
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1
merge
2004-12-31 06:36:32 +01:00
monty@mysql.com
5e03ebbcad
After merge fixes
...
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
dlenev@brandersnatch.localdomain
cd98fcf4e9
Merged fixes for bug #7297 "Two digit year should be interpreted
...
correctly even with zero month and day" and bug #7515 "from_unixtime(0)
now returns NULL instead of the Epoch" into 4.1 tree.
2004-12-30 23:44:42 +03:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01:00
dlenev@mysql.com
4ef7ac5c09
Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.
2004-12-30 21:37:32 +03:00
dlenev@mysql.com
2600fb3bdf
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg7297
2004-12-30 21:18:45 +03:00
dlenev@mysql.com
2878395ab1
Fix for bug #7515 "from_unixtime(0) now returns NULL instead of
...
the Epoch". (With after review fixes).
2004-12-30 21:18:10 +03:00
dlenev@mysql.com
e0280694cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2004-12-30 20:41:29 +03:00
sergefp@mysql.com
60e7950942
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-look
2004-12-30 20:10:32 +03:00
gluh@gluh.mysql.r18.ru
551456b30c
Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30)
2004-12-30 19:16:44 +03:00
kent@mysql.com
9d860c060b
Many files:
...
Perl version of mysql-test-run
new file
2004-12-30 16:34:01 +01:00
gluh@gluh.mysql.r18.ru
50266af38c
wl#1629 SHOW with WHERE(final part, after review)
...
added syntax:
'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
sergefp@mysql.com
27e0f12ff1
Fix func_concat.result: allow -0.00 to be converted to string both with and without leading minus
2004-12-30 14:56:31 +03:00
sergefp@mysql.com
38b9f73347
Fix for BUG#7264: Change the test so optimizer doesn't have to make choice between two with [nearly] identical
...
costs.
2004-12-30 14:40:24 +03:00
dlenev@brandersnatch.localdomain
d70bd3f8fb
Fix for bug #6914 "Problems using time()/date() output in expressions".
...
When we cast datetime value to DATE (TIME) type we should throw away its
time (date) part. This was not done properly if CAST() function was used
in datetime expressions.
2004-12-30 13:39:01 +03:00
dlenev@brandersnatch.localdomain
e35694802b
WL#1339. More post-merge fixes.
...
Updated test results after adding max_user_connections column
to mysql.user table.
2004-12-29 23:39:44 +03:00
dlenev@mysql.com
a8deefa3dd
Manual merge of patch implementing WL#1339 with main tree.
2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330
WL#1339 "Add per account max_user_connections limit (maximum number
...
of concurrent connections for the same account)"
Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.
(After review version).
2004-12-29 20:30:37 +03:00
mskold@mysql.com
a5204f692b
Merge
2004-12-29 10:02:03 +01:00
pem@mysql.comhem.se
b17326a3d6
Reverted previous name changes of all bug tests in sp.test, but kept the
...
robustness (dropping things just in case).
2004-12-28 16:58:14 +01:00
mskold@mysql.com
86fda80fc9
Merge
2004-12-28 14:00:00 +01:00
joreland@mysql.com
64ced8ca09
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-28 13:56:29 +01:00
timour@mysql.com
1613bf2731
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-28 13:22:39 +02:00
timour@mysql.com
064c73490b
Fix for BUG#7455.
...
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
2004-12-28 11:57:56 +02:00
lars@mysql.com
967fac4ef6
WL#2319 V2: Exclude tables from dump
...
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
timour@mysql.com
fbc96c79a1
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-27 14:06:28 +02:00
timour@mysql.com
5eab756a63
Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0.
2004-12-27 14:05:35 +02:00
igor@rurik.mysql.com
8f602f2af8
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-12-26 02:08:23 -08:00
igor@rurik.mysql.com
04974868a1
subselect.result, subselect.test:
...
Added a couple of new test cases for bug #7351 .
2004-12-26 02:04:40 -08:00