Commit graph

330 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
2325a5f600 reverting a fix 2003-01-14 16:15:09 +02: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
Sinisa@sinisa.nasamreza.org
6b386c08a5 Fix for a bug in SHOW GRANTS when :
grant on database.* to xx@yy with grant option;

is done.
2003-01-11 18:02:10 +02:00
pem@mysql.com
1604bea5b7 Merge 2003-01-09 17:56:57 +01: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
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
Sinisa@sinisa.nasamreza.org
164ab11b29 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-01-03 15:08:40 +02:00
Sinisa@sinisa.nasamreza.org
adac21640e Further fix for export class problem 2003-01-03 15:07:40 +02:00
bell@sanja.is.com.ua
945758f0ec post-post-review fix (SCRUM) 2003-01-02 12:24:33 +02: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
Sinisa@sinisa.nasamreza.org
885d9d9037 A fix for a charset bug in the select_export (select into
outfile) class.
2002-12-31 18:01:53 +02:00
bell@sanja.is.com.ua
7c0a074614 merging 2002-12-31 12:55:03 +02:00
bell@sanja.is.com.ua
2c6fca2755 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
2002-12-31 12:48:00 +02:00
Sinisa@sinisa.nasamreza.org
a4a80302b8 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-30 19:42:03 +02:00
miguel@hegel.br
f43ebb83db Fix compiler warnings removing unreferenced variables 2002-12-29 21:50:52 -02:00
bell@sanja.is.com.ua
fe9e139056 postreview fix (SCRUM)
fixed layout
2002-12-28 01:01:05 +02:00
Sinisa@sinisa.nasamreza.org
5a44f2bc26 merge fixes 2002-12-26 20:04:22 +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
980ca35645 merging 2002-12-25 11:09:19 +02:00
bell@sanja.is.com.ua
61ae697837 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-derived-4.1
2002-12-24 14:08:44 +02:00
Sinisa@sinisa.nasamreza.org
7f304a2746 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-24 14:02:42 +02:00
bar@bar.mysql.r18.ru
1b6c65c183 less default_charset_info 2002-12-20 18:08:49 +04: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
hf@deer.mysql.r18.ru
8a205e4ba3 Merge 2002-12-19 14:57:24 +04:00
bell@sanja.is.com.ua
4cfb6d97b5 support of simple row subselects (SCRUM) 2002-12-19 07:38:33 +02:00
Sinisa@sinisa.nasamreza.org
4158538dc7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2002-12-19 07:38:30 +02:00
bar@bar.mysql.r18.ru
6ac401b550 thd_charset has been moved to variables structure 2002-12-19 09:38:28 +04:00
bell@sanja.is.com.ua
9e2d9aa274 fixed derived table visibility scope for derived tables with union 2002-12-17 23:18:19 +02:00
Sinisa@sinisa.nasamreza.org
675098852c Fix for fix_fields in derived tables with UNION's .... 2002-12-17 22:36:23 +02:00
Sinisa@sinisa.nasamreza.org
52a9fd52e6 beautifying the error messages 2002-12-17 21:04:37 +02:00
hf@deer.mysql.r18.ru
c1e69d2cca Merging 2002-12-16 18:58:55 +04: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
hf@deer.mysql.r18.ru
dcb5293576 Some fixes 2002-12-12 12:16:34 +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
59069e60f2 More use of new str->num conversion routines 2002-12-09 15:58:33 +04:00
bar@bar.mysql.r18.ru
241f4143e8 More use of new string->number conversion routines 2002-12-09 14:31:11 +04:00
pem@mysql.com
aae07a4d45 Simplistic, experimental framework for Stored Procedures (SPs).
Implements creation and dropping of PROCEDUREs, IN, OUT, and INOUT parameters,
single-statement procedures, rudimentary multi-statement (begin-end) prodedures
(when the client can handle it), and local variables.
Missing most of the embedded SQL language, all attributes, FUNCTIONs, error handling,
reparses procedures at each call (no caching), etc, etc.
Certainly buggy too, but procedures can actually be created and called....
2002-12-08 19:59:22 +01: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
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +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