jimw@mysql.com
50f9fc3368
Merge test and results
2005-03-11 11:07:32 -08: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
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
af5d21357e
Manual merge
2005-03-09 10:58:52 -08: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
6121422820
sql/mysqld.cc
...
preserve backward compatibility
2005-03-09 13:41:57 +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
marko@hundin.mysql.fi
fa001505e3
mysqld.cc:
...
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
5a2c426eb8
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 19:47:49 +01:00
serg@serg.mylan
9272081ebb
BUG#6635 - test_if_skip_sort_order() thought it can skip filesort
...
for fulltext searches too
2005-03-08 19:45:55 +01:00
joerg@mysql.com
a67b670a08
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/merge-4.1
2005-03-08 14:30:17 +01:00
joerg@mysql.com
28b65497da
Manual merge, no effect on 4.1.
2005-03-08 14:17:57 +01:00
jimw@mysql.com
df84c534dd
Flush entries from the query cache for tables used in
...
administrative statements that may alter the table, such
as REPAIR TABLE. (Bug #8480 )
2005-03-07 18:15:19 -08:00
gluh@gluh.mysql.r18.ru
00449b8f9c
Fix for bug#8978 : Crash on 'select format ...'
2005-03-07 18:56:18 +03:00
serg@serg.mylan
c36fa576c6
additional safety
2005-03-07 16:45:19 +01:00
serg@serg.mylan
d6fa7288c8
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-07 14:28:10 +01:00
serg@serg.mylan
2472810489
Fixed crash if max_connections is exceeded. BUG#8996
2005-03-07 13:59:28 +01:00
joerg@mysql.com
88773a8c8d
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-03-07 11:46:31 +01:00
mskold@mysql.com
ce87085294
Review fixes for Bug #8753 Invalid schema
...
object version after dropping index
2005-03-07 10:53:16 +01:00
joerg@mysql.com
ab271b4d84
Manual merge.
2005-03-07 10:29:50 +01:00
joerg@mysql.com
c45cfb7c07
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
2005-03-07 10:27:20 +01:00
mskold@mysql.com
6fc6a7521a
Fix for Bug #8753 Invalid schema object version after dropping index
2005-03-07 10:21:38 +01:00
igor@linux.local
6d7862aeaf
logging_ok:
...
Logging to logging@openlogging.org accepted
func_group.result, func_group.test:
Added a test case for bug #8893 .
opt_sum.cc:
A misplaced initialization for the returned parameter
prefix_len in the function find_key_for_maxmin caused
usage of a wrong key prefix by the min/max optimization
in cases when the matching index was not the first index
that contained the min/max field.
2005-03-04 20:24:13 -08:00
marko@hundin.mysql.fi
a8aced1e64
ha_innodb.cc:
...
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
will commit at every 10,000 copied rows.
2005-03-04 15:53:05 +02:00
bar@mysql.com
7e8e033290
type_blob.result, func_system.result, func_str.result, ctype_collate.result:
...
fixing test results accordingly.
func_system.test:
New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
safe_charset_converter() was added for system constants.
item_strfunc.cc:
safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
Bug#8291: Illegal collation mix with USER() function.
After discussion with PeterG and Serge, a new coercibility
level for "system constants" was introduced, between
COERRIBLE and IMPLICIT. Thus:
SELECT col1 = USER() FROM t1; - is done according to col1 collation.
SELECT 'string' = USER(); - is done according to USER() collation.
At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
Version is a system constant too.
2005-03-04 14:20:49 +04:00
joerg@mysql.com
136c1ea181
Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked
...
to 'libmysql/net.c'.
2005-03-04 11:07:56 +01:00
ingo@mysql.com
b5775ee16c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 09:35:21 +01:00
serg@serg.mylan
f2c414e024
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-04 00:05:52 +01:00
serg@serg.mylan
3de51f273b
after merge fixes
2005-03-03 23:57:48 +01:00
serg@serg.mylan
08d5ef6507
typos fixed
2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
serg@serg.mylan
45641ff65c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-03 21:13:57 +01:00
serg@serg.mylan
f84bd700b3
uninit variable fixed
2005-03-03 21:13:33 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
jimw@mysql.com
0e8a5dbe08
Merge mysql.com:/home/jimw/my/mysql-4.1-3309
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:20 -08:00
sergefp@mysql.com
00a560c727
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bugs
2005-03-03 05:04:00 +03:00
sergefp@mysql.com
eeae2c4dee
Comments added
2005-03-03 05:03:21 +03:00
jimw@mysql.com
5d2bedc391
Fix bug in checking of table-specific grats that caused IP/NETMASK
...
hostnames to not be matched correctly. (Bug #3309 )
2005-03-02 16:30:24 -08:00
ramil@mysql.com
89d44e039e
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-03-02 20:04:38 +04:00
ramil@mysql.com
89a105abc5
a fix for --ps-protocol (bug #6089 : FOUND_ROWS returns wrong values when no table/view is used)
2005-03-02 20:00:48 +04:00
guilhem@mysql.com
c6f1a2e453
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-03-02 11:38:38 +01:00
guilhem@mysql.com
11a1c83c03
Fix for BUG#8325 "Deadlock in replication thread stops replication":
...
in slave SQL thread: if a transaction fails because of InnoDB deadlock or innodb_lock_wait_timeout exceeded,
optionally retry the transaction a certain number of times (new variable --slave_transaction_retries).
2005-03-02 11:29:48 +01:00
marko@hundin.mysql.fi
af2999b753
InnoDB: Commit inserts to the temporary tables created by
...
CREATE INDEX and DROP INDEX every 10,000 rows,
similar to ALTER TABLE.
2005-03-01 16:09:22 +02:00
jani@ua141d10.elisa.omakaista.fi
530b12166e
Fixed Bug#7906, "Cmdline help for mysqld --ansi option misses some info".
2005-03-01 14:13:25 +02:00
ramil@mysql.com
c862c11aab
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 14:19:32 +04:00
ramil@mysql.com
8f90906961
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b6089
2005-03-01 12:31:05 +04:00
ramil@mysql.com
4225b8e8ff
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b5615
2005-03-01 12:20:55 +04:00
sergefp@mysql.com
d2fec05179
Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uint
...
depending on ref->unsigned_flag. Item_int_with_ref can refer to both signed and
unsigned integers.
2005-02-28 23:50:06 +03:00
sergefp@mysql.com
a6ad8a4d0f
Fix for BUG#8726: In JOIN::optimize on ER_TOO_BIG_SELECT error set JOIN::error to -1 to cause
...
the error to be sent to the client.
2005-02-28 20:21:21 +03:00