konstantin@mysql.com
f3e018f833
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4026
2004-06-09 03:22:55 +04:00
konstantin@mysql.com
dc11d3cfa1
Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types
...
is broken (prepared statements)": fixed date handling in many places
of prepared statements code.
2004-06-09 03:21:50 +04:00
sergefp@mysql.com
1e05e6cb82
Post review fixes for "SQL Syntax for Prepared Statements".
2004-06-07 12:09:10 +04:00
sergefp@mysql.com
dc38512390
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
konstantin@mysql.com
eaa4d106e6
Fix for Bug#3796 "Prepared statement, select concat(<parameter>,<column>), wrong
...
result": new Item_param member for use in val_str()
2004-05-31 14:21:48 +04:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
sergefp@mysql.com
d7dd97089e
Manually merged, requirees more merging
2004-05-25 08:15:50 +04:00
konstantin@mysql.com
f207b33a7b
Support for character set conversion in binary protocol: another go
...
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
connection on the fly, because they first should be written to the binary
log.
To support efficient conversion we need to rewrite prepared statements
binlogging code first.
2004-05-25 02:03:49 +04:00
sergefp@mysql.com
f75b1adece
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e
WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2)
2004-05-21 04:27:50 +04:00
bell@sanja.is.com.ua
329ac02441
assigning max_length parameter for Item_param (Bug #3811 )
2004-05-20 19:08:34 +03:00
bell@sanja.is.com.ua
71a374dc13
Merge
2004-05-14 13:33:02 +03:00
pem@mysql.com
bf45960eef
Merge 4.1 -> 5.0
2004-05-07 18:52:06 +02:00
sergefp@mysql.com
7af3097e60
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-07 03:33:39 +04:00
monty@mysql.com
939ea71ecd
Portability fixes
...
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472 )
2004-05-07 01:43:17 +03:00
sergefp@mysql.com
67ad78cb5d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-06 23:02:32 +04:00
bell@sanja.is.com.ua
3aae50e8c0
EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639 )
...
EXPLAIN of hidden SELECT of UNION
2004-05-06 20:40:21 +03:00
sergefp@mysql.com
ec33d794d8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup
2004-05-06 01:06:18 +04:00
monty@mysql.com
a5d8b846fa
after merge fixes
2004-05-05 21:24:21 +03:00
sergefp@mysql.com
7c3376229e
Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1.
2004-05-05 20:04:25 +04:00
monty@mysql.com
d21d49a32a
Merge with 4.0.19
2004-05-05 17:05:24 +03:00
sergefp@mysql.com
fdfcadc735
Manual merge for WL#1622 code, will need fixes
2004-05-05 16:10:16 +04:00
monty@mysql.com
104fdf607d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-05-05 12:40:59 +03:00
monty@mysql.com
7e3cf5958c
Fixed crashing bug with alter table when table was in use (Bug #3643 )
...
We didn't use 'only index' for tables of type 'const'. (Bug #3497 )
2004-05-05 12:31:17 +03:00
dlenev@brandersnatch.localdomain
c7fbcbca7a
Fix for remaining issues described in Bug #1664
...
"mysql_send_long_data() API call is completely broken".
Now we are resetting some members (long_data_supplied/null_value...) of Item_param to its
initial state after each execution of prepared statement. We also manipulating
Item_param::maybe_null/null_value only via Item_param::set_* setters which makes code a bit
more robust.
2004-05-04 19:08:19 +04:00
sergefp@mysql.com
b55d59fe2f
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-04-30 19:24:57 +04:00
monty@mysql.com
edc584acce
Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265 )
...
Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182 )
2004-04-28 03:37:45 +03:00
sergefp@mysql.com
194027d5d8
Merged
2004-04-13 02:18:09 +04:00
sergefp@mysql.com
5e22d6cbfc
Fix and testcase for BUG#3367.
2004-04-13 00:13:25 +04:00
monty@mysql.com
8b72dde888
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-12 01:43:07 +03:00
monty@mysql.com
dc0d2b83c2
Added function comment
2004-04-12 01:42:39 +03:00
sergefp@mysql.com
ac563b1b8e
Merge
2004-04-08 17:08:56 +04:00
bell@sanja.is.com.ua
d4f5f1b7ac
field->store resuts passing is fixed for REAL and INT for Item_param (BUG3223)
2004-04-08 11:07:37 +03:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
serg@serg.mylan
6ebf869b40
merged
2004-04-07 16:20:46 +02:00
bell@sanja.is.com.ua
61fd95d168
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
2004-04-07 15:23:05 +03:00
serg@serg.mylan
e8eda8129f
::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert()
...
Field::val_str simplification, comment
2004-04-06 21:35:26 +02:00
sergefp@mysql.com
1f8505d66f
Post-merge fixes
2004-04-05 19:52:10 +04:00
sergefp@mysql.com
a8386d01c2
Many files:
...
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
new file
2004-04-05 19:43:37 +04:00
monty@mysql.com
0013516951
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-04-05 16:28:16 +03:00
monty@mysql.com
42cf92ce37
Fixed many compiler warnings
...
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695 , #3381 and #3319 )
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
b30c28d85d
for Item_param we have to have value set instead of fave item fixed (BUG#3353)
...
fixed outer joins
test of different joins included
2004-04-03 17:23:41 +03:00
bell@sanja.is.com.ua
de502e1df2
removed unused field
...
layout fised
debug information added
2004-04-01 23:27:22 +03:00
dlenev@brandersnatch.localdomain
f38e0a935d
Merge of fix for bug #2050 and bug #3307
2004-03-31 22:17:10 +04:00
dlenev@brandersnatch.localdomain
4122188cc2
Fix for Bug #3307 "FLUSH TABLES sometimes breaks prepared statement
...
table resolution".
Added members to Item_ident for storing original db, table and field
names since those that set later from Field have shorter life-time
than required by prep. stmt. So we need to restore original names in
Item_ident::cleanup(). Also now using special construnctor for creation
of Item_field from Field object that ensures that table and field name
have big enough life-time.
"Fix" for bug #2050 "10 to 1 performance drop with server 4.1.1"
Clean ups in implementation of caching of field number in table.
Added caching of table in which field is found in find_field_in_tables().
2004-03-31 21:25:55 +04:00
monty@mysql.com
4bc6b551f8
false/true -> FALSE/TRUE
...
Fixes after last merge
2004-03-30 02:32:41 +03:00
dlenev@brandersnatch.localdomain
9e28b7698d
"Fix" for BUG #2050 "10 to 1 performance drop with server 4.1.1".
...
Actually it is not a bug but right behavior observed as pefomance
degradation after we have forced Item_field::fix_fields() to
re-execute each time when we are executing prep stmt.
This patch implements small optimization which heals this bad
behavior. We are caching field position in TABLE::field array in
Item's member and are using this position for speeding up field
lookups in fix_fields() in case of its re-execution.
2004-03-28 04:11:54 +04:00
monty@mysql.com
1448199bd7
Cleanups & safety fixes
2004-03-25 22:11:22 +02:00
hf@deer.(none)
87612b5294
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-23 17:58:55 +04:00
hf@deer.(none)
7ab1c2106d
Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
...
Problem is that Item::save_in_field modifies str_value member
before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field
2004-03-23 17:57:14 +04:00