konstantin@oak.local
d37da004f6
THD::lex now points to THD::main_lex like in 5.0
...
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
pem@mysql.com
6e717133c5
Merge 4.1 to 5.0
2003-12-01 16:14:40 +01:00
monty@mysql.com
ede8169d24
Added missing SSL library (Should be in source distribution)
...
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
2003-11-28 12:18:13 +02:00
pem@mysql.comhem.se
d8bf426b80
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
...
and BUG#1966: "select 1 into a" on top-level hangs client
2003-11-27 16:48:21 +01:00
monty@mysql.com
7c6113a39f
Merge key cache structures to one
...
Fixed compiler warnings (IRIX C compiler and VC++)
2003-11-20 22:06:25 +02:00
pem@mysql.comhem.se
5b355ea6f5
Post-merge fixes.
2003-11-19 16:59:35 +01:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
monty@mashka.mysql.fi
cab1dc628c
CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
...
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
2003-11-18 13:47:27 +02:00
monty@narttu.mysql.fi
f763d4c31d
Removed some warnings reported by valgrind
...
After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed
2003-11-04 14:09:03 +02:00
monty@narttu.mysql.fi
a444a3449f
Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error
...
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
2003-11-03 14:01:59 +02:00
pem@mysql.com
337238b78a
Merging 4.1->5.0
2003-10-22 16:10:22 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62
Merge commit
2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800
Scrum task 835 - text-to-datetime conversion function
2003-10-20 13:24:18 +05:00
pem@mysql.telia.com
689bb84f72
WL#962: Added simple, read-only, non-scrolling, asensitive cursors in SPs, using the
...
(updated) Protocol_cursor class.
Also did some bug fixes.
2003-10-10 16:57:21 +02:00
pem@mysql.com
8d884c02bb
Merging 4.1 -> 5.0
2003-09-24 11:29:38 +02:00
hf@deer.(none)
7dd4cb58d6
SCRUM
...
prepared statements in embedded library
2003-09-18 12:25:00 +05:00
hf@deer.(none)
ddbca4176d
SCRUM:
...
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
pem@mysql.telia.com
04f0570fe8
Implemented SP CONDITIONs and HANDLERs, with the extension of handling
...
MySQL error codes as well.
(No UNDO HANDLERs yet, and no SIGNAL or RESIGNAL.)
WL#850
2003-09-16 14:26:08 +02:00
kostja@oak.local
f1a4f7d037
Monty explanation for net_store_length(uint) put to the comment
2003-09-03 18:07:00 +04:00
pem@mysql.com
7f158dd12a
Merge 4.1 into 5.0
2003-08-26 11:51:09 +02:00
kostja@oak.local
50d3291aee
manual merge
2003-07-31 17:11:52 +04:00
hf@deer.(none)
a4f899dfc0
SCRUM - adding client into embedded server
...
error handling fixed
fetch_lengths made to work differently in embedded and client cases
2003-07-23 15:23:20 +05:00
kostja@oak.local
09e53b0169
Style fixes, comments for 4.1.1 authorization
...
Now special 1-byte packet is used for request of old password
Fixed bug with --skip-grant-tables and acl_getroot
2003-07-18 18:25:54 +04:00
hf@deer.(none)
6b303f846b
Including client code into libmysqld
...
Merging
2003-07-14 16:41:58 +05:00
pem@mysql.telia.com
9c3a7a6ba3
Merge 4.1 into 5.0 (first pass).
2003-07-08 17:50:23 +02:00
gluh@gluh.mysql.r18.ru
5709ed20ab
SAPDB date/time finctions
2003-07-08 15:06:05 +05:00
gluh@gluh.mysql.r18.ru
e6eef74812
Merge gluh@gw:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-07-08 12:57:00 +05:00
hf@deer.(none)
9d4bae335c
Resolving conflicts
2003-07-04 13:21:14 +05:00
monty@mashka.mysql.fi
fff60e3a86
Fixed slowdown problem on windows
2003-06-25 19:43:06 +03:00
gluh@gluh.mysql.r18.ru
91e3245b67
Merge gluh@gw:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.DTFUNC
2003-06-23 13:02:28 +05:00
gluh@gluh.mysql.r18.ru
66af4b5c9a
Internal commit
2003-06-23 12:56:44 +05:00
hf@deer.(none)
7e1ce534c9
SCRUM
...
including client code into embedded server
code to guess what library to use added
net_field_length moved to pack.c
2003-06-18 15:58:57 +05:00
hf@deer.(none)
b82e89d872
SCRUM
...
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
2003-06-17 21:53:13 +05:00
hf@deer.(none)
c4e3a624b8
SCRUM
...
client capabilities included into libmysqld
some API methods became "virtual"
lots of duplicated code removed
IMHO all the above made library's code way more pleasant to look at, didn't it?
2003-06-17 21:32:31 +05:00
monty@narttu.mysql.fi
a1034db4b9
Cleanup after split of libmysql.c to client.c and libmysql.c. A 4.1 master/slave will now use the 4.1 protocol
...
Fixed wrong value for SQLSTATE_LENGTH
Added CLIENT_REMEMBER_OPTIONS to mysql_real_connect()
Changed mysql_port and mysql_unix_port to mysqld_xxxx
2003-06-14 11:37:42 +03:00
monty@narttu.mysql.fi
dad0664579
merge with public tree
2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
23145cfed7
Added SQLSTATE to client/server protocol
...
bmove_allign -> bmove_align
Added OLAP function ROLLUP
Split mysql_fix_privilege_tables to a script and a .sql data file
Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects.
Added table_alias_charset, for easier --lower-case-table-name handling
Better SQL_MODE handling (Setting complex options also sets sub options)
New (faster) assembler string functions for x86
2003-06-04 18:28:51 +03:00
bar@bar.mysql.r18.ru
bb611fa0a2
mysqlshow and mysqldump now send their vharacter set to server
...
character_set_results is now the same with character_set_client by default
2003-05-30 23:09:35 +05: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
8d52377a5c
Some SHOW VARIABLES have been renamed:
...
collation_client -> character_set_client
collation_results -> character_set_results
character_set -> character_set_server
SET NAMES now doesn't start client->server conversion
SET CHARACTER SET now starts both client->server and server->client conversion
2003-05-21 17:44:12 +05:00
pem@mysql.com
35c82164f6
Merged 4.1 to 5.0.
2003-04-29 12:06:04 +02:00
bar@bar.mysql.r18.ru
6d5f527afd
Variable names have been renamed:
...
client_collation -> collation_client
result_collation -> collation_results
connection_collation -> collation_connection
2003-04-23 18:19:22 +05:00
pem@mysql.com
a4e065920b
Made multiple queries (SELECT without INTO) work in SPs.
...
This included bug fixes in the 4.1 protocol (actually send and receive the
server_status flags).
2003-04-23 09:22:54 +02:00
bar@bar.mysql.r18.ru
8cf9ada977
Use of CHARSWT_INFO *result_collation
...
instead of bool convert_result_charset
SET CHARACTER SET inststead of SET NAMES in tests
2003-04-08 14:38:17 +05:00
bar@bar.mysql.r18.ru
e165845d39
sys_var_collation is now abstract class
...
Two separate classes sys_var_client_collation and sys_var_literal_collation have been added
for "literal_collation" and "client_collation" variables.
2003-04-07 16:10:27 +05:00
bar@bar.mysql.r18.ru
e0caf3f225
New methods to store strings with "convert to" argimument
2003-04-07 13:52:48 +05:00
bar@bar.mysql.r18.ru
4532985221
New variable to turn off automatic charset conversion of query results
...
Some speed improvements
2003-03-21 15:18:52 +04:00
bar@bar.mysql.r18.ru
8103c4c537
CONVERT class was removed
2003-03-18 17:01:32 +04:00
bar@bar.mysql.r18.ru
04db86f22a
2003-03-17 21:56:34 +04:00
bar@bar.mysql.r18.ru
caf31a0790
Preparing to client<->server autoconvert
2003-03-17 13:14:04 +04:00
serg@serg.mysql.com
15dbe91a6e
fixed typo (double ++ in assert)
...
removed all side effects from asserts for not to confuse casual reader
2003-03-15 11:56:03 +01:00
venu@myvenu.com
3f7e4239a2
Fix for not to assert in DBUG mode when the result type is INT24 as data is sent in INT32 format
...
(normal protocol only, prepared protocol already handles it)
2003-03-14 10:35:13 -08:00
bar@bar.mysql.r18.ru
4e1cc32318
sql_udf.cc, protocol.cc:
...
Less default_charset_info
2003-02-26 14:08:31 +04:00
venu@myvenu.com
ee2b888696
Windows portabilty fixups (last commit caused some errors, so recomitting) - SCRUM
2003-02-20 14:14:37 -08:00
monty@mashka.mysql.fi
acf8993439
Fixed problem when connecting to user without a password.
...
Fixed problem with LIKE and BINARY
2003-02-14 11:47:41 +02:00
monty@mashka.mysql.fi
023d6dd39b
Merge with 4.0.11
2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
aee15a4407
merge
2003-02-04 03:27:47 +02:00
monty@mashka.mysql.fi
303c3e30ab
Added charset number to result header
2003-02-04 03:19:19 +02:00
bell@sanja.is.com.ua
e294751c41
fixed bug in determinating uncacheable queries
...
new fatal_error interface to assign is_fatal_error and ne.report_error
commant about Item_row
2003-01-30 22:15:44 +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
pem@mysql.com
d9d5ddb52d
Fixed bug in Protocol::convert_str() (missing return caused "Out of memory" errors
...
when optimized).
2003-01-22 17:51:53 +01:00
serg@serg.mysql.com
897b165bda
workaround for gcc bug
2003-01-22 15:05:37 +01: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
1f6b615677
SCRUM
...
embedded-related changes
2003-01-20 18:47:25 +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
monty@mashka.mysql.fi
f8e660d88c
merge with 4.0.9
...
To get bug fixes for TCP/IP connections, FORCE INDEX and OPTIMIZE TABLE with NULL keys
2003-01-09 03:55:26 +02:00
monty@mashka.mysql.fi
803dff1002
Merge with 4.0.8
2003-01-06 02:04:52 +02:00
venu@myvenu.com
fc7a1bfacf
Fix date,time,timestamp,year - binary protocol
2003-01-03 23:37:16 -08:00
venu@myvenu.com
5c4b7a2e96
Binary protocol changes (to monty)
2003-01-03 03:52:53 -08:00
hf@deer.mysql.r18.ru
8a205e4ba3
Merge
2002-12-19 14:57:24 +04:00
bar@bar.mysql.r18.ru
6ac401b550
thd_charset has been moved to variables structure
2002-12-19 09:38:28 +04:00
hf@deer.mysql.r18.ru
d8c700891e
Merging&testing
2002-12-17 19:33:25 +04:00
hf@deer.mysql.r18.ru
c1e69d2cca
Merging
2002-12-16 18:58:55 +04: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
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