bar@mysql.com
c6c887b990
# Bug#8785 Problem with nested concats and
...
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00
ramil@mysql.com
ec775b65f5
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b8799
2005-03-15 14:13:44 +04:00
ramil@mysql.com
46613bafbe
A fix (bug #8489 : Strange auto_increment behaviour with HEAP table).
2005-03-15 13:32:12 +04:00
patg@krsna.
d0603db72a
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.:/home/patg/test/mysql-5.0
2005-03-15 00:36:38 -08:00
patg@krsna.
24bc862456
This changeset contains changes approved in code review by
...
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully
tested on both my own workstation (Suse 9.0) and production.mysql.com.
2005-03-15 00:32:21 -08:00
sergefp@mysql.com
ce564b2d7f
Updated tests results for BUG#8510
2005-03-15 10:27:44 +03:00
sergefp@mysql.com
62465a98e2
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
...
into mysql.com:/home/psergey/mysql-5.0-bug8510
2005-03-15 09:29:54 +03:00
sergefp@mysql.com
e7e2a8c8eb
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c
WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
...
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
2005-03-15 03:46:19 +03:00
serg@serg.mylan
57adc4d740
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf
merged
2005-03-14 18:46:30 +01:00
mskold@mysql.com
7092c7dec2
WL#2353 EXPLAIN support for condition pushdown
2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 14:47:51 +01:00
serg@serg.mylan
ada959edf8
anotehr fix for Item_func_isnotnull::not_null_tables()
2005-03-14 11:04:42 +01:00
serg@serg.mylan
9248f0d714
Item_func_isnotnull::not_null_tables - return 0 if not top-level item
2005-03-13 23:56:25 +01:00
serg@serg.mylan
18343b9454
correct not_null_tables() for XOR and AND
...
correct top_level_item for XOR
2005-03-13 16:34:40 +01:00
igor@rurik.mysql.com
536728c5e8
join_outer.test:
...
Correction after manual merge.
2005-03-13 01:07:01 -08:00
igor@rurik.mysql.com
7d8b91060d
Manual merge
2005-03-13 00:40:55 -08:00
igor@rurik.mysql.com
a90d2bd97c
join_outer.result, join_outer.test:
...
Added a test case for bug #9017 .
item_cmpfunc.h:
A wrong not_null_tables method for Item_cond_xor
caused a conversion of a left join into an inner join
that was not valid.
2005-03-12 23:31:52 -08:00
serg@serg.mylan
0c31836fa5
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-12 20:17:16 +01:00
jimw@mysql.com
f463143158
Update tests and test results after merge, disable broken NDB tests
2005-03-11 15:06:03 -08:00
jimw@mysql.com
c56a00ec98
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:47:29 -08:00
jimw@mysql.com
441f863f52
Merge mysql.com:/home/jimw/my/mysql-5.0-8902
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-11 12:46:11 -08:00
jimw@mysql.com
eaea82d3af
Merge query_cache tests
2005-03-11 12:38:38 -08:00
serg@serg.mylan
a85613f62c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-11 21:37:52 +01:00
serg@serg.mylan
7b19170cf7
BUG#9101 - RELEASE/ROLLBACK TO SAVEPOINT did not forget savepoints correctly
2005-03-11 21:10:41 +01:00
jimw@mysql.com
50f9fc3368
Merge test and results
2005-03-11 11:07:32 -08:00
joerg@mysql.com
24716cba44
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-03-11 11:32:56 +01:00
joerg@mysql.com
31eb1c89ee
Keep the Perl version of 'mysql-test-run' in sync with the shell script.
2005-03-11 11:08:27 +01:00
ramil@mysql.com
ec41753240
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b9029
2005-03-11 12:30:55 +04:00
sergefp@mysql.com
f9322a85a4
Merge mysql.com:/home/psergey/mysql-4.1-bug8711
...
into mysql.com:/home/psergey/mysql-5.0-bug8711
2005-03-11 02:26:38 +03:00
sergefp@mysql.com
763039a17b
Merge
2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9
Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make
...
Item_func_equal::not_null_tables() always return 0.
2005-03-11 02:17:03 +03:00
joerg@mysql.com
2d0ecfa7c9
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2005-03-10 20:31:05 +01:00
ramil@mysql.com
ec06f3e762
a fix (bug #9029 Traditional: Wrong SQLSTATE returned for string truncation).
2005-03-10 17:08:45 +04:00
timour@mysql.com
b9c56257bb
Merge
2005-03-10 13:59:48 +02:00
timour@mysql.com
abf659dee9
Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-03-10 11:50:55 +02:00
igor@rurik.mysql.com
db4ca33f52
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-03-09 16:53:20 -08:00
igor@rurik.mysql.com
6540c59808
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-09 13:24:05 -08:00
igor@rurik.mysql.com
4406118cf8
func_str.result:
...
Correction after manual merge.
2005-03-09 13:20:52 -08:00
lars@mysql.com
20318574d4
Merge
2005-03-09 21:41:09 +01:00
igor@rurik.mysql.com
af5d21357e
Manual merge
2005-03-09 10:58:52 -08:00
serg@serg.mylan
79573a5ee8
after merge fixes
2005-03-09 19:22:30 +01:00
lars@mysql.com
5f931f472f
Fix to make mysql-test-run.pl work with new system tables definitions
2005-03-09 19:21:57 +01:00
timour@mysql.com
f489e56291
Fix for BUG#7425.
...
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
2005-03-09 16:51:03 +02:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
serg@serg.mylan
c49928447d
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-09 13:02:51 +01:00
serg@serg.mylan
1e09c15a8b
don't close binlog in the destructor - use explictit MYSQL_LOG::cleanup for this
2005-03-09 12:29:51 +01:00
igor@rurik.mysql.com
4559fb998b
func_str.result, func_str.test:
...
Added a test case for bug #8669 .
item_strfunc.cc:
Fixed bug #8669 .
Function AES_DECRYPT can return NULL value.
2005-03-09 00:15:51 -08:00
jimw@mysql.com
2b2efa4208
Add all SQL_MODE settings to proc table. (Bug #8902 )
2005-03-08 17:40:43 -08:00