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
monty@mysql.com
49cd04b510
Merge on pull
2004-09-09 07:26:28 +03:00
dlenev@mysql.com
9b1bc6a4d5
Merge of changes from the main tree to tree for WL#1218 "Triggers".
2004-09-08 13:29:21 +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
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
bell@sanja.is.com.ua
56d8567a3d
adding mysql.proc to table list if view contains stored procedures (BUG#5151)
2004-09-01 19:00:41 +03:00
bar@mysql.com
153e18a252
Allow IN to convert arguments into Unicode in some cases.
2004-09-01 15:39:15 +05:00
bell@sanja.is.com.ua
7682b10ee8
fixed case when real length very close to calculated (BUG#5150)
2004-08-30 22:52:50 +03:00
bell@sanja.is.com.ua
a43c40f10f
fixed printing of stored procedure functions names (BUG#5149)
2004-08-30 21:47:52 +03:00
gluh@gluh.mysql.r18.ru
510cacbb77
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(for 4.1)
2004-08-24 20:18:59 +04:00
gluh@gluh.mysql.r18.ru
1786a388e4
Fix for bug #4340 : find_in_set is case insensitive even on binary operators(2nd version)
2004-08-24 17:29:08 +04: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
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
konstantin@mysql.com
b793142c8f
Unused variables removed (many files).
2004-06-21 20:39:19 +04:00
pem@mysql.comhem.se
078f717804
Fixed BUG#3132: Stored function returns empty when used in union.
2004-06-10 17:07:53 +02: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
e3b03d7a08
* New, binlog-aware character sets support in SQL Syntax for Prepared statements.
...
* The prepared statement query is put into binary log on execution only if it is an update query.
2004-06-01 17:27:40 +04:00
pem@mysql.com
71eddc362e
Merging 4.1 to 5.0.
2004-05-26 17:04:45 +02:00
monty@mysql.com
cd3dab49cc
Merge with 4.0.20
2004-05-17 01:52:13 +03:00
monty@mysql.com
894e8fca6e
Portability fixes
2004-05-12 02:38:57 +03:00
serg@serg.mylan
8a03c1b869
bug#3612 - Item_func_div set decimals incorrectly
2004-05-11 12:19:37 +02: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
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
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
monty@mysql.com
3b34a6a2dd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-03-25 22:18:31 +02:00
monty@mysql.com
1448199bd7
Cleanups & safety fixes
2004-03-25 22:11:22 +02: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
bell@sanja.is.com.ua
b7efa3e5f6
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 13:37:30 +02:00
bell@sanja.is.com.ua
d095d4753e
after review changes
2004-03-20 13:36:26 +02: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
gluh@gluh.mysql.r18.ru
e9341da7e7
Fix for bug#1439 UDF Corruption
2004-03-19 14:35:00 +04: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
monty@mysql.com
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
ram@gw.mysql.r18.ru
99d374159a
merge
2004-03-17 18:57:51 +04:00
ram@gw.mysql.r18.ru
757cff9f9b
Code cleanup:
...
- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call
2004-03-17 18:40:04 +04:00
bell@sanja.is.com.ua
8035ce40ec
DBUG_ASSERT(fixed == 0) added to fix_fields()
2004-03-17 14:26:26 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
bell@sanja.is.com.ua
da4b43ae17
accidentaly removed empty line added
2004-03-16 21:09:47 +02:00
bell@sanja.is.com.ua
8a1675c869
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-16 20:55:51 +02:00
bell@sanja.is.com.ua
579a94a328
after review & some other fixes
2004-03-16 20:19:36 +02:00
serg@serg.mylan
ceec63f18a
EOVERFLOW moved to my_base.h - it is used not only in strtod.c
...
error message corrected
2004-03-16 16:35:47 +01:00
bell@sanja.is.com.ua
96a9d0da52
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-16 16:30:08 +02:00
ram@gw.mysql.r18.ru
f54827e5d0
Fix for the bug #3118 : Subquery and order by
2004-03-16 16:28:50 +04:00
gluh@gluh.mysql.r18.ru
8ba33d7dd3
Fix for bug#2586 Disallow global/session/local as structured var. instance names
2004-03-16 14:01:05 +04:00
bell@sanja.is.com.ua
e8a9242893
merge
2004-03-16 08:32:21 +02:00
bell@sanja.is.com.ua
ac8c1cc4be
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-16 07:40:11 +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
monty@mysql.com
012ce71c7f
Merge
2004-03-12 01:13:04 +02:00
monty@mysql.com
98fb8ea4c7
Merge with 3.23 to get patch for floor()
2004-03-12 01:12:14 +02:00
guilhem@mysql.com
cf287341cc
Fix for BUG#2921 "Replication problem on mutex lock in mySQL-4.0.18":
...
re-using unused LOCK_active_mi to serialize all administrative
commands related to replication:
START SLAVE, STOP SLAVE, RESET SLAVE, CHANGE MASTER, init_slave()
(replication autostart at server startup), end_slave() (replication
autostop at server shutdown), LOAD DATA FROM MASTER.
This protects us against a handful of deadlocks (like BUG#2921
when two START SLAVE, but when two STOP SLAVE too).
Removing unused variables.
2004-03-11 16:23:35 +01:00
vva@eagle.mysql.r18.ru
cba6ff7597
fixed Bug #3051 "FLOOR returns invalid"
2004-03-04 22:11:33 +04: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
bell@sanja.is.com.ua
14b9fa3588
revision of fix_fields() calls (BUG2838)
2004-02-18 01:08:52 +02: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
monty@mysql.com
050af89dd8
Merge with public tree
2004-02-16 10:31:05 +02:00
serg@serg.mylan
01c2ca5b8a
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
serg@serg.mylan
5914e5705c
my_atof is deleted
...
strtod from mit-threads is restored and cleaned up
2004-02-13 15:27:21 +01:00
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
pem@mysql.com
c8585f3283
Merge 4.1 into 5.0.
2004-02-10 18:44:02 +01:00
jani@ua141d10.elisa.omakaista.fi
0c6a0b9a31
Wrong type of an argument was sent to my_printf_error(), which
...
caused UDF functions to segmenation fault when they tried to
print an error during wrong usage.
2004-02-10 13:36:21 +00: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
konstantin@mysql.com
2a4cfe8b4f
merge 3.23 -> 4.0, 2003/02/06
2004-02-06 15:23:41 +03:00
monty@mysql.com
480b082cf4
merge
2004-02-05 18:14:48 +01:00
vva@eagle.mysql.r18.ru
4fbc147b2f
code and comments cleanup
2004-02-05 18:58:10 +04: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
monty@mysql.com
6bfede9639
Added SQL_SELECT::cleanup() to make it easier to reuse SQL_SELECT item's for sub selects. Needed for proper fix for bug #2479 .
...
Added 'select_to_file' class to be able to merge identical code for select_export and select_dump
2004-02-05 10:22:08 +01:00
vva@eagle.mysql.r18.ru
62f193bfdd
clean up comments
2004-02-03 18:21:48 +04:00
jani@rhols221.adsl.netsonic.fi
a70ae4375a
Fixed a bug in GREATES() and LEAST() function, that caused a core
...
dump when result was NULL.
2004-01-28 19:02:58 +02:00
hf@deer.(none)
5b32ce5b0d
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-20 21:00:29 +04:00
vva@eagle.mysql.r18.ru
12008677de
Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly"
2004-01-20 00:32:25 +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
vva@eagle.mysql.r18.ru
d7f6ced155
Fixed Bug #2338 Trigonometric arithmetic problem
...
by fixing optimizer bug with help of 'volatile' keyword
2004-01-12 22:47:26 -04:00
hf@deer.(none)
f97cc835d9
Merge deer.(none):/home/hf/work/mysql-4.1.clean
...
into deer.(none):/home/hf/work/mysql-4.1.1676
2004-01-06 20:53:23 +04:00
bar@bar.intranet.mysql.r18.ru
39559d4817
#2244 User variables collation conflict is not detected
2003-12-31 19:01:03 +04: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
monty@mysql.com
2ffbfe27eb
Merge mysql.com:/my/mysql-4.1 into mysql.com:/my/mysql-5.0
2003-12-21 19:43:23 +02:00
monty@mysql.com
0279dc4234
Portability fixes found during 5.0 test compilation
...
Fixed bug in ORDER BY on a small column (Bug #2147 )
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
2003-12-21 19:39:32 +02:00
sergefp@mysql.com
23b25675f2
Merge mysql.com:/home/psergey/mysql-5.0-latest-pull
...
into mysql.com:/dbdata/psergey/mysql-5.0-imerge-unique
2003-12-20 00:54:38 +03:00
sergefp@mysql.com
a8456e6801
Numerous small fixes to index_merge read time estimates code
2003-12-20 00:53:14 +03:00
konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03: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
jani@linux.local
ecf54df991
Fixed some minor issues, revealed by compiler warnings when using
...
BUILD/compile-pentium-debug-max
2003-12-17 19:18:01 +00:00
monty@mysql.com
e0cc6799ec
Merge with 4.0.17
2003-12-17 17:35:34 +02:00
pem@mysql.comhem.se
a7b7a40c5f
Forgot to wrap things in #ifndef NO_EMBEDDED_ACCESS_CHECKS for the embedded server.
...
Added missing cleanup in sp-security.test.
2003-12-16 14:15:27 +01:00
pem@mysql.comhem.se
07541b6abf
WL#1365: Implement definer's rights execution of stored procedures.
...
(Also put the hostpart back in the definer column.)
2003-12-13 16:40:52 +01:00
konstantin@mysql.com
124c4ca346
cleanup: if there is return from if-part, we don't need else statement
2003-12-10 22:26:31 +03:00
igor@rurik.mysql.com
e235d796c9
Merge
2003-12-01 18:47:19 -08:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02: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
monty@mysql.com
73fe3812e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2003-11-23 15:35:43 +02:00
monty@mysql.com
7c725b2486
Fixed compiler warnings from Intel compiler in Win64
...
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown
2003-11-23 14:36:41 +02:00
dlenev@mysql.com
baa6ee20b2
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg1500-2
2003-11-23 00:48:59 +03:00
dlenev@dlenev.mshome
625371f306
Fix for bug #1500 "Server crash with mysql_prepare"
...
We treat Item_param whose value is not set as non-const.
This allows us to avoid use of Item_param's value (not yet existing) in
those fix_fields and fix_length_and_dec that do calculations if their
Items arguments are const. So we can call fix_fields for such items from
mysql_prepare safely.
2003-11-23 00:48:18 +03:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
bell@sanja.is.com.ua
b404412877
changed name of bit on more descriptive (after rewie change)
2003-11-18 22:04:01 +02:00
bell@sanja.is.com.ua
3ae908c44b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 17:48:06 +02:00
monty@mashka.mysql.fi
e5d75fb984
merge
2003-11-18 13:51:48 +02:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
bell@sanja.is.com.ua
cb19ad9ac1
fixed using 'uncachable' tag and RAND_TABLE_BIT setting
2003-11-17 20:53:40 +02:00
greg@mysql.com
42e36fea12
Fixed minor compiler errors encountered during pre-final builds.
2003-11-12 03:38:46 -05:00
konstantin@mysql.com
eb3c90095a
Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-11-05 14:35:20 +03:00
monty@narttu.mysql.fi
4e4725377d
Merge with 4.0
2003-11-04 09:40:36 +02: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
konstantin@oak.local
e3bf30fdfb
follow-up to Sanja fix:
...
fix_fields() never accepts (THD *)(0)
2003-10-31 17:52:00 +03: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
bell@sanja.is.com.ua
934fa2a104
Merge
2003-10-22 20:52:47 +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
gluh@gluh.mysql.r18.ru
f602be8d3f
Fix for bug #1271 : Undefined variable in PASSWORD() function is not
...
handled correctly
2003-10-21 15:14:06 +05:00
serg@serg.mylan
f944fd4a65
merged
2003-10-21 11:58:43 +02:00
serg@serg.mylan
c60ef8160f
FULLTEXT: correct charset support (UTF included, UCS2 - not)
...
code cleanup
2003-10-20 15:53:48 +02:00
serg@serg.mylan
50d9b95b77
merged
2003-10-15 12:25:44 +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@mashka.mysql.fi
c60a75e9ba
Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL)
2003-10-11 23:26:39 +03:00
serg@serg.mylan
8cc3951c8f
key_map with more that 64 bits width
2003-10-11 13:06:55 +02: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
guilhem@gbichot2
d099c0ed40
Had mangled the order of if()s in a previous changeset (1.1596) (not pushed),
...
correcting it now. Thanks Dmitri for spotting this.
2003-10-02 16:19:33 +02:00
guilhem@gbichot2
2f11e5d1d3
fix for BUG#1331: "Unexistent user variable is not replicated".
...
When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).
2003-10-02 10:31:37 +02: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
bell@laptop.sanja.is.com.ua
9f7b900014
Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-udf-5.0
2003-09-28 12:00:30 +03:00
bar@bar.mysql.r18.ru
9b4b9f91de
CHARSET_INFO::instr was extended to return more substring match results:
...
- offset of substr begining
- offset of substr end
- number of characters (MB compatible)
2003-09-25 13:35:21 +05:00
vva@eagle.mysql.r18.ru
fd2925b7c7
fixed bug #1194
...
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)
2003-09-24 19:30:20 -04:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
bar@bar.mysql.r18.ru
1c5b5ee0ec
Merge abarkov@build.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-09-19 15:19:15 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb
Fixed that multibyte charsets didn't honor multibyte
...
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
2003-09-19 15:18:19 +05:00
hf@deer.(none)
a2dbfaefa3
SCRUM
...
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
bell@sanja.is.com.ua
8554796252
new UDF arguments interface (WL#1017) (SCRUM)
2003-09-13 17:47:59 +03: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
monty@narttu.mysql.fi
381202354b
Fixed unlikely stack bug when having a BIG expression of type 1+1-1+1-1... in certain combinations. Bug #871
2003-08-27 20:00:18 +03:00
monty@narttu.mysql.fi
66b160c253
vio ssl structure renames (to get rid of ending _)
...
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +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
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
a0fda66f00
merge
2003-08-11 11:51:33 +03:00
monty@mashka.mysql.fi
1279f9b024
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1
2003-08-07 21:19:43 +03:00
monty@mashka.mysql.fi
d78830457b
Fix that -integer works as in 4.0
2003-08-07 20:42:26 +03:00
bar@bar.mysql.r18.ru
a60acfcfe0
Old style charset() and set_charset() were removed.
2003-08-05 12:52:37 +05:00
bell@sanja.is.com.ua
659650b4ea
merge
2003-08-05 09:56:21 +03:00
bar@bar.mysql.r18.ru
708ddc3a3b
Fix:
...
CREATE TABLE t1 (s1 CHAR(5) COLLATE latin1_german2_ci);
INSERT INTO t1 VALUES ('Ü');
SELECT FIELD('ue',s1) FROM t1;
The above returned 0 in error.
Now 1 is returned.
2003-08-05 11:26:31 +05:00
bar@bar.mysql.r18.ru
544f96f0fe
fix_fields recoursion didn't stop when some level's fix_length_and_dec
...
produced an error. This led to server crash in some cases, e.g.:
create table t7 (s1 char);
select * from t7
where concat(s1 collate latin1_general_ci,s1 collate latin1_swedish_ci)
= 'AA';
2003-08-05 10:08:16 +05:00
bell@sanja.is.com.ua
af41a59af7
merge
2003-07-22 11:18:51 +03:00
serg@serg.mylan
3ca302dbac
bug #715 : SELECT YEAR+0 FROM foobar is parsed as 'SELECT' 'YEAR' '+0' => syntax error
2003-07-20 12:26:18 +02: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
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
monty@mashka.mysql.fi
e1aa90a9bf
Safety and speedup fixes:
...
Changed is_open() to work as before.
Added back inited argument to LOG
2003-07-14 10:12:05 +03:00
bell@sanja.is.com.ua
a7cd3c66b7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
2003-07-13 13:04:59 +03:00
guilhem@mysql.com
fbebac9a48
Fix for BUG#791:
...
a safer way of initing the mutexes in MYSQL_LOG.
is_open() is now always thread-safe.
See each file for details.
2003-07-11 14:26:44 +02: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
monty@mashka.mysql.fi
ebcc7b5a4f
Support for variables with components
...
Added framework to create/drop and manager buffers for multiple key caches
2003-07-06 19:09:57 +03:00
bar@bar.mysql.r18.ru
d209cf70f8
More code was reused
2003-07-04 20:19:07 +05: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
73fdf52fa2
merged
2003-07-03 11:59:57 +03:00
bar@bar.mysql.r18.ru
74b74ad5e7
There is no Item->binary() anymore. It was remain from 4.0.
2003-07-02 18:34:43 +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
ca2913a07e
Merge with 3.23 tree to get latest bug fixes
2003-07-01 15:02:16 +03:00
bar@bar.mysql.r18.ru
65335d37ff
New messages for 3-adic and N-adic operations
...
REPLACE() now processed arguments collations according to standard
2003-06-26 15:45:04 +05: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
vva@eagle.mysql.r18.ru
5722ae6627
fixed bug with type of user variables (bug #551 )
2003-06-25 21:11:23 -04:00
bar@bar.mysql.r18.ru
e009dce0c3
item_func.cc:
...
My stupid typo fix
2003-06-25 19:50:27 +05: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
cb4539e8de
String comparison functions now use the same DTCollation with
...
CONCAT() and other string functions. This allows to reuse a lot
if code and to simplify further development.
2003-06-24 17:12:07 +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
serg@serg.mylan
b387b5add9
fulltext and left join bug fixed
2003-06-16 23:05:45 +02:00
ram@mysql.r18.ru
a36d4212fc
Moved spatial functions to the sql/item_geofunc.cc file.
2003-05-30 15:22:34 +05:00
monty@mashka.mysql.fi
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
monty@mashka.mysql.fi
6aa8929cf3
After merge fixes
...
Added initialization of all important global variables
2003-05-21 21:39:58 +03:00
bar@bar.mysql.r18.ru
5b788e660a
A separate, better error message when it's impossible to aggregate strings for some operation
2003-05-20 16:36:59 +05:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
vva@eagle.mysql.r18.ru
afd581edd3
made lex a pointer in THD
2003-05-05 14:54:37 -04:00
serg@serg.mylan
356b7f62fb
count_bits() moved to mysys/
2003-05-04 18:43:07 +02:00