konstantin@mysql.com
8e72214d74
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/media/sda1/mysql/mysql-5.0-merge
2005-07-16 13:45:32 +04:00
konstantin@mysql.com
e08caeeee2
A fix and a test case for Bug#9359 "Prepared statements take snapshot
...
of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with
a basic constant containing variable value at fix_fields.
2005-07-16 03:29:13 +04:00
hf@deer.(none)
3ddd2771d6
Fix for bug #11708 (real function returns wrongly rounded decimal)
2005-07-07 20:28:47 +05:00
bell@sanja.is.com.ua
d3905f3d0e
Name resolution context added (BUG#6443)
2005-07-01 07:05:42 +03:00
bell@sanja.is.com.ua
a11677026f
fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BUG#7015, BUG#11387)
2005-06-17 17:27:47 +03:00
pem@mysql.comhem.se
46619fa0e3
Post review and additional fix for BUG#10968: Stored procedures: crash if long loop.
...
Fixed valgrind complaints. This fixes the memory leak problems for
procedured, and partially for functions. There's still a leak involving
results from functions that turned out to be too involved, so it will be
fixed separately.
2005-06-10 16:14:01 +02:00
igor@igor-inspiron.creware.com
83fae64323
item_func.h:
...
Identation correction for the fix of bug #9939 .
2005-06-02 10:00:32 -07:00
igor@igor-inspiron.creware.com
186e8c5891
item_func.h:
...
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
Item_func_coalesce and Item_func_ifnull now
inherit from a modified Item_func_numhybrid.
case.test, case.result:
Added test cases for bug #9939 .
2005-06-02 07:27:02 -07:00
dlenev@mysql.com
e7f29e1904
Manual merge of fix for bug #9913 into 5.0 tree.
2005-05-09 16:21:57 +04:00
msvensson@neptunus.(none)
891b64fd84
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-09 12:16:59 +02:00
msvensson@neptunus.(none)
34cec09efb
Merge neptunus.(none):/home/msvensson/mysql/bug10241
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
dlenev@mysql.com
12621f349b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg9913
2005-05-09 12:18:19 +04:00
holyfoot@hf-ibm.(none)
2c8e9df232
A lot of fixes to Precision math
...
Mostly about precision/decimals of the results of the operations
2005-05-05 20:06:49 +05:00
msvensson@neptunus.(none)
5b5565c30a
BUG#10241 cygwin port: invalid pragma interface directives
...
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
2005-05-04 15:05:56 +02:00
dlenev@brandersnatch.localdomain
8ee6d33bdd
Fix for Bug #9913 "udf_deinit is not called after execution of PS"
...
(aka "deinit is not called when calling udf from trigger").
We should call udf_deinit() function during cleanup phase after prepared
(or ordinary) statement execution instead of calling it from Item's
desctructor.
No test case is provided since it is hard to test UDF's from our test
suite.
2005-04-30 20:23:40 +04:00
monty@mysql.com
28a5491d3d
Merge with 4.1
2005-04-30 09:46:08 +03:00
monty@mysql.com
c0e8a8d625
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
monty@mysql.com
129c604032
Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598 )
2005-04-30 03:14:42 +03:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
pem@mysql.com
79cf164767
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-04-27 14:10:33 +02:00
georg@lmy002.wdf.sap.corp
7d6c12313e
fix for compile error (Windows)
2005-04-27 13:54:42 +02:00
pem@mysql.comhem.se
406ea35128
Fixed memory leak in Item_func_sp::cleanup().
2005-04-26 18:18:41 +02:00
acurtis@xiphis.org
8689083aca
Bug#9775 - Stored procedures: crash if create function that returns enum or set
...
Fix bug and implement return type casting.
2005-04-20 18:08:42 +01:00
acurtis@xiphis.org
77a9429c13
Bug#7648 - Stored procedure crash when invoking a function that returns a bit
...
bugfix 9102 corrected the crashing, this corrects the result.
2005-04-19 10:51:11 +01:00
bell@sanja.is.com.ua
dcdda90a11
Merge
2005-03-30 10:27:36 +03:00
bar@eagle.intranet.mysql.r18.ru
2a1ad57732
Merge
2005-03-25 10:43:35 +04:00
bar@mysql.com
29ffcad226
Fixed that LEFT OUTER JOIN was replaced with a regulat join
...
in some cases, because "charset(x) = 'string'" was considered
as "x is not null" due to incorrect not_null_tables().
2005-03-24 18:10:46 +04:00
bell@sanja.is.com.ua
4554b1f263
fixed union types merging and table related metadata (BUG#8824)
2005-03-23 08:36:48 +02:00
dlenev@brandersnatch.localdomain
f169114042
WL#874 "Extended LOAD DATA".
...
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.
For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;
This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
2005-03-16 04:32:47 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
1a996a7140
Cleanup for VC++
2005-03-09 21:53:04 +00:00
acurtis@ltantony.rdg.cyberkinetica.homeunix.net
be3c863ba0
Merge in fix Bug#3788
2005-03-08 22:32:09 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
5e1d2ad68c
Bug#3788
...
Crashes with stored procedure return non-string values
Also fixes Bug#2773
2005-03-04 21:14:35 +00:00
serg@serg.mylan
02d88c398f
bug#8151 - truncate leaves a transaction open
...
deadlock in MYSQL_LOG::new_file()
style fixes
2005-03-02 10:38:25 +01:00
monty@mysql.com
e2dc9b4099
Backport my_strntod() from 5.0
...
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740 )
2005-02-22 12:51:23 +02:00
mskold@mysql.com
b3d3f73753
Merge
2005-02-21 16:13:29 +01:00
monty@mysql.com
88d2e2973d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-19 19:00:41 +02:00
monty@mysql.com
218e00ac68
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
...
Lots of small fixes to multi-precision-math path
Give Note for '123.4e'
Added helper functions type 'val_string_from_real()
Don't give warnings for end space for string2decimal()
Changed storage of values for SP so that we can detect length of argument without strlen()
Changed interface for str2dec() so that we must supple the pointer to the last character in the buffer
2005-02-19 18:58:27 +02:00
mskold@mysql.com
adb94fcb2c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-02-18 13:16:25 +01:00
joerg@mysql.com
bbafcd4972
Fix a compile error (missing return value).
2005-02-17 22:32:21 +01:00
mskold@mysql.com
66343612d1
Merge
2005-02-11 22:30:37 +01:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
bell@sanja.is.com.ua
76ae5caca0
fixed column number fetchinmg for subqueries. (BUG#8020)
...
fixed cols() method call (it have to be called only after fix_fields())
2005-01-24 14:25:44 +02:00
mskold@mysql.com
7c07a2e725
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
2005-01-21 08:43:41 +01:00
monty@mysql.com
8d616390e9
After merge fixes
...
Fix for BIT(X) field as string
2005-01-15 17:38:43 +02:00
mskold@mysql.com
3edf243875
Condition pushdown to storage engine
2004-12-17 21:13:22 +01:00
monty@mysql.com
563500994a
Update results for new varchar handling
...
Fixed compiler warnings
String results in CREATE ... SELECT are now created as CHAR(0), VARCHAR(X) or TEXT() depending on item->max_length
2004-12-07 15:47:00 +02:00
serg@serg.mylan
f09429a4df
protection: TRASH in delete
...
fixed a bug that it discovered
2004-11-28 15:53:17 +01:00
monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
konstantin@mysql.com
e5f4c7a0bd
Rename: Item::val -> Item::val_real().
2004-11-11 21:39:35 +03:00
monty@mysql.com
071001950e
Merge with 4.1 to get in latest bug fixes
2004-11-04 15:06:24 +02:00
bar@mysql.com
6a3b1d443f
Many files:
...
Allow mixing of different character sets for more SQL functions.
item_func.h:
Allow mixing of different character sets for more SQL functions..
2004-11-02 16:02:12 +04:00
monty@mysql.com
afbe601302
merge with 4.1
2004-10-29 19:26:52 +03:00
bar@mysql.com
ea49a5181a
Allow to convert to non-Unicode charset when mixing a string
...
constant with a column. The string is converted into the column
character set. It conversion doesn't lose data, then operation
is possible. Otherwise, give an error, as it was earlier.
2004-10-29 16:00:03 +05: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
konstantin@mysql.com
5abc3de22b
A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)"
...
crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.
2004-10-14 02:53:59 +04:00
igor@rurik.mysql.com
71f6ab7a09
Merge for Item_equal.
2004-10-09 10:34:13 -07:00
konstantin@mysql.com
234c80b689
Deployment of centralized Item change registry, step 2: Item_ref
...
doesn't need to have it's own recovery mechanism.
2004-10-08 19:13:09 +04:00
monty@mishka.local
f2941380c4
Strict mode & better warnings
...
Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT)
2004-09-28 20:08:00 +03:00
dlenev@mysql.com
9cc2dba2ea
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-1218-a
2004-09-09 23:45:19 +04:00
pem@mysql.comhem.se
dde44b8c8c
Fixed BUG#4487: Stored procedure connection aborted if uninitialized char.
2004-09-09 19:08:54 +02:00
dlenev@mysql.com
c46e640009
Yet another manual merge with main tree for patch for WL#1218 "Triggers"
2004-09-09 19:52:10 +04:00
dlenev@brandersnatch.localdomain
9ed038dd6f
WL#1218 "Triggers". Some very preliminary version of patch.
...
Mostly needed for Monty for him getting notion what needed for triggers
from new .FRM format.
Things to be done:
- Right placement of trigger's invocations
- Right handling of errors in triggers (including transaction rollback)
- Support for priviliges
- Right handling of DROP/RENAME table (hope that it will be handled automatically
with merging of .TRG into .FRM file)
- Saving/restoring some information critical for trigger creation and replication
with their definitions (e.g. sql_mode, creator, ...)
- Replication
Already has some known bugs so probably not for general review.
2004-09-07 16:29:46 +04:00
bar@mysql.com
2c86049dec
Bug #5228 ORDER BY CAST(enumcol) sorts incorrectly under certain conditions
2004-09-07 15:42:19 +05:00
monty@mysql.com
31122efde7
Merge with 4.1
...
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
bar@mysql.com
153e18a252
Allow IN to convert arguments into Unicode in some cases.
2004-09-01 15:39:15 +05:00
serg@serg.mylan
e1237cbc53
manually merged
2004-08-18 19:57:55 +02:00
serg@serg.mylan
22ca5582d0
BUG#4393, BUG#4356 - incorrect decimals in fix_length_and_dec() in some functions
2004-07-31 22:39:10 +02:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
igor@rurik.mysql.com
64d46dfe9b
After merge fix
2004-06-25 06:48:10 -07:00
pem@mysql.comhem.se
34ddd9c515
Fixed BUG#3486: FOUND_ROWS() fails inside stored procedure [and prepared statement].
2004-06-22 19:38:07 +02:00
igor@rurik.mysql.com
356cbe4fa2
join_nested.test, join_nested.result:
...
new file
Many files:
Nested joins added.
2004-06-10 22:27:21 -07:00
pem@mysql.comhem.se
296ba0ea57
WL#1567: Add ROW_COUNT() Function to retrieve count of rows updated/inserted/deleted
2004-05-04 13:45:20 +02:00
pem@mysql.com
dfd59e296e
Merge 4.1 -> 5.0.
2004-04-07 19:07:44 +02:00
dlenev@jabberwock.localdomain
f6bff2e6c6
WL#1266 "Separate auto-set logic from TIMESTAMP type."
...
Final version of patch.
Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
2004-04-02 10:12:53 +04:00
igor@rurik.mysql.com
0dcc255b9b
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2004-03-25 12:20:33 -08:00
pem@mysql.comhem.se
6395822932
Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
...
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.
2004-03-25 17:42:13 +01:00
pem@mysql.comhem.se
13987057f6
WL#1366: Use the schema (db) associated with an SP.
...
Phase 3: Made qualified names work for functions as well.
2004-03-19 19:01:54 +01:00
bell@sanja.is.com.ua
613104ad25
merge
2004-03-18 15:21:06 +02:00
bell@sanja.is.com.ua
2b45b53066
DBUG_ASSERT(fixed == 1); added to val*
...
small optimisation in signed_literal
2004-03-18 15:14:36 +02:00
bell@sanja.is.com.ua
8035ce40ec
DBUG_ASSERT(fixed == 0) added to fix_fields()
2004-03-17 14:26:26 +02:00
bell@sanja.is.com.ua
579a94a328
after review & some other fixes
2004-03-16 20:19:36 +02:00
bell@sanja.is.com.ua
6eb403cfdc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-15 22:17:31 +02:00
konstantin@mysql.com
36120d420a
Fix of compilation failure of latest 4.1 tree: new constants in mysqld.cc
...
exceed unsigned long limit.
2004-03-15 22:39:36 +03:00
bell@sanja.is.com.ua
6fc3d9ba81
merge
2004-03-15 17:01:30 +02:00
bell@sanja.is.com.ua
8a442c4e0d
after review fix
2004-02-20 15:37:45 +02:00
igor@rurik.mysql.com
f18e0068ba
Manual merge
2004-02-19 01:09:54 -08:00
igor@rurik.mysql.com
09fa16424a
Many files:
...
After review fixes for Item_equal.
2004-02-18 22:21:37 -08:00
pem@mysql.comhem.se
b205759949
WL#1366: Use the schema (db) associated with an SP.
...
Phase 1: Introduced sp_name class, for qualified name support.
2004-02-17 17:36:53 +01:00
pem@mysql.com
c8585f3283
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
bell@sanja.is.com.ua
cefdd4fec6
merge
2004-02-09 15:49:11 +02:00
monty@mysql.com
06432eac36
Added --compact to mysqlbinlog
...
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
2004-02-09 12:31:03 +01:00
bell@sanja.is.com.ua
69e2460bd4
fixed subquery with PS (BUG#2462)
...
fixed UNION preparation
2004-02-08 20:14:13 +02:00
bell@sanja.is.com.ua
930db43eb0
correct processing of rand() in subqueries with static tables (BUG#2645)
2004-02-05 12:32:22 +02:00
hf@deer.(none)
7dda8c102f
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-19 21:06:27 +04:00
hf@deer.(none)
1f8eb40310
Code cleanup (working on PS & cleanup() code)
...
Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()
2004-01-19 19:53:25 +04:00
Sinisa@sinisa.nasamreza.org
ba029973fa
null.result, null.test:
...
Fix for a bug #2219 , regarding a bad cast to integer from NULL
item_func.h:
Fix for a bug #2219 , regarding a bad cast to integer from NULL
sql_parse.cc:
A fix for a bug #2207 , with mysql server haning on option setting
2004-01-09 22:28:29 +02:00
hf@deer.(none)
bfe134b86f
Fix for prepared statements
...
Here i added Item_*::cleanup() functions,
removed a lot of ~Item_*'s,
added code to restore order_list and group_list
2003-12-30 14:08:19 +04:00
igor@rurik.mysql.com
c236568ac9
Auto Merge
2003-12-23 02:24:12 -08:00
pem@mysql.com
99e0ae85c7
Merge 4.1 to 5.0.
2003-12-19 18:03:27 +01:00
monty@mysql.com
031390a9a4
Fixes after merge with 4.0
...
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
konstantin@mysql.com
38c454b0e4
fix for bug #1993 'bit functions do not return unsigned values'
...
introduced base class Item_func_bit for bit functions
2003-12-10 17:30:37 +03:00
igor@rurik.mysql.com
3938ac5436
This ChangeSet Introdices Item_equal.
...
The objects of this class represent multiple conjunctive equalities
in where conditions: =(f1,f2,...fn) <=> f1=f2 and f2= ... and =fn.
The objects are used to generate new possibale paths to access
the tables when executing a query.
They are also used to optimize the execution plan
chosen by the optimizer for the query.
2003-11-26 17:23:52 -08:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
monty@narttu.mysql.fi
6b79cd5c23
Merge
2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
a444a3449f
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
...
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
bell@sanja.is.com.ua
c56e75e2c1
after review fix
2003-11-03 12:28:36 +02:00
bell@sanja.is.com.ua
0747324ede
merge
2003-10-31 22:14:49 +02:00
serg@serg.mylan
b1f5a03685
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-31 14:25:38 +01:00
ram@gw.mysql.r18.ru
c5b481d99a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056
2003-10-31 13:03:12 +04:00
ram@gw.mysql.r18.ru
90ffe1be00
WL #1056 : Eliminate NOT operators from where condition
2003-10-31 13:02:16 +04:00
serg@serg.mylan
9c4049ad12
Bitmap post-review fixes
2003-10-30 19:17:57 +01:00
bell@sanja.is.com.ua
33346e26af
added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor()
...
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
2003-10-30 12:57:26 +02:00
bell@sanja.is.com.ua
ae380c5855
merge
2003-10-28 12:45:37 +02:00
serg@serg.mylan
8cdc27da15
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-10-25 00:03:44 +02:00
bell@sanja.is.com.ua
f349adf8de
support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned
...
(BUG#1484)
2003-10-24 17:28:32 +03:00
serg@serg.mylan
df69309593
MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax
2003-10-22 17:57:09 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
serg@serg.mylan
c60ef8160f
FULLTEXT: correct charset support (UTF included, UCS2 - not)
...
code cleanup
2003-10-20 15:53:48 +02:00
pem@mysql.telia.com
1f1a8531d1
Handle user variables (@-vars) as OUT and INOUT parameters in SPs.
2003-10-16 15:45:27 +02:00
bell@laptop.sanja.is.com.ua
ddf4d1e529
fixed printability of Items (all items except subselects)
...
(SCRUM) (WL#1274)
2003-10-12 17:56:05 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
989ca397b2
Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194 )
...
Use forced close of socket to make mysqld shutdown faster when used under valgrind
2003-10-03 00:40:27 +03:00
vva@eagle.mysql.r18.ru
761c790636
turn Item_func_set_user_var
...
::native_val, ::native_val_int and native_val_str into inline
2003-10-01 12:00:08 -04:00
vva@eagle.mysql.r18.ru
fd835da6ec
rewrite Item_func_set_user_var ::val, ::val_str, ::val_int, ::update
...
with less code duplication
2003-09-30 12:32:48 -04:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
bell@sanja.is.com.ua
a0bf98b7a4
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-optimized_prepared-4.1
2003-09-09 17:38:21 +03:00
monty@narttu.mysql.fi
4b3b4b9250
merge
2003-09-03 19:53:08 +03:00
serg@serg.mylan
755455e15c
merged
2003-09-03 12:07:18 +02:00
bell@sanja.is.com.ua
51374e569d
fixed BUG#1180 (changing WHERE clause of prepared statements by optimisation)
2003-09-02 19:56:55 +03:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
serg@serg.mylan
08d7f298ee
fixed a crash on COMPRESS() and other zlib-dependent functions when compiled w/o zlib
...
moved them all from different places to item_strfunc.{h,cc}
checksum table command
Com_xxx status variables updated
2003-08-21 16:15:06 +02:00
Sinisa@sinisa.nasamreza.org
fb774125e8
item_func.h:
...
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
Fix for a configure bug
multi_update.result, multi_update.test:
Fix for the update with NULL's in the result set
sql_update.cc:
Fix for the update with NULL's in the result set
Fix for the update with NULL's in the result set
Fix for the update with NULL's in the result set
2003-08-20 15:33:21 +03:00
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
bell@sanja.is.com.ua
695c71d1c1
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-07-22 11:20:02 +03:00
bell@sanja.is.com.ua
af41a59af7
merge
2003-07-22 11:18:51 +03:00
serg@serg.mylan
859a4cc116
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-18 18:06:45 +02:00
bell@sanja.is.com.ua
7e34954b5e
new optimisation for ref_null (SCRUM) (WL#818)
2003-07-17 19:39:31 +03:00
bar@bar.mysql.r18.ru
8c06421c12
CASE stores first_expr and else_expr in args[] array now.
...
This allowed to reuse a lot of code.
2003-07-17 16:07:56 +05:00
bell@sanja.is.com.ua
a6b1a6fe3a
merge
2003-07-16 13:58:11 +03:00
serg@serg.mylan
737bade99c
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-15 14:58:04 +02:00
bar@bar.mysql.r18.ru
4b9c7f8336
Item_func_field doesn't have a separate Item to store the first argument.
...
It's now passed as args[0]. This fix allowed to resuse a lot of code.
2003-07-15 17:33:00 +05:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
bell@sanja.is.com.ua
7ad5331768
merge
2003-07-07 10:30:52 +03:00
serg@serg.mylan
40f4cee265
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-07-06 21:36:59 +02:00
serg@serg.mylan
e11efbddfa
renamed enum Item_cast as it's not a 'class Item' child
2003-07-06 17:12:45 +02:00
bar@bar.mysql.r18.ru
3fbc765b04
Better arguments format to allow reuse more code
2003-07-04 19:56:32 +05:00
bar@bar.mysql.r18.ru
0c2041cfdf
New methods
...
Item_func::agg_arg_collations()
Item_func::arr_arg_collations_for_comparison()
to aggregate argument collations.
It helps to reuse a lot of code.
2003-07-04 18:12:23 +05:00
bar@bar.mysql.r18.ru
d1607a11fe
FIELD() now takes in account arguments collations
2003-07-03 19:24:38 +05:00
bell@sanja.is.com.ua
2ae8a00b2a
Item tree iterator
...
fixed dependence of items from reduced subquery
(SCRUM)
2003-07-02 13:12:18 +03:00
bell@sanja.is.com.ua
5eaaf8e732
after review changes (SCRUM)
...
removed outer resolving flag (because of movingtransformation after fix_fields)
2003-07-02 01:45:22 +03:00
monty@mashka.mysql.fi
7655f05dc2
LEFT JOIN optimization: Change LEFT JOIN to normal join if possible
2003-06-26 05:38:19 +03:00
bar@bar.mysql.r18.ru
c6c4e8b8e1
LOCATE(), INSTR(), POSITION(), FIND_IN_SET(), SUBSTRING_INDEX()
...
now process arguments according to standard SQL collation determation
rules.
2003-06-25 15:07:20 +05:00
bar@bar.mysql.r18.ru
7371150f2d
New class DTCollation (SQL:2003 calls it "declared type collation")
...
It's a combination of collation and its derivation (precedence order)
2003-06-24 15:11:07 +05:00
ram@mysql.r18.ru
a36d4212fc
Moved spatial functions to the sql/item_geofunc.cc file.
2003-05-30 15:22:34 +05:00
pem@mysql.com
386b0b91b2
Merged 4.1 into 5.0.
2003-04-16 23:23:23 +02:00
vva@eagle.mysql.r18.ru
950fa7aa8a
added compress/uncompress function
2003-04-09 20:50:30 -04:00
pem@mysql.com
c77699ca93
Merged 4.1 into 5.0.
2003-03-27 12:09:11 +01:00
hf@genie.(none)
43d3472642
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1.lck
2003-03-21 11:06:15 +04:00
pem@mysql.com
4a171efd6f
Merged 4.1 -> 5.0.
2003-03-18 16:12:50 +01:00
ram@mysql.r18.ru
031ac2a7b2
SRID support.
...
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
2003-03-18 15:30:32 +04:00
hf@genie.(none)
410782fd5f
SCRUM
...
IS_USED_LOCK('lock') implementation
2003-03-14 13:10:33 +04:00
bar@bar.mysql.r18.ru
f95eb82934
stringcmp() and sortcmp() have been unified
...
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
bar@bar.mysql.r18.ru
4ffd74e5de
Coercibility is now stored in user vars
2003-03-03 13:16:39 +04:00
bar@bar.mysql.r18.ru
3046c3ca34
Many files:
...
Coercibility, initial stage
item_func.h:
Coercibility, initial stage
2003-02-28 19:22:20 +04:00
pem@mysql.com
16cff7e75d
A small step forward. Fixed a few bugs and made string type functions work,
...
but still strange interferences between multiple function invocations...
2003-02-27 19:08:52 +01:00
monty@narttu.mysql.fi
3b073a08e0
Portability fixes
...
Don't define crc32 if we are not linking with gzip
2003-02-27 03:44:44 +02:00
pem@mysql.com
ca2e77ca7a
Made stored FUNCTION invokation work almost always. Still buggy and unstable, and
...
various known problems, but good enough for a checkpoint commit.
2003-02-26 19:22:29 +01:00
monty@mashka.mysql.fi
e327393e9d
Fixed a lot of wrong memory references as reported by valgrind
...
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
monty@mashka.mysql.fi
25de9c19b2
After merge fixes & remove compiler warnings
...
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
2003-02-07 15:47:24 +02:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
bell@sanja.is.com.ua
37d228e623
changes based on partial revie of task 577 (SCRUM)
2003-01-30 18:07:39 +02:00
bell@sanja.is.com.ua
5ed5dac01b
cyclic reference test removed, becouse testing of Item::fixed field apply more strict limitation
2003-01-30 14:35:07 +02:00
monty@mashka.mysql.fi
9e3fd09305
merge with 3.23.56 to get patches for --lower-case-table-names and
...
proper handling of SUM() in some functions.
2003-01-29 19:22:22 +02:00
bell@sanja.is.com.ua
c6beb583f6
fixed functions to be able work with group function as argument
...
made bisone 1.75 compatible code
2003-01-29 10:38:56 +02:00
monty@mashka.mysql.fi
fa7a94ed14
Added timeout for wait_for_master_pos
...
Fixed comparision of log-binary name to handle comparison when file name extension wraps from .999 to .1000
Don't replicate CREATE/DROP DATABASE if wild_xxx_table=database.% is used.
2003-01-25 15:07:51 +02:00
bell@sanja.is.com.ua
44d8a8cdab
merging
2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e
fixed subselects with temporary tables (SCRUM)
...
fixed memory leacks
2003-01-25 02:25:52 +02:00
bell@sanja.is.com.ua
372e2130e4
fixed test of cardinality
2003-01-21 13:55:26 +02:00
bar@bar.mysql.r18.ru
4f9d82700d
strnto family functions now return error in a new argument
2003-01-16 17:17:07 +04:00
monty@mashka.mysql.fi
7e9b27eaf5
Updates for multi-byte character sets
...
(Note: test 'union' fails, but Sanja promised to fix this)
2003-01-14 14:28:36 +02:00
monty@mashka.mysql.fi
f9772317ee
merge
2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
07daf3169e
Merge with 4.0.8
2003-01-03 00:04:33 +02:00
bell@sanja.is.com.ua
fe9e139056
postreview fix (SCRUM)
...
fixed layout
2002-12-28 01:01:05 +02:00
bell@sanja.is.com.ua
1dd7cb52ae
support of subselect without FROM reducing (SCRUM)
...
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
2002-12-26 01:28:59 +02:00
monty@mashka.mysql.fi
b5aa9ae0c7
Changed thd variables max_join_size and select_limit to type ha_rows.
...
This fixed some optimization problems when using -DBIG_TABLES
Portabilty fixes for OpenUnix and HPUX
Added C and C++ version numbers to mysqlbug
2002-12-20 14:58:27 +02:00
monty@mashka.mysql.fi
d49167bae5
Fixes for binary protocol (complement to last push)
...
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02:00
monty@mashka.mysql.fi
d3eb993a27
rename of net_pkg.cc to protocol.cc
...
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
monty@mashka.mysql.fi
f1d35b29bc
merge fix
2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
bell@sanja.is.com.ua
ed8cc2a844
changing in Item_row according last review (SCRUM)
2002-12-04 11:01:48 +02:00
monty@hundin.mysql.fi
8830eb4aa9
Change of internal key_field=NULL handling to avoid error messages.
...
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
2002-12-03 13:08:25 +02:00
bell@sanja.is.com.ua
c1527b6f4c
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-11-28 20:04:09 +02:00
bell@sanja.is.com.ua
eb512dced5
Item_func_equal made uniform
2002-11-28 09:11:35 +02:00
bar@bar.mysql.r18.ru
847ea719b6
New functions
2002-11-28 11:04:26 +04:00
bell@sanja.is.com.ua
ac80cc73ea
changed compare engine in basic row items (SCRUM)
...
fixed layout
2002-11-28 01:00:09 +02:00