hf@deer.(none)
d2bb900612
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.6117
2004-10-29 09:32:32 +05:00
bar@mysql.com
541883f9d8
Produce a "truncated" warning if a value cannot be converted
...
into the column character set on INSERT/UPDATE.
2004-10-28 15:21:20 +05:00
hf@deer.(none)
f4bc2e7f2d
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.6117
2004-10-28 11:38:59 +05:00
bell@sanja.is.com.ua
75f7235e8d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
2004-10-27 23:31:24 +03:00
bell@sanja.is.com.ua
9aa2d5f750
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps-4.1
2004-10-27 21:17:31 +03:00
bell@sanja.is.com.ua
3ae044c24f
removed incorrect error message about aggregate functions
...
improved mechanisn of detection posibility to be NULL for single row queries
switched off substitution optimisation for single row subqueries in PS due to problem in resolving substituted expressions
(changes to make subselects test working with PS protocol)
2004-10-27 21:11:06 +03:00
monty@mysql.com
3493f54a5e
Merge with 4.0
2004-10-27 19:52:41 +03:00
monty@mysql.com
d5691702d7
Fix when compiling without InnoDB
2004-10-27 18:57:49 +03:00
serg@serg.mylan
cce8f5449d
after merge fix
2004-10-26 22:41:45 +02:00
serg@serg.mylan
51d3d41e8e
merged
2004-10-26 21:12:14 +02:00
serg@serg.mylan
8dab51445e
Bug #6019 - SELECT tries to use too short prefix index on utf8 data
...
Field_string::pack should respect max_length as Field_string::pack_key does
2004-10-26 20:31:41 +02:00
monty@mysql.com
7698054d19
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-26 19:30:57 +03:00
monty@mysql.com
6fbc869d18
A lot of fixes for prepared statements (PS):
...
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
2004-10-26 19:30:01 +03:00
bar@mysql.com
a18cee7a18
Bug 6206: ENUMs are not case sensitive even if declared BINARY
...
The same problem with SET columns:
find_set() now executes find_type2() to do charset aware search,
instead of always using system_charset_info comparison.
2004-10-26 13:17:37 +05:00
gluh@gluh.mysql.r18.ru
27a658b2d9
Fix for bug #6166 : index prefix length of 0 not rejected
2004-10-26 12:16:35 +04:00
bar@mysql.com
47788e9e07
- Check ENUM/SET duplicate values taking in account charset/collation.
2004-10-26 10:41:14 +05:00
bar@mysql.com
6c4263edfb
Reuse more code: two equal pieces for ENUM and SET where moved
...
into a function.
2004-10-26 09:13:52 +05:00
bar@mysql.com
217d83a69f
Bug#6202: ENUMs are not case sensitive even if declared BINARY
2004-10-25 17:51:26 +05:00
monty@mysql.com
8b6839e644
Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound (Bug #6082 )
...
More test cases
2004-10-23 03:30:27 +03:00
serg@serg.mylan
b7a8cce4eb
test fixed
2004-10-22 23:23:02 +02:00
ingo@mysql.com
189a6bc114
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 22:34:59 +02:00
ingo@mysql.com
7916e63c5a
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 21:07:09 +02:00
konstantin@mysql.com
50c5af7bc4
Post merge fix (test results)
2004-10-22 23:05:48 +04:00
konstantin@mysql.com
659de73248
Manual merge
2004-10-22 22:55:49 +04:00
konstantin@mysql.com
e3abcb6b53
A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for
...
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX
options in case of single select.
2004-10-22 22:51:16 +04:00
monty@mysql.com
a308981257
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-22 19:51:04 +03:00
dlenev@mysql.com
0ea8f29186
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
2004-10-22 20:21:55 +04:00
monty@mysql.com
3afecef4df
Fix compiler warnings (detected by Intel's C++ compiler)
...
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094 )
2004-10-22 18:44:51 +03:00
hf@deer.(none)
497fe7f71e
Fix for bug #6117 (Centroid() crashes server)
...
I learned that one shouldn't use String::set in val_str() methods...
2004-10-22 20:32:02 +05:00
ingo@mysql.com
20cea41f76
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug6151
2004-10-22 17:03:26 +02:00
konstantin@mysql.com
33c97a499b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
2004-10-22 15:59:58 +04:00
konstantin@mysql.com
a7c52d755b
A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field
...
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
2004-10-22 14:47:35 +04:00
kent@mysql.com
7a640b44dd
mysqltest.c, mysqltest.result, mysqltest.test:
...
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
new file
2004-10-22 05:56:27 +02:00
bell@sanja.is.com.ua
ded12c828d
Check of temporary tables hiding for query fetched from QC (BUG#6084)
2004-10-21 23:56:12 +03:00
ingo@mysql.com
0d044c6869
BUG#6151 - myisam index corruption.
...
Removed the assumption of a certain key order.
Since 4.1, keys are padded with blanks for comparison.
Hence, shorter keys sort behind longer keys, if the
data bytes have values below BLANK.
2004-10-21 22:17:10 +02:00
dlenev@brandersnatch.localdomain
e6a44b719a
Fix for bug #6116 "SET time_zone := ... requires access to
...
mysql.time_zone* tables".
We are excluding implicitly used time zone tables from privilege
checking.
2004-10-21 22:18:00 +04:00
joerg@mysql.com
a7d054d18f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2004-10-21 17:57:48 +02:00
joerg@mysql.com
a77d91e82e
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2004-10-21 17:47:05 +02:00
ram@gw.mysql.r18.ru
136652522e
A fix (bug #6138 : MOD operator should not round non-integral argument).
2004-10-21 19:52:55 +05:00
joerg@mysql.com
61ca493a8d
Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'.
2004-10-21 16:02:12 +02:00
bar@mysql.com
636ddd4128
ctype_uca.result:
...
Forgot to commit in the previous changeset
2004-10-21 14:54:17 +05:00
bar@mysql.com
e9fde8f54e
Allow cp932 characters to be stored in a SJIS column
2004-10-21 12:17:59 +05:00
tomas@poseidon.ndb.mysql.com
eda3eb378d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26
fix so that ndb handler can cope with char(0), mapped to char(1) for now
2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-10-20 18:58:01 +03:00
monty@mysql.com
4e63fb9891
After merge fixes
2004-10-20 17:28:40 +03:00
monty@mysql.com
e1218474b8
Merge with 4.0
2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
2004-10-20 17:02:15 +04:00
dlenev@brandersnatch.localdomain
75d816627c
Fix for bug #6173 "One can circumvent missing UPDATE privilege if
...
he has SELECT and INSERT privileges for table with primary key"
Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
2004-10-20 16:04:43 +04:00