Commit graph

540 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
pem@mysql.com
736e78251e Merging 4.1 to 5.0. 2003-04-04 13:45:35 +02:00
wax@kishkin.ru
74e32241c4 Auto merged 2003-04-02 18:15:16 +06:00
hf@genie.(none)
0ee0589e93 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-31 13:42:37 +05:00
pem@per-erik-martins-dator.local
64552a658d Implemented DEFAULT for DECLARE variables. 2003-03-30 13:25:43 +02:00
bar@bar.mysql.r18.ru
e805e8c8c7 sql_yacc.yy:
Fix for possible failure reason on big-endian machines
  ,
2003-03-28 18:18:26 +04:00
monty@mashka.mysql.fi
ef4db1377f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-03-27 14:17:51 +02:00
monty@mashka.mysql.fi
7d09120105 After merge fixes 2003-03-27 14:15:42 +02:00
pem@mysql.com
c77699ca93 Merged 4.1 into 5.0. 2003-03-27 12:09:11 +01:00
bar@bar.mysql.r18.ru
0989db3e90 More OpenGIS compatibility:
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
2003-03-27 13:09:09 +04:00
monty@mashka.mysql.fi
3bed7a6131 Merge with 4.0.13 2003-03-26 18:37:38 +02:00
pem@mysql.com
2578564725 Added IF EXISTS to DROP PROCEDURE|FUNCTION.
Changed another unecessary use of Item_string into LEX_STRING (in sp_pcontext).
2003-03-26 12:29:58 +01:00
bar@bar.mysql.r18.ru
3a453df6c2 Two separate commands: SHOW COLLATION and SHOW CHARACTER SET 2003-03-25 13:38:05 +04:00
bar@bar.mysql.r18.ru
8f86a0d3f6 sql_yacc.yy:
Reduce/reduce conflict
  fix.
2003-03-21 15:44:15 +04:00
bar@bar.mysql.r18.ru
c8954520ba COLLATE precedence bug has been fixed:
"a LIKE b COLLATE c"  worked as "(a LIKE b) COLLATE c" which is not right
2003-03-21 12:04:08 +04:00
bell@sanja.is.com.ua
2a410e95db Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0
2003-03-21 10:03:43 +02:00
bar@bar.mysql.r18.ru
682435db72 A separate variable national_charset_info
Fixes according coercibility tables, p162, SQL Complete
2003-03-21 11:21:01 +04:00
hf@genie.(none)
d00b3ba511 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
2003-03-21 10:06:04 +04:00
hf@genie.(none)
dd49c33f20 SCRUM
two versions of KILL implementation
2003-03-21 09:37:01 +04:00
bar@bar.mysql.r18.ru
6814c8d36a SELECT N'string' 2003-03-20 22:01:03 +04:00
bar@bar.mysql.r18.ru
818ddf850b NATIONAL CHARACTER VARYING(n)
NATIONAL CHAR VARYING(n)
NCHAR VARYING(n)

are now aliases for

VARCHAR(n) CHARACTER SET utf8
2003-03-20 20:04:21 +04:00
bar@bar.mysql.r18.ru
f187ed9efb NCHAR(n) and NATIONAL CHARACTER(n)
is now synonim for
CHARACTER(n) CHARACTER SET utf8
2003-03-20 19:31:01 +04:00
bar@bar.mysql.r18.ru
77fb60e9fc New syntax for character strings:
SELECT _latin1 0x345678;
SELECT _latin x'345678';
2003-03-20 19:11:15 +04:00
monty@narttu.mysql.fi
9f200ede0d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
monty@narttu.mysql.fi
386411b5ba Allow optimzation of multi-table-update also for InnoDB tables
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times
2003-03-19 00:45:44 +02:00
pem@mysql.com
4a171efd6f Merged 4.1 -> 5.0. 2003-03-18 16:12:50 +01:00
bar@bar.mysql.r18.ru
8103c4c537 CONVERT class was removed 2003-03-18 17:01:32 +04: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
bar@bar.mysql.r18.ru
9ed0bb2156 sql_yacc.yy:
SET NAMES BINARY now works
2003-03-18 10:02:57 +04:00
wax@kishkin.ru
12f1cb55b5 This is full commit of group_concat with support subselects 2003-03-18 04:07:40 +05:00
bar@bar.mysql.r18.ru
04db86f22a 2003-03-17 21:56:34 +04:00
monty@narttu.mysql.fi
e7288f279e After merge fixes
Don't create temporary objects with no table name
2003-03-17 15:05:04 +02:00
mysql@home.(none)
c6efa7a8b7 New function my_charset_same() 2003-03-16 17:19:24 +04:00
bar@bar.mysql.r18.ru
b009386fa4 Every charset now have its own parser state arrays 2003-03-14 18:08:12 +04:00
gluh@gluh.mysql.r18.ru
3d61d2d973 Conflicts relsolving 2003-03-11 16:32:17 +04:00
gluh@gluh.mysql.r18.ru
e7f4bf5b27 Added 'PURGE LOGS BEFORE' command
Added expire-logs-days option
2003-03-11 13:49:06 +04:00
Sinisa@sinisa.nasamreza.org
3ee8d6e37e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-03-07 21:48:22 +02:00
Sinisa@sinisa.nasamreza.org
4d4ac0ede3 An interim code cleanup.
Major re-write of code yet has to be done, to circumvent
assigning of UNIT to current select and to deal better with 
offset, limit.
2003-03-07 21:47:04 +02:00
bar@bar.mysql.r18.ru
d09d2b85fe New syntax to change client collation:
SET COLLATION latin1
SET COLLATION 'latin1'
SET COLLATION DEFAULT
2003-03-07 11:54:26 +04:00
bell@sanja.is.com.ua
95c4b297b6 do not allow to cache queries with INTO clause 2003-03-06 17:37:12 +02:00
pem@mysql.com
12f771d9e7 Improved error handling regarding SPs (with info like names etc in the output).
Disabled queries in FUNCTIONs.
2003-03-05 19:45:17 +01:00
bar@bar.mysql.r18.ru
f5d6b4952f New fields in CHARSET_INFO structure to optimize searching for
binary and primary collations in the future
2003-03-05 16:43:10 +04:00
bar@bar.mysql.r18.ru
4f930a7c2a SET NAMES has been extended to support optional collation:
SET NAMES <charset name> [COLLATE <collation name>]
2003-03-05 12:37:39 +04:00
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
pem@mysql.com
8049daf202 Made FUNCTIONs work in insert and select queries, as well as nested function invocations.
Had to add a cahing mechanism which is in parts an ugly kludge, but it will be
reworked once the real SP caching is implemented.
2003-03-02 19:17:41 +01:00
bar@bar.mysql.r18.ru
f9bf53fa67 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
ram@mysql.r18.ru
8ecf3a0b21 Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
bar@bar.mysql.r18.ru
35b01c8e9e sql_yacc.yy:
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
2003-02-28 20:20:24 +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