wax@kishkin.ru
61f7821323
Merge kishkin.ru:/home/wax/mysql-4n into kishkin.ru:/home/wax/mysql-4g
2003-06-03 17:07:46 +06:00
wax@kishkin.ru
a2e9bbf2eb
URGENT
...
SCRUM
BUG
correct wrong code in group_concat
2003-05-31 15:44:19 +06:00
monty@narttu.mysql.fi
5da35e0488
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-05-26 20:59:40 +03:00
monty@narttu.mysql.fi
999cb4e07c
Portability fix
2003-05-26 20:59:09 +03:00
monty@mashka.mysql.fi
bd4b9522e4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mashka.mysql.fi:/home/my/mysql-4.1-narttu
2003-05-26 19:03:25 +03:00
monty@mashka.mysql.fi
68a159b1fa
New 4.1 protocol; SQLSTATE, CLIENT_MULTI_RESULTS, client character set
2003-05-26 19:01:20 +03:00
bar@bar.mysql.r18.ru
8192d169a2
CHARSET_INFO structure reorganization for easier maintainance
2003-05-23 17:45:52 +05:00
bar@bar.mysql.r18.ru
a238efaa63
SHOW FIELDS changes, more SQL99 INFORMATION_SCHEMA.COLUMNS compatibility:
...
Character set is not displayed in "Type" column anymore
In "Collation" column NULL instead of BINARY is now displayd for for non-character data types
2003-05-23 13:10:25 +05:00
monty@mashka.mysql.fi
cb7061ebe4
merge
2003-05-22 02:57:27 +03:00
venu@myvenu.com
39cbb547d4
Resolve merge colflict
2003-05-21 00:12:09 -07:00
monty@narttu.mysql.fi
dd2b7918cd
Merge with 4.0.13
2003-05-19 16:35:49 +03:00
monty@narttu.mysql.fi
13530887cb
Fix for UNION and LEFT JOIN (Bug #386 )
...
Fixed wrong logging of Access denied error (Bug #398 )
2003-05-13 18:58:26 +03:00
serg@serg.mylan
784fb81426
INSERT ... UPDATE ... VALUES()
2003-05-03 01:16:56 +02:00
venu@myvenu.com
eb137c063c
Support of warnings for all DML statements (Insert, Update and Alter)
...
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
wax@kishkin.ru
74e32241c4
Auto merged
2003-04-02 18:15:16 +06:00
bar@bar.mysql.r18.ru
0989db3e90
More OpenGIS compatibility:
...
Point, MultiLine, Poligom, etc, are now not aliases
for Geometry, but separate field types.
2003-03-27 13:09:09 +04:00
monty@narttu.mysql.fi
9f200ede0d
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into narttu.mysql.fi:/my/mysql-4.1
2003-03-20 02:06:08 +02:00
ram@mysql.r18.ru
031ac2a7b2
SRID support.
...
GeomertyFromWKB() function.
SRID() function.
::store() methods for Field_geom.
Code cleanup.
2003-03-18 15:30:32 +04:00
wax@kishkin.ru
12f1cb55b5
This is full commit of group_concat with support subselects
2003-03-18 04:07:40 +05:00
monty@narttu.mysql.fi
a434bca704
Merge with 4.0
2003-03-16 19:17:54 +02:00
monty@mashka.mysql.fi
fef194fcb8
Fix for --new option (Timestamp in YYYY-MM-DD HH:MM:SS format)
2003-03-12 14:34:54 +02:00
monty@mashka.mysql.fi
d56e2acf50
Merge to get fix for LOCK TABLES + DROP TABLE in another thread
2003-03-07 01:20:56 +02:00
serg@serg.mysql.com
80c34b2aef
fixed Field::eq() to work with CHAR(0) fields
2003-03-04 18:02:56 +01:00
bar@bar.mysql.r18.ru
6cbbbd6948
Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
...
for binary collations
2003-03-04 12:33:52 +04:00
monty@mashka.mysql.fi
303c3e30ab
Added charset number to result header
2003-02-04 03:19:19 +02:00
bar@bar.mysql.r18.ru
735399a850
Move latin1 into a separarte file
2003-01-29 17:31:20 +04:00
hf@deer.mysql.r18.ru
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
bar@bar.mysql.r18.ru
a292d4f632
New "fill" function in charset_info_st structure
2003-01-28 14:58:06 +04: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
hf@deer.mysql.r18.ru
389680e04e
Conflicts resolving
2003-01-20 18:59:45 +04:00
jani@rhols221.adsl.netsonic.fi
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
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
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
venu@myvenu.com
5c4b7a2e96
Binary protocol changes (to monty)
2003-01-03 03:52:53 -08:00
bar@bar.mysql.r18.ru
e5103ce714
Less "default_charset_info"
2002-12-19 15:27:46 +04:00
hf@deer.mysql.r18.ru
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
c3053148f4
BINARY_FLAG has been restored.
...
It's needed by ODBC code.
2002-12-19 14:36:05 +04:00
hf@deer.mysql.r18.ru
bb67600df4
Merging
2002-12-17 19:57:23 +04:00
bar@bar.mysql.r18.ru
0ce4ae35e5
Some fixes to get closer to UCS2 compatible SHOW FIELDS
2002-12-17 14:35:19 +04:00
bar@bar.mysql.r18.ru
4f2a57c511
Move all sql_type() to the same file
2002-12-17 11:25:27 +04: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
hf@deer.mysql.r18.ru
3517febe97
Resolving merge conflicts
2002-12-12 12:49:56 +04:00
bar@bar.mysql.r18.ru
b4fcdaa276
Preparation to charset dependant test_if_int and test_if_real
2002-12-11 17:42:48 +04: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
monty@mashka.mysql.fi
859b688476
Merge with 4.0.6
2002-12-05 19:38:42 +02:00
