mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12123 commits 2793 branches 343 tags 1.5 GiB
Commit graph

886 commits

Author SHA1 Message Date
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +03:00
pem@mysql.comhem.se
4a6e6251e7 Fixed BUG#2776: Stored procedure crash if variable assigned to default. 
Keep track on the default value and use it. (Or NULL, if not declared.)
 2004-04-06 15:48:58 +02:00
pem@mysql.comhem.se
eb7319e850 Fixed BUG#2772: Function with character set clause fails in stored procedures. 
Complex return types were not stored correctly in the mysql.proc table.
 2004-04-06 13:26:53 +02:00
gluh@gluh.mysql.r18.ru
2ae2b946d6 Previous patch was wrong :( 
Here is 2nd version.
'reduce/reduce conflicts' issue is fixed
 2004-04-06 15:00:51 +05:00
gluh@gluh.mysql.r18.ru
03caa47acb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
 2004-04-05 19:14:31 +05:00
monty@mysql.com
0013516951 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-05 16:28:16 +03: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
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
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
monty@mysql.com
ddafa2cc16 simple optimzation 
Portability fixes
 2004-03-31 03:32:38 +03:00
bar@bar.intranet.mysql.r18.ru
b92dd45da4 ALTER TABLE t1 CONVERT TO should also change the default character set. 
Forgot to do it in the previous commit.
 2004-03-30 22:18:49 +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
pem@mysql.comhem.se
329013f99e Fixed BUG#3287: Stored Procedure Case Statement Not SQL:2003 Compliant. 2004-03-29 12:29:06 +02:00
pem@mysql.comhem.se
52c820fbc5 Enforce standard declaration order in SPs. 
Added new test cases for this, and adjusted old tests accordingly,
and new error codes and messages.
Fixed bugs in some tests (bug2673 and use test).
Added debug printing of instructions in SPs.
 2004-03-29 11:16:45 +02:00
bar@bar.intranet.mysql.r18.ru
3aea3e92ce 1. New data types, from the user point of view: 
BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin.
 2004-03-26 16:11:46 +04:00
pem@mysql.com
e5f9e18d2f Merge fix. 2004-03-25 17:48:00 +01: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
serg@serg.mylan
07c19b44ef accorting to the manual, when neither GLOBAL or SESSION in SET 
is specified, the default is SESSION.
 2004-03-24 16:33:47 +01:00
serg@serg.mylan
99886df867 correct support for a mix of UNION/UNION ALL in the same query. 
Bug#1428
 2004-03-23 14:43:24 +01: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
bell@sanja.is.com.ua
ede07fcdcf fixed signed numeric literal parsing 2004-03-18 18:27:03 +02: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
serg@serg.mylan
49e9b153ff Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-03-16 16:35:52 +01:00
bell@sanja.is.com.ua
c9938b9dff merge 2004-03-16 17:35:49 +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
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
hf@deer.(none)
f2366bf02c Spatial code changed to get rid of inconsistent this->* operation 
Now we use virtual calls instead and redirect VMT pointer of the
geometry object with 'new' operation
 2004-03-12 12:04:00 +04:00
pem@mysql.comhem.se
6c6bbba007 WL#1366: Use the schema (db) associated with an SP. 
Phase 2: Make SPs belong to a DB, and use qualified names.
  As a side effect, using USE in an SP is no longer allowed.
  (It just doesn't work otherwise.)
 2004-03-11 17:18:59 +01:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
konstantin@oak.local
8cc8b0ea5c Desperate attempt to push part of prepared statements cleanup which was 
reviewed in Saint-Petersbourg (including post-review fixes).
 2004-03-02 22:39:50 +03:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e74182fe52 Cleanups 2004-02-22 08:54:06 +02:00
monty@mashka.mysql.fi
349358a95b Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2004-02-22 00:40:50 +02:00
monty@mashka.mysql.fi
fdc4a35c94 change that master_server_id is not a restricted word 2004-02-22 00:38:05 +02:00
Sinisa@sinisa.nasamreza.org
a1c35fa72c making one symbol a keyword 2004-02-21 20:10:59 +02:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +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
ram@gw.mysql.r18.ru
b55cf65bbd fix for the bug #2786 incorrect precedence for XOR operator 2004-02-16 19:43:43 +04:00
pem@mysql.com
5f5da75c65 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-02-16 12:47:47 +01:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
f43093ec0e After merge fixes 
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
 2004-02-16 10:03:25 +02:00
serg@serg.mylan
abc9ef9770 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-15 18:35:06 +01:00
serg@serg.mylan
e9c46aaf80 REVOKE ALL PRIVILEGES, GRANT FROM user_list 
is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug #2642
 2004-02-15 17:59:52 +01:00
bell@sanja.is.com.ua
7626ab603e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-14 13:06:04 +02:00
pem@mysql.com
5faf244b30 Merge mysql.com:/home/pem/work/mysql-4.1 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-02-13 17:39:00 +01: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
bell@sanja.is.com.ua
5ef05f4284 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-12 22:33:30 +02:00