mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
8212 commits 2784 branches 343 tags 1.6 GiB
Commit graph

198 commits

Author SHA1 Message Date
hf@deer.mysql.r18.ru
6bca9b7034 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-28 12:59:07 +04:00
bell@sanja.is.com.ua
5469c014e3 Merge sanja.is.com.ua:/home/bell/mysql/work-leak-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
 2003-01-26 21:34:14 +02:00
bell@sanja.is.com.ua
760e22f0bb after merge fix of 577 task (SCRUM, pre commit to be able to merge with static tables optimization fix) 
fixed derived tables with subselect inside
 2003-01-26 21:30:35 +02:00
bell@sanja.is.com.ua
c80f766ea2 removed switching off static table optimization for subselects (SCRUM , pre-commit to be able merge with temporary table fix) 2003-01-26 21:13:37 +02:00
bell@sanja.is.com.ua
44d8a8cdab merging 2003-01-25 13:19:46 +02:00
bell@sanja.is.com.ua
d56e23f64e fixed subselects with temporary tables (SCRUM) 
fixed memory leacks
 2003-01-25 02:25:52 +02:00
venu@myvenu.com
04f16d9f6f MYSQL_TIME handling(Direct DATE,TIME and TS th' structure) - server 2003-01-23 22:32:39 -08:00
hf@deer.mysql.r18.ru
524e33eb59 Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-22 20:51:54 +04:00
hf@deer.mysql.r18.ru
e2d991795c SCRUM 
DEFAULT in SELECT & UPDATE corrections
 2003-01-22 20:08:12 +04:00
monty@mashka.mysql.fi
7436e9ec97 Merge 2003-01-21 21:28:51 +02:00
monty@mashka.mysql.fi
25c393a12e Portability fixes (for windows) 
Some changes to the prepared statement protocol to make it easier to use and faster.
 2003-01-21 21:07:59 +02:00
hf@deer.mysql.r18.ru
87681bb85e Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1 
into deer.mysql.r18.ru:/home/hf/work/mysql-default
 2003-01-21 20:24:22 +04:00
hf@deer.mysql.r18.ru
9fb261e384 SCRUM 
Default in UPDATE & SELECT
 2003-01-21 20:20:46 +04:00
bell@sanja.is.com.ua
8aabee290d Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-cols-4.1
 2003-01-21 14:03:30 +02:00
bell@sanja.is.com.ua
372e2130e4 fixed test of cardinality 2003-01-21 13:55:26 +02:00
hf@deer.mysql.r18.ru
389680e04e Conflicts resolving 2003-01-20 18:59:45 +04:00
hf@deer.mysql.r18.ru
1f6b615677 SCRUM 
embedded-related changes
 2003-01-20 18:47:25 +04:00
bar@bar.mysql.r18.ru
4f9d82700d strnto family functions now return error in a new argument 2003-01-16 17:17:07 +04:00
hf@deer.mysql.r18.ru
96089e2b3a resolving conflicts 2003-01-15 13:15:35 +04:00
hf@deer.mysql.r18.ru
c59bff7c96 SCRUM 
embedded library trimming
 2003-01-15 12:11:44 +04:00
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
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
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
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
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
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
bar@bar.mysql.r18.ru
e1cb867968 Fixesd that wrong charset were used 2002-11-29 11:15:15 +04: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
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
bell@sanja.is.com.ua
d7bd717ec8 after-merge fix 2002-11-27 22:35:23 +02:00
bell@sanja.is.com.ua
4be2cfd62d merging 2002-11-27 19:31:11 +02:00
bell@sanja.is.com.ua
17237301b7 typo fixed 2002-11-27 17:42:15 +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
bell@sanja.is.com.ua
fdfe6a4c5e fixed bug of subselect in derived tables 2002-11-25 10:58:49 +02:00
bell@sanja.is.com.ua
c74c93ffc3 supported possiblity of item substitute (fixed bug) in setup_fields 
more efficient reference creation
fixed table_name of Field in temporary table
 2002-11-25 01:38:56 +02:00
bell@sanja.is.com.ua
1cee49dd86 Reference to field in outer subelect fixed 
Fixed context in error mesages
 2002-11-24 21:10:52 +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
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08: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
bell@sanja.is.com.ua
979f27ee4a fixed bug in cyclic reference refinition 2002-11-14 09:43:24 +02:00
bell@sanja.is.com.ua
41d9311621 fixed cyclic reference bug 2002-11-14 00:26:18 +02:00
bell@sanja.is.com.ua
063ffd2d67 prevent using expernal fields in derived tables 2002-11-11 10:49:41 +02:00
hf@genie.(none)
25bd1e9a37 Merged by hands 2002-11-07 12:20:08 +04:00
bell@sanja.is.com.ua
c0932c7bea Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
 2002-11-06 22:35:17 +02:00
bar@bar.mysql.r18.ru
86b633379c Some charset code clean-ups 2002-11-06 17:01:12 +04:00
bar@bar.mysql.r18.ru
9a9e7ce0f4 Item->thd_charset() - returns a default charset which should be used 
to compose strings appeared without charset context, for example,
in convertion from numer into string type.
 2002-11-06 15:49:53 +04:00
hf@genie.(none)
3a7c12b22a Libmysqld improvements 2002-11-06 14:42:44 +04:00
bell@sanja.is.com.ua
1575f62374 IN subselect erged with current 4.1 (pointer conversion) 2002-11-05 11:21:40 +02:00
bell@sanja.is.com.ua
45f098bf60 moved similar code to function 
onversion with check
 2002-11-04 22:12:45 +02:00
bell@sanja.is.com.ua
bb49de5ff5 Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/work-pointer-4.1
 2002-11-04 15:45:54 +02:00