mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12710 commits 2791 branches 343 tags 1.7 GiB
Commit graph

244 commits

Author SHA1 Message Date
pem@mysql.com
bf45960eef Merge 4.1 -> 5.0 2004-05-07 18:52:06 +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
magnus@neptunus.(none)
7c2c408cb8 Added NDB storage engine 2004-04-15 09:14:14 +02:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
gluh@gluh.mysql.r18.ru
8a4e6c6482 WL1368: SHOW GRANTS FOR CURRENT USER 
'SHOW GRANTS' syntax is added 
  'SHOW GRANTS FOR CURRENT_USER' syntax is added
  'SHOW GRANTS FOR CURRENT_USER()' syntax is added
 CURRENT_USER without parens in expressions(SELECT CURRENT_USER;)
 2004-04-05 17:55:26 +05:00
bar@bar.intranet.mysql.r18.ru
dba73e1c86 More different syntaxes for (1) modifying the default charaset/collation 
and for (2) converting the columns:

1.  ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2.  ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
 2004-03-30 21:33:45 +05:00
serg@serg.mylan
de6d3b8dff UNHEX() function 2004-03-04 23:18:54 +01:00
serg@serg.mylan
ed2e1aa14d my_gethwaddr() for linux/freebsd 
UUID() function
 2004-02-27 20:30:08 +01:00
pem@mysql.comhem.se
f9e73c7716 Post-merge fixes. 2004-02-11 18:21:55 +01:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
hf@deer.(none)
acc84f0391 define name fixed 2004-01-23 20:52:35 +04:00
hf@deer.(none)
215a65b1fd SCRUM 
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions
 2004-01-23 16:02:57 +04:00
hf@deer.(none)
6dcda5153b SCRUM: 
WL#1163 (Making spatial code optional)
Pack of changes to do in sql/ code.
 2004-01-15 21:06:22 +04:00
pem@mysql.com
7b13840a46 Merge 2003-12-18 17:51:43 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2b53eef5f0 WorkLog #1323 (part 2) 
New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine=
 2003-12-17 22:52:03 +00:00
pem@mysql.comhem.se
bb51272bd1 Post-merge fixes. 
Multiple result sets from stored procedures now works with the
mysql and mysqltest clients.
 2003-12-16 18:09:22 +01:00
pem@mysql.com
975061bb5a Merge 4.1 to 5.0. 2003-12-16 16:12:28 +01:00
pem@mysql.comhem.se
b27e9d6052 WL#1363: Update the mysql.proc table and add new fields. 
Also made the parsing and handling of SP characteristics
more general and extendable, and added a few ch:istics.
 2003-12-10 19:05:37 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323 
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
 2003-12-10 04:31:42 +00:00
gluh@gluh.mysql.r18.ru
d9a412dcc3 post-merge fixes 2003-12-08 15:18:29 +04:00
gluh@gluh.mysql.r18.ru
ec8749249a WL#530&531: TIMESTAMPADD, TIMESTAMPDIFF functions 
Syntax for TIMESTAMPADD:

TIMESTAMPADD(interval, integer_expression, datetime_expression)

interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | 
QUARTER | YEAR

Supported SQL_TSI_  prefix  (like SQL_TSI_SECOND)

Syntax for TIMESTAMPDIFF:

TIMESTAMPDIFF(interval, datetime_expression1, datetime_expression2)

interval:= FRAC_SECOND | SECOND | MINUTE | HOUR | DAY | WEEK | MONTH | 
QUARTER | YEAR

Supported SQL_TSI_  prefix  (like SQL_TSI_SECOND)
 2003-12-08 14:41:41 +04:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2 WorkLog#1280 - Remove fixed table handler from lex/yacc 2003-12-02 20:23:13 +00:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
pem@mysql.comhem.se
c4871b240d Fixed BUG#1862 (flush table in SPs didn't work). 
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
 2003-11-19 11:26:18 +01:00
gluh@gluh.mysql.r18.ru
ee4ed0c969 WL#1241: SHOW PROCEDURE/FUNCTION 
WL#1263: Support for the attributes COMMENT and SUID
         in CREATE/ALTER PROCEDURE/FUNCTION
 2003-11-17 21:21:36 +04:00
gluh@gluh.mysql.r18.ru
5ade64831e WL#1253: LAST_DAY 2003-11-17 18:02:08 +04:00
pem@mysql.comhem.se
c38bb3d79d Various bug fixes: 
- Duplicate parameters/variables, conditions and cursors (not allowed).
  - ITERATE in labelled BEGIN-END (not allowed).
  - Missing SQLSTATE [VALUE] keywords in CONDITION/HANDLER declaration (added).
  - Empty BEGIN-END (now allowed).
  - End label (now optional).
 2003-11-13 19:34:56 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
fc475dbfa7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1
 2003-10-28 23:24:57 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
c7688a3a85 Worklog #1280, (Stage 1 Implementation) 
This is a starting work to remove handler name dependencies 
from the Lex/Parser.
 2003-10-28 21:39:55 +00: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
4bed4abb62 Merge commit 2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800 Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
harrison@bud.lordblink.com
672a7791c4 Add in bit_xor function (approved by Sergei) 2003-10-15 02:11:03 -04:00
heikki@hundin.mysql.fi
5ec87f2449 Many files: 
ALTER TABLE ... DISCARD/IMPORT TABLESPACE
  Track crash in buf_LRU_block_remove_hashed_page + 1807 reported in MySQL-3.23.5x
 2003-10-13 11:20:19 +03:00
pem@mysql.telia.com
6e55a3428a Post-merge fixes. 2003-09-24 15:26:20 +02:00
pem@mysql.com
8d884c02bb Merging 4.1 -> 5.0 2003-09-24 11:29:38 +02:00
pem@mysql.telia.com
04f0570fe8 Implemented SP CONDITIONs and HANDLERs, with the extension of handling 
MySQL error codes as well.
(No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
WL#850
 2003-09-16 14:26:08 +02:00
bar@bar.mysql.r18.ru
1726b4d89e New syntax: 
CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.

Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING

- Tests were added for all the above syntaxes.
 2003-09-15 10:26:48 +05:00
dlenev@mysql.com
2c24b2e9b4 Manual merge after commiting START SLAVE UNTIL 2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d Implemented support for START SLAVE UNTIL (WL#868) 2003-09-14 00:13:41 +04:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-09-03 15:40:19 +02:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL 
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
 2003-09-01 15:16:20 +04:00
pem@mysql.com
7f158dd12a Merge 4.1 into 5.0 2003-08-26 11:51:09 +02:00
serg@serg.mylan
58bdc6f5e1 use crc32() from bundled zlib if system zlib is unavailable 2003-08-21 18:30:43 +02:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00