serg@sergbook.mysql.com
cb58a3330f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-05 14:14:30 +02:00
wax@kishkin.ru
22639defce
replace position names and testes
...
fixed bug
2005-01-05 17:14:29 +05:00
serg@sergbook.mysql.com
7a183dd3b1
mysql-test/mysql-test-run.sh
...
report test mode if case of failure (default/ps-protocol/embedded)
2005-01-05 14:09:31 +02:00
wax@mysql.com
e010add538
Merge
2005-01-05 16:31:20 +05:00
wax@kishkin.ru
795736fad6
WL#964
...
_stricmp was replaved on sting_compare_func
added breakes for windows
2005-01-05 16:26:53 +05:00
kent@mysql.com
de85fdb78f
mysql_test_run_new.dsp:
...
Link mysql_test_run_new as console application
my_manage.c:
The type intptr_t isn't defined for VC 6.0
Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
Added regex to additional build types for mysqltest
mysqldump.dsp:
Added mysys.lib for linking mysqldump
2005-01-04 23:07:29 +01:00
monty@mysql.com
d35d4eab91
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-03 21:14:20 +02:00
kent@mysql.com
c725e09089
mtr_process.pl:
...
Added missing stop_reap_all() if returns early from function
mysql-test-run.pl:
Improved output from --script-debug
Initial Cygwin support
Improved mysqld process termination
2005-01-03 16:54:08 +01:00
kent@mysql.com
dd19a613bc
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-03 16:49:55 +01:00
wax@mysql.com
8a73a86e94
Merge mysql.com:/home/wax/mysql/mysql-4.1
...
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-03 18:38:37 +05:00
wax@kishkin.ru
dc6a186659
WL#964
...
added sort of file names for all OS
2005-01-03 18:37:08 +05:00
kent@mysql.com
97f5cac93c
mysql-test-run.pl:
...
Added initial support for multiple test suites
Added usage information, i.e. --help
2005-01-02 16:57:21 +01:00
monty@mysql.com
1cd4c06874
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-01-02 15:25:47 +02:00
serg@sergbook.mysql.com
2c6bc59307
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-01-02 12:33:42 +02:00
kent@mysql.com
27a2ba89c1
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-01 19:31:55 +01:00
kent@mysql.com
dc175d4665
mysql-test-run.pl:
...
Added --ps-protocol and --embedded-server
2005-01-01 19:27:41 +01:00
serg@sergbook.mysql.com
203cc19e48
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2004-12-31 18:00:49 +01: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
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01: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
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
kent@mysql.com
9d860c060b
Many files:
...
Perl version of mysql-test-run
new file
2004-12-30 16:34:01 +01: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
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
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
igor@rurik.mysql.com
d3fa245363
subselect.result, subselect.test:
...
Added test cases for bug #7351 .
item_cmpfunc.cc:
Fixed bug #7351 : incorrect result for a query with a
subquery returning empty set.
If in the predicate v IN (SELECT a FROM t WHERE cond)
v is null, then the result of the predicate is either
INKNOWN or FALSE. It is FALSE if the subquery returns
an empty set.
item_subselect.cc:
Fixed bug #7351 : incorrect result for a query with a
subquery returning empty set.
The problem was due to not a quite legal transformation
for 'IN' subqueries. A subquery containing a predicate
of the form
v IN (SELECT a FROM t WHERE cond)
was transformed into
EXISTS(SELECT a FROM t WHERE cond AND (a=v OR a IS NULL)).
Yet, this transformation is valid only if v is not null.
If v is null, then, in the case when
(SELECT a FROM t WHERE cond) returns an empty set the value
of the predicate is FALSE, otherwise the result of the
predicate is INKNOWN.
The fix resolves this problem by changing the result
of the transformation to
EXISTS(SELECT a FROM t WHERE cond AND (v IS NULL OR (a=v OR a IS NULL)))
in the case when v is nullable.
The new transformation prevents applying the lookup
optimization for IN subqueries. To make it still
applicable we have to introduce guarded access methods.
2004-12-25 19:17:57 -08:00
Sinisa@sinisa.nasamreza.org
ca74ce3398
additional 4.0 -> 4.1 merge !!
2004-12-25 00:07:22 +02:00
Sinisa@sinisa.nasamreza.org
f385e79ad4
4.0 -> 4.1 merge
2004-12-24 23:07:10 +02:00
dlenev@mysql.com
71da86aa11
Manual merge of changes making GRANTs, which change SSL attributes and/or
...
user limits to behave well on 5.0 tables, into 4.1 tree.
2004-12-23 22:16:43 +03:00
Sinisa@sinisa.nasamreza.org
d110146252
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-12-23 21:11:31 +02:00
Sinisa@sinisa.nasamreza.org
3c5a325897
Fix for a bug #7495
2004-12-23 21:08:54 +02:00
dlenev@mysql.com
caade862ae
Make GRANTs, which change SSL attributes and/or user limits,
...
to behave well on 5.0 tables (well now you can't use tables from 4.1
and 5.0 with 4.0 because former use utf8, but still it is nice to have
similar code in acl_init() and replace_user_table()).
This also will make such GRANTs working in 5.0 (they are broken now).
2004-12-23 21:59:36 +03:00
serg@serg.mylan
d38db21048
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-12-23 17:40:22 +01:00
serg@serg.mylan
7960b09bca
incorrect result fixed
2004-12-23 17:32:29 +01:00
bar@mysql.com
b236841890
Take charsets from the source directory rather than
...
from the install directory.
2004-12-23 13:52:25 +04:00
tomas@poseidon.ndb.mysql.com
ed3e1bb006
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-12-22 22:48:31 +01:00