Commit graph

565 commits

Author SHA1 Message Date
pem@mysql.com
35c82164f6 Merged 4.1 to 5.0. 2003-04-29 12:06:04 +02:00
pem@mysql.com
6c85c6aa6a Post-fix of bug #302 fix.
Fixed bug #320.
Some new tests and cosmetic changes.
Another strcasecmp() replaced.
2003-04-27 17:35:54 +02:00
bar@bar.mysql.r18.ru
6d5f527afd Variable names have been renamed:
client_collation -> collation_client
  result_collation -> collation_results
  connection_collation -> collation_connection
2003-04-23 18:19:22 +05:00
bell@sanja.is.com.ua
c4637293fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-order-4.1
2003-04-23 11:20:19 +03:00
pem@mysql.com
a4e065920b Made multiple queries (SELECT without INTO) work in SPs.
This included bug fixes in the 4.1 protocol (actually send and receive the
server_status flags).
2003-04-23 09:22:54 +02:00
bar@bar.mysql.r18.ru
a3d08eaaf9 I renamed system variable literal_collation into connection_collation 2003-04-22 12:27:35 +05:00
pem@mysql.com
64da2fff67 Post post-merge fix. 2003-04-17 00:34:15 +02:00
pem@mysql.com
386b0b91b2 Merged 4.1 into 5.0. 2003-04-16 23:23:23 +02:00
venu@myvenu.com
b2f0a87b81 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-16 12:11:32 -07:00
monty@mashka.mysql.fi
6cf83136af Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-04-16 09:26:24 +03:00
monty@mashka.mysql.fi
491589baf8 Add mysys specific error messages
Make RELAY_THREAD and alias for IO_THREAD
Added new interface for string -> (unsigned) long long.
2003-04-16 09:25:43 +03:00
wax@kishkin.ru
a17c567f86 replace default separator in group_concat, correct a bug 2003-04-16 00:22:43 +06:00
venu@myvenu.com
24d5cd37d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-12 20:07:52 -07:00
hf@deer.mysql.r18.ru
5d4e9f95f2 Merging 2003-04-08 19:43:24 +05:00
bar@bar.mysql.r18.ru
8cf9ada977 Use of CHARSWT_INFO *result_collation
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
2cdc21d24a SET NAMES doesn't start recoding
SET CHARACTER SET does
2003-04-08 11:33:54 +05:00
bar@bar.mysql.r18.ru
e165845d39 sys_var_collation is now abstract class
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
2003-04-07 16:10:27 +05:00
bell@sanja.is.com.ua
4cecc44ce7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 21:51:03 +03:00
mysql@home.(none)
bbf710b35e Some optimization in SET NAMES 2003-04-05 18:56:15 +05:00
bell@sanja.is.com.ua
fa46807825 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 15:17:16 +03:00
mysql@home.(none)
e93e98c239 sql_yacc.yy:
I wonder how it happend that I compiled this!
2003-04-05 17:02:34 +05:00
mysql@home.(none)
bc1fe848cb sql_yacc.yy, set_var.h, set_var.cc:
Optimization of SET NAMES
2003-04-05 15:59:29 +05:00
bell@sanja.is.com.ua
65c356cfa8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2003-04-05 09:29:58 +03:00
bell@sanja.is.com.ua
7bd0d02bda fixed st_select_lex initialization
fixed mustiupdate subselect compatibility

(bug 217)
2003-04-05 09:29:28 +03:00
venu@myvenu.com
8eeecd9c86 Fix to support update + bianry logs with prepared statements (Dynamic query) 2003-04-04 12:33:17 -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