Commit graph

152 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
monty@mashka.mysql.fi
7e9b27eaf5 Updates for multi-byte character sets
(Note: test 'union' fails, but Sanja promised to fix this)
2003-01-14 14:28:36 +02:00
hf@deer.mysql.r18.ru
9967da942b SCRUM
additions about DEFAULT in UPDATE and SELECT
2003-01-05 17:56:11 +04:00
hf@deer.mysql.r18.ru
2744cc07d8 small bugfix 2003-01-05 15:40:14 +04:00
hf@deer.mysql.r18.ru
445d426203 Conflicts resolving 2003-01-05 14:12:03 +04:00
hf@deer.mysql.r18.ru
f6e8e1f985 SCRUM
DEFAULT in UPDATE and SELECT
2003-01-05 14:07:24 +04:00
bell@sanja.is.com.ua
c7a02249f5 postreviews fix (SCRUM related)
reordered Item_row class variables to be sorted by memory size
2002-12-31 18:39:16 +02:00
bell@sanja.is.com.ua
fe9e139056 postreview fix (SCRUM)
fixed layout
2002-12-28 01:01:05 +02:00
monty@mashka.mysql.fi
3ca695ea0b Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
2002-12-26 18:26:37 +02:00
bell@sanja.is.com.ua
1dd7cb52ae support of subselect without FROM reducing (SCRUM)
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
2002-12-26 01:28:59 +02:00
bell@sanja.is.com.ua
b63f230346 row IN subselects (SCRUM) 2002-12-19 21:15:09 +02:00
bell@sanja.is.com.ua
54c7afd2a5 Item_in_optimizer is changed to be used with row IN subselect (SCRUM)
removed unused items
2002-12-19 13:35:12 +02:00
bell@sanja.is.com.ua
4cfb6d97b5 support of simple row subselects (SCRUM) 2002-12-19 07:38:33 +02:00
bell@sanja.is.com.ua
b785e980bd optimized single value subselect (to be used as row) (SCRUM) 2002-12-19 07:38:32 +02:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04:00
bell@sanja.is.com.ua
e82b91e1c8 fixed subselect null test
fixed method definition (overloading instead of redefinition)
fixed time expression type definition
2002-12-15 11:14:53 +02:00
monty@mashka.mysql.fi
64ed35700e Fix after merge 2002-12-14 18:30:28 +02:00
monty@mashka.mysql.fi
d783e18436 merge 2002-12-14 17:49:01 +02:00
monty@mashka.mysql.fi
d49167bae5 Fixes for binary protocol (complement to last push)
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
2002-12-14 17:43:01 +02:00
vva@eagle.mysql.r18.ru
8eddd4d411 Merge vvagin@work.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone
2002-12-14 03:38:38 +04:00
vva@eagle.mysql.r18.ru
b624df724b add VARIANCE function 2002-12-14 03:36:59 +04:00
hf@deer.mysql.r18.ru
3517febe97 Resolving merge conflicts 2002-12-12 12:49:56 +04:00
monty@mashka.mysql.fi
a241d9a0f7 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-12-11 09:18:43 +02:00
monty@mashka.mysql.fi
d3eb993a27 rename of net_pkg.cc to protocol.cc
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
2002-12-11 09:17:51 +02:00
bell@sanja.is.com.ua
5fc21bc187 postreview fix (SCRUM)
NULL fixed
max_length fixed
layout fixed
2002-12-10 18:10:00 +02:00
bell@sanja.is.com.ua
6db77efb75 merging 2002-12-10 11:41:47 +02:00
bar@bar.mysql.r18.ru
43786feed1 More use of new str->number routines 2002-12-09 14:58:24 +04:00
venu@myvenu.com
9100688c17 item.cc:
Fix for save_in_field to take extra bool argumnet (4.0 merge compatibility)
2002-12-06 23:39:11 -08:00
bell@sanja.is.com.ua
4506ab9ef1 _NEW_ IN/ALL/ANY/SOME behaviour with NULL (SCRUM related)
optimization of left expression evaluation
more descriptive method name
2002-12-06 21:55:53 +02:00
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
serg@serg.mysql.com
09ed694094 current_user() to return priv_user 2002-12-05 21:38:27 +01:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
bell@sanja.is.com.ua
ed8cc2a844 changing in Item_row according last review (SCRUM) 2002-12-04 11:01:48 +02:00
monty@hundin.mysql.fi
8830eb4aa9 Change of internal key_field=NULL handling to avoid error messages.
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
2002-12-03 13:08:25 +02:00
bell@sanja.is.com.ua
39ddd2dcb4 checking columns of top items 2002-11-29 12:30:04 +02:00
hf@genie.(none)
5e8b27c0d3 Pull conflicts resolutions 2002-11-29 12:35:48 +04: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
bar@bar.mysql.r18.ru
847ea719b6 New functions 2002-11-28 11:04:26 +04:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
bell@sanja.is.com.ua
f8ff8fc6de after review changes in IN/ALL/ANY/SOME (SCRUM) 2002-11-27 17:04:43 +02:00
bell@sanja.is.com.ua
32df7cacac merging 2002-11-27 11:32:09 +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
monty@mashka.mysql.fi
4cefc97f65 Fixed CAST( xxx as CHAR) 2002-11-25 17:33:51 +02:00
bell@sanja.is.com.ua
39c7302140 fix of selfreference bug 2002-11-24 11:18:32 +02:00
bell@sanja.is.com.ua
1b62dc0223 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-23 20:32:02 +02:00
venu@myvenu.com
a9aebd433d protocol merge 2002-11-22 10:20:14 -08:00
venu@myvenu.com
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
bell@sanja.is.com.ua
2eb623a4f0 prevent using references on sum function (except HAVING clouse of current select) and forward references 2002-11-21 11:01:33 +02:00
bell@sanja.is.com.ua
7a9f47759e basic row Items (SCRUM) 2002-11-15 20:32:09 +02:00