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
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
bell@sanja.is.com.ua
465664a124
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
2002-10-30 16:09:06 +02:00
bar@bar.mysql.r18.ru
b43876b9dd
All String->set() now have charset argument
2002-10-30 16:19:43 +04:00
bell@sanja.is.com.ua
1f20cf3b42
removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)
...
fixed some possible bugs
2002-10-30 13:18:52 +02:00
bar@bar.mysql.r18.ru
637b97991d
Use item->set_charset() instead of item->str_value.set_charset()
2002-10-30 15:15:18 +04:00
bell@sanja.is.com.ua
07727576b8
IN subselect
2002-10-27 23:27:00 +02:00
serg@serg.mysql.com
295da156d6
fixed bug in HAVING error handling
...
small Item_ref optimization
2002-10-27 16:22:58 +00:00
bar@bar.mysql.r18.ru
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
hf@genie.(none)
8a88791fb1
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into genie.(none):/home/hf/work/mysql-4.1
2002-10-18 15:55:21 +05:00
monty@hundin.mysql.fi
9ecc5783d6
Fix after merge
2002-10-16 22:48:51 +03:00
monty@hundin.mysql.fi
fbf6ab4465
merge with 4.0.5
2002-10-16 19:30:24 +03:00
monty@hundin.mysql.fi
67d3cd643b
Merge with 3.23.54
2002-10-16 13:11:25 +03:00
monty@hundin.mysql.fi
b4343ba939
Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL;
2002-10-16 10:32:45 +03:00
bell@sanja.is.com.ua
226535865b
removed compiler warnings
2002-10-08 15:34:39 +03:00
bell@sanja.is.com.ua
2715d331f7
fixed couple of bugs in field/reference name resolution
...
fixed error handling in subselect fix_field
2002-10-08 14:50:12 +03:00
hf@genie.(none)
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
bell@sanja.is.com.ua
199f667c19
merging
2002-10-04 14:15:59 +03:00
bell@sanja.is.com.ua
48b2a76a48
after merging bugfix
2002-10-03 16:35:08 +03:00
monty@mashka.mysql.fi
d69250a969
Fixes and code cleanups after merge with 4.0.3
...
Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()
Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22
2002-10-02 13:33:08 +03:00
bell@sanja.is.com.ua
d9989c635e
merged
2002-09-03 10:06:10 +03:00
bell@sanja.is.com.ua
b07aaeb295
subselect with union
...
new error handling
Item_ref bug fixed
2002-09-03 09:50:36 +03:00
hf@bisonxp.(none)
6e4eda354c
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into bisonxp.(none):/home/hf/work/mysql-4.1
2002-09-02 17:22:41 +05:00
monty@narttu.mysql.fi
7134ffec21
Merge with 4.0.3
...
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
Sinisa@sinisa.nasamreza.org
22bcce253e
Adding a necessary functionality to ::store and ::save_in_field
...
that will take place properly after pull from 4.0, in order to
handle conversions from quoted constants to bigint's.
2002-08-24 14:49:04 +03:00
monty@mashka.mysql.fi
e701333bbf
INSERT ... VALUES(DEFAULT)
2002-07-25 01:00:56 +03:00
monty@mashka.mysql.fi
dddc20d9d1
New SET syntax & system variables.
...
Made a some new buffers thread specific and changeable.
Resize of key_buffer.
AUTO_COMMIT -> AUTOCOMMIT
Fixed mutex bug in DROP DATABASE
Fixed bug when using auto_increment as second part of a key where first part could include NULL.
Split handler->extra() to extra() and extra_opt() to be able to support thread specific buffers.
Don't write message to error log when slave reconnects becasue of timeout.
Fixed possible update problem when using DELETE/UPDATE on small tables
(In some cases we used index even if table scanning would be better)
A lot of minior code cleanups
2002-07-23 18:31:22 +03:00
hf@bisonxp.(none)
7813e48076
Found bugs fixed
2002-07-11 13:43:21 +05:00
bell@sanja.is.com.ua
2cf620004e
subselect in having clause
...
fixed bug in sum function in subselect
2002-07-01 14:14:51 +03:00
bar@gw.udmsearch.izhnet.ru
44347c5a54
SELECT left(non_default_charset_field,n) GROUP BY 1
...
now works more correctly. Still needs fixes.
2002-06-20 22:52:56 +05:00
venu@myvenu.com
5a33842a16
sql_error.cc, sql_prepare.cc:
...
new file
Client-server protocol 4.1 changes - Server side:
* Enhanced metadata information:
- SHOW [COUNT(*)] ERRORS [LIMIT [offset,] rows]
- SHOW [COUNT(*)] WARNING [LIMIT [offset,] rows]
- SHOW TABLE TYPES
- SHOW PRIVILEGES
- SHOW COLUMN TYPES (Not fully implemented)
* Prepared execution
* Long data handling in pieces
* And other misc changes
2002-06-12 14:13:12 -07:00
bell@sanja.is.com.ua
fb2cd68b5d
new subselect tests
...
LIMIT fixed
AVG & STD with subselect fixed
join_free fixed to be depended queries compatible
sort_default removed from SELECT_LEX
2002-06-01 23:35:36 +03:00
bell@sanja.is.com.ua
59602212d2
merge
2002-05-26 22:57:08 +03:00
bell@sanja.is.com.ua
35faf872aa
added depended subselect processing
2002-05-26 22:50:32 +03:00
bar@gw.udmsearch.izhnet.ru
196aa19cf6
Now string values are created and filled with charset field
...
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
2002-05-17 16:29:52 +05:00
monty@hundin.mysql.fi
b5a145d872
merge
2002-04-13 15:34:39 +03:00
monty@hundin.mysql.fi
727e507bca
merge with 3.23.50
2002-03-27 01:56:10 +02:00
monty@hundin.mysql.fi
ed040fe21e
Fix for bug in WHERE key='j' or key='J'
2002-03-22 14:03:42 +02:00
bar@gw.udmsearch.izhnet.ru
b37ce8e769
New ctype functions/macros to support many charsets at a time
2002-03-12 21:37:58 +04:00
monty@hundin.mysql.fi
b658662ae4
Update copyright
...
Fixed memory leak on shutdown (Affects the embedded version & MyODBC)
2001-12-06 14:10:51 +02:00
monty@hundin.mysql.fi
0bfec316ce
Don't do signal() on windows (Causes instability problems)
...
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
2001-10-17 19:39:39 +03:00
monty@tik.mysql.fi
e05bf277d6
Final fixes for INSERT into MERGE tables.
...
Move MAX_BLOB_WIDTH to be global
Added full support for unsigned BIGINT
Fixed spelling errors
2001-09-27 21:45:48 +03:00
monty@hundin.mysql.fi
5a14bb2a7e
Integrated table->ref_primary_key into table->part_of_key
...
Fixed bug in UNION
2001-09-21 03:38:35 +03:00
monty@hundin.mysql.fi
7cadc6e711
Changed to use my_global.h
...
Fixed problem with LIKE with latin1_de
Added parsing support of UNSIGNED LONG LONG
2001-09-14 02:54:33 +03:00
monty@tik.mysql.fi
b13d453d50
Fix UNION
...
New faster list iterators
Change list code to be simpler and faster
Optimize count(distinct)
New error messages for UNION
Make create_tmp_table more general to be usable by UNION
2001-08-02 06:29:50 +03:00
Sinisa@sinisa.nasamreza.org
338b51b5a7
These are actually two changesets. One for splitting LEX in two and
...
the other for multi-table delete
2001-06-03 17:07:26 +03:00
monty@donna.mysql.fi
86eda127f7
Remove wrong access check for locks.
...
Fixed problem with fuzzy dates.
2001-05-23 02:40:24 +03:00
monty@donna.mysql.com
e2a8a99d01
Lots of manual changes
...
Changed 'static inline' to 'inline' for SCO new's compiler
2001-01-25 22:38:26 +02:00
monty@donna.mysql.com
f0952ce3e1
FLUSH TABLE table_list
...
Fixes for RENAME TABLE
Portability fixes
2000-08-22 00:18:32 +03:00
bk@work.mysql.com
f4c589ff6c
Import changeset
2000-07-31 21:29:14 +02:00