Commit graph

6038 commits

Author SHA1 Message Date
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
451440f930 one more test 2002-12-02 21:12:25 +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
Sinisa@sinisa.nasamreza.org
5483796c50 Proper handling of ORDER BY table.column in UNION's 2002-12-02 20:18:51 +02:00
Sinisa@sinisa.nasamreza.org
a655fdb10d Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-02 18:47:52 +02:00
monty@mashka.mysql.fi
733438ec90 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-02 17:58:47 +02:00
monty@mashka.mysql.fi
9d0f0402a7 Fixed bug when creating keys in temporary HEAP tables.
(This caused the DISTINCT test to fail)
Removed one inline as this caused compiler problems
2002-12-02 17:52:22 +02: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
bell@sanja.is.com.ua
75da3049c3 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1
2002-12-01 00:17:33 +02:00
bell@sanja.is.com.ua
c6b48c6f26 fix of error handling 2002-12-01 00:11:22 +02:00
Sinisa@sinisa.nasamreza.org
ba053ef950 A better fix 2002-11-30 23:13:00 +02:00
Sinisa@sinisa.nasamreza.org
1b625220ba A bug fix for ORDER BY on table.column in provisional entire UNION
ORDER clause, where table is one of union'ed tables.
2002-11-30 22:53:50 +02: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
25586e477a some bug fixes and tests for those.
I am pushing now, because :

* I have a fix for crashing bug
* Sanja will destroy my changes in sub-select test ... ;)
2002-11-30 19:53:31 +02:00
bell@sanja.is.com.ua
2ccb0eeb4f 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-30 19:33:30 +02:00
bell@sanja.is.com.ua
9da705ef2f check of using same table for changing and select 2002-11-30 19:26:18 +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
serg@serg.mysql.com
82eb69a4a2 removed left-over UPDATE_ACL from REPLACE 2002-11-30 13:03:55 +01:00
Sinisa@sinisa.nasamreza.org
02c61db656 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-29 19:48:38 +02:00
serg@serg.mysql.com
87fbeb4098 let's leave "INSERT ... SELECT ... UPDATE" for the future 2002-11-29 16:17:52 +01:00
Sinisa@sinisa.nasamreza.org
959b30672e Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-11-29 17:06:26 +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
Sinisa@sinisa.nasamreza.org
5b7a2f56ee many, many changes 2002-11-29 15:22:47 +02: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
bell@sanja.is.com.ua
762061ae67 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-29 15:16:15 +02:00
Sinisa@sinisa.nasamreza.org
481bcd5750 many bug fixes 2002-11-29 14:49:07 +02: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
serg@serg.mysql.com
fcec08584a s/SQLCOM_MULTI_UPDATE/SQLCOM_UPDATE_MULTI/ to be in line with SQLCOM_DELETE_MULTI 2002-11-29 12:29:27 +01:00
bell@sanja.is.com.ua
39ddd2dcb4 checking columns of top items 2002-11-29 12:30:04 +02:00
bar@bar.mysql.r18.ru
8238a00737 Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
2002-11-29 14:13:35 +04:00
bar@bar.mysql.r18.ru
4b46b19937 UCS2 fixes 2002-11-29 14:04:36 +04:00
bar@bar.mysql.r18.ru
ec7c4ea78d my_strntod_ucs2 and my_strntol_ucs2 fixes 2002-11-29 13:29:48 +04:00
bell@sanja.is.com.ua
fa3d6193ac fixed error handling bug
fixed naming bug
fixed bug of subselect excluding
2002-11-29 10:44:30 +02:00
bar@bar.mysql.r18.ru
e1cb867968 Fixesd that wrong charset were used 2002-11-29 11:15:15 +04:00
bar@bar.mysql.r18.ru
24cf562ec5 mysql.h:
renamed arg name to avoid a warning that it shadows global variable
2002-11-29 10:17:43 +04:00
wax@mysql.com
8efd5648ef Merge mysql.com:/home/wax/mysql-4n into mysql.com:/home/wax/mysql-4mi 2002-11-29 02:51:08 +05:00
bell@sanja.is.com.ua
5921189e86 test of changing subselects tree 2002-11-28 23:31:48 +02:00
bell@sanja.is.com.ua
8e8678be9e fixed bug IN subselect with ORDER 2002-11-28 22:59:35 +02:00
bell@sanja.is.com.ua
0b8054ac8c 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:59:21 +02:00
bell@sanja.is.com.ua
65e27f604f after review fix(CRUM)
after merge fix
2002-11-28 20:58:23 +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
venu@myvenu.com
aafcbf3450 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2002-11-28 10:02:01 -08: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
venu@myvenu.com
5aff325ce3 Get rid of pbool from my_list.h; and avoid using the my_global.h for clients 2002-11-28 09:56:26 -08: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