Commit graph

378 commits

Author SHA1 Message Date
pem@mysql.com
64e321d0df Made sql_yacc.yy work with bison 1.75. 2002-12-07 12:35:57 +01:00
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
35ff08c2af After merge fixes
Added THD to add_to_xxx_list() functions for faster parsing.
2002-12-06 21:11:27 +02:00
bell@sanja.is.com.ua
f1858ec331 fixed bug of PROCEDURE in same query with subselects
prohibited using procedure inside subquery
fixed error handling of procedure analize
2002-12-06 00:40:28 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
peter@mysql.com
1d920529a8 SCRAM Remove spaces from most changed files.
This alters not only my code so it looks like I'm not only one adding the spaces.
2002-12-05 01:14:51 +03:00
peter@mysql.com
5fa02daa69 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-12-04 16:26:29 +03:00
serg@serg.mysql.com
564487d7c0 it's INSERT ... ON DUPLICATE KEY UPDATE , not INSERT ON DUPLICATE KEY UPDATE SET 2002-12-02 22:04:26 +01:00
serg@serg.mysql.com
e54134fde7 merged 2002-12-02 20:41:34 +01:00
serg@serg.mysql.com
2320923a7b INSERT ... ON DUPLICATE KEY UPDATE ... 2002-12-02 20:38:00 +01:00
pem@mysql.com
f9850fdc9c Got rid of the (previously) intentional SELECT/UNION reduce/reduce conflict.
There should be no more reduce/reduce conflicts in sql_yacc.yy from now on!
2002-12-01 17:10:13 +01:00
pem@mysql.com
fb2cd40a99 Merge work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2002-12-01 16:03:42 +01:00
peter@mysql.com
1bf744911f Megrge new changes in... 2002-12-01 11:18:19 +03:00
pem@mysql.com
621475a760 Fixed ambiguity between the row value syntax and INTERVAL syntax by making the
ROW keyword mandatory (although it's optional in SQL-99).
2002-11-30 19:33:01 +01:00
Sinisa@sinisa.nasamreza.org
a24b780207 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-30 19:54:52 +02:00
Sinisa@sinisa.nasamreza.org
a968d7c2ea many bug fixes 2002-11-30 18:46:24 +02:00
pem@mysql.com
6a8e2a9cbc Pass thd as an argument to yylex(). 2002-11-30 16:43:53 +01:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
serg@serg.mysql.com
87fbeb4098 let's leave "INSERT ... SELECT ... UPDATE" for the future 2002-11-29 16:17:52 +01:00
monty@mashka.mysql.fi
bd53a30858 Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0 2002-11-29 16:41:12 +02:00
monty@mashka.mysql.fi
6603d75213 New multi-table-update code
New (simpler) internal timestamp handling.
More debuging to heap tables.
Small cleanups to multi-table-delete
false -> 0 and true -> 1  (We should use TRUE and FALSE)
2002-11-29 16:40:18 +02:00
serg@serg.mysql.com
fd11c80400 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2002-11-29 14:26:25 +01:00
serg@serg.mysql.com
c28e99c65a added missing Com_xxx status variables
moved SQLCOM_END to the end of the list
bad copy-paste in sql_yacc.yy fixed
2002-11-29 14:20:25 +01:00
serg@serg.mysql.com
409f7af3cf make multi updates statistics visible in SHOW STATUS as Com_update_multi 2002-11-29 13:17:54 +01:00
bell@sanja.is.com.ua
39ddd2dcb4 checking columns of top items 2002-11-29 12:30:04 +02:00
bell@sanja.is.com.ua
fcb0b8815b merging 2002-11-28 20:12:14 +02:00
bell@sanja.is.com.ua
c1527b6f4c Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-11-28 20:04:09 +02:00
bell@sanja.is.com.ua
ec38595696 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-28 20:01:22 +02:00
pem@mysql.com
086bd41700 Added 29 {} at the end of clauses in sql_yacc.yy to make it work with bison 1.75. 2002-11-28 18:57:56 +01:00
bell@sanja.is.com.ua
94b84a7008 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-11-28 19:31:06 +02:00
bell@sanja.is.com.ua
b8b7d0b03b fixed * without tables in IN bug
fixed sunction-test select in IN bug
fixed unions in subselect bug
2002-11-28 19:29:26 +02:00
serg@serg.mysql.com
f60e47fdfb INSERT ... UPDATE syntax (syntax only)
sql_yacc.yy and sql_parse.cc cleanup
2002-11-28 17:25:41 +01:00
pem@mysql.com
27dc59e783 Fixed the reduce/reduce conflicts introduced by subselects. 2002-11-28 16:10:29 +01:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
bell@sanja.is.com.ua
a3ae370db8 fixed current_thread 2002-11-27 18:03:10 +02:00
bell@sanja.is.com.ua
1784d97f7a merging 2002-11-27 17:10:21 +02:00
bell@sanja.is.com.ua
aa9bfb44f9 after merging fix 2002-11-27 12:31:32 +02:00
pem@mysql.com
5d292d622c Merge work.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/pem/work/mysql-4.1
2002-11-27 11:23:36 +01:00
bell@sanja.is.com.ua
32df7cacac merging 2002-11-27 11:32:09 +02:00
pem@mysql.com
3ef655ac3e Pass thd as an argument to yyparse(), getting rid of all current_thd in the parser. 2002-11-26 14:18:16 +01:00
bell@sanja.is.com.ua
fdb3eaf3d7 subselects in insert/replace (SCRUM) 2002-11-26 01:00:05 +02:00
bell@sanja.is.com.ua
d40bec6829 Merge 2002-11-25 17:53:03 +02:00
monty@mashka.mysql.fi
3d1af24f0f Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-11-25 17:34:51 +02:00
bell@sanja.is.com.ua
0c546b6567 removed limit for "FOR UPDATE" and "IN SHARE MODE" (now thay allowed for non-simple selects and applyed to current select)
fix for using subselects with update
test of locking for non-simple queries
(SCRUM?)
2002-11-25 13:44:47 +02:00
monty@mashka.mysql.fi
5dbea1b7a2 Merge with 4.0 2002-11-25 12:19:28 +02:00
monty@mashka.mysql.fi
96212cc300 Faster parsing of identifiers
Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE
2002-11-25 12:11:16 +02:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
2002-11-24 17:07:53 +03:00
monty@mashka.mysql.fi
dfb60ca085 Added new ANSI functions LOCALTIME, LOCALTIMESTAMP and CURRENT_USER
Added CEIL as an alias for CEILING
Cleaned up CHECK constraint handling.
(We don't anymore require braces after CHECK)
Added casting to CHAR.
2002-11-24 15:47:19 +02:00
bell@sanja.is.com.ua
d6b646d4fc after merging fix (update SCRUM?) 2002-11-23 20:40:16 +02:00