6cbbbd6948
Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
...
for binary collations
2003-03-04 12:33:52 +04:00
303c3e30ab
Added charset number to result header
2003-02-04 03:19:19 +02:00
735399a850
Move latin1 into a separarte file
2003-01-29 17:31:20 +04:00
cff4a43711
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
...
into deer.mysql.r18.ru:/home/hf/work/mysql-default
2003-01-28 15:06:23 +04:00
a292d4f632
New "fill" function in charset_info_st structure
2003-01-28 14:58:06 +04:00
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
9fb261e384
SCRUM
...
Default in UPDATE & SELECT
2003-01-21 20:20:46 +04:00
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
94cc7d751e
Added support sql_mode, which can be used to produce various outputs
...
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
2003-01-16 02:04:50 +02:00
96089e2b3a
resolving conflicts
2003-01-15 13:15:35 +04:00
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
445d426203
Conflicts resolving
2003-01-05 14:12:03 +04:00
f6e8e1f985
SCRUM
...
DEFAULT in UPDATE and SELECT
2003-01-05 14:07:24 +04:00
5c4b7a2e96
Binary protocol changes (to monty)
2003-01-03 03:52:53 -08:00
e5103ce714
Less "default_charset_info"
2002-12-19 15:27:46 +04:00
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
c3053148f4
BINARY_FLAG has been restored.
...
It's needed by ODBC code.
2002-12-19 14:36:05 +04:00
bb67600df4
Merging
2002-12-17 19:57:23 +04:00
0ce4ae35e5
Some fixes to get closer to UCS2 compatible SHOW FIELDS
2002-12-17 14:35:19 +04:00
4f2a57c511
Move all sql_type() to the same file
2002-12-17 11:25:27 +04:00
c1e69d2cca
Merging
2002-12-16 18:58:55 +04:00
d783e18436
merge
2002-12-14 17:49:01 +02:00
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
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
b4fcdaa276
Preparation to charset dependant test_if_int and test_if_real
2002-12-11 17:42:48 +04:00
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
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
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
5e8b27c0d3
Pull conflicts resolutions
2002-11-29 12:35:48 +04:00
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
25bd1e9a37
Merged by hands
2002-11-07 12:20:08 +04:00
65badfff1a
Put temporary files in binlog cache when using BEGIN/COMMIT
...
Let MySQL 4.0 read 4.1 .frm files without 4.1 specific extensions
New variables @@rand_seed1 and @@rand_seed2 (used by replication)
DROP TEMPORARY TABLE
2002-11-07 04:02:37 +02:00
2434be61f8
String->copy() now has a charset arg
2002-11-06 17:43:22 +04:00
86b633379c
Some charset code clean-ups
2002-11-06 17:01:12 +04:00
5333cfb429
Removed wrong patch to fix DATE BETWEEN TIMESTAMP1 AND TIMESTAMP2
...
Some simple optimizations
2002-11-05 22:45:42 +02:00
537f1c2f1e
Removed wrong bug fix for problem with timestamp and BETWEEN.
...
Will be properly fixed in 4.1 and 5.0
2002-11-05 00:24:59 +02:00
be932e7345
- Applied fix made in 4.0 tree to fix a bug when comparing a datetime
...
column with timestamp values with BETWEEN clause
2002-10-30 21:55:56 +01:00
fbe9577516
A fix for bug when comparing a datetime column with timestamp
...
values with BETWEEN clause
2002-10-30 22:08:34 +02:00
03e7fc3180
date and time fields now have charset arg in constructor
...
my_charset_latin1
2002-10-30 17:09:37 +04:00
440db4c1dc
ENUM/SET fields now have charset too
2002-10-25 15:08:47 +05:00
95aef91521
BINARY charset is now used instead of binary_flag
2002-10-25 13:58:32 +05:00
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
fbf6ab4465
merge with 4.0.5
2002-10-16 19:30:24 +03:00
67d3cd643b
Merge with 3.23.54
2002-10-16 13:11:25 +03:00
b4343ba939
Fixed bug in LEFT JOIN ... WHERE not_null_key_column=NULL;
2002-10-16 10:32:45 +03:00
55866b0615
Huge pull
2002-10-07 15:38:07 +05:00
71d0f48f1f
Geometry field type implementation
2002-10-04 12:48:32 +05:00
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
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
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
