Commit graph

811 commits

Author SHA1 Message Date
paul@kite-hub.kitebird.com
c53dc62ece client.c, libmysql.c:
Symbol spelling change.
errmsg.c:
  Client error message edits.
errmsg.h:
  Two symbol spelling changes.
2004-06-30 22:18:41 -05:00
paul@kite-hub.kitebird.com
925c5ce711 Reword some client error messages. 2004-06-29 12:28:45 -05:00
konstantin@mysql.com
786e5ff717 Fix for compilation failure on high-byte-first platforms. 2004-06-26 04:54:11 +04:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
konstantin@mysql.com
354e2ba67b Type of MYSQL_BIND::buffer changed to void * 2004-06-25 17:04:33 +04:00
konstantin@mysql.com
a30fcdc690 Fix for Bug#4030 "Client side conversion string -> date type doesn't
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
2004-06-23 16:44:34 +03:00
konstantin@mysql.com
b81315d6e8 Fixes to make client_test run on 64 bit Sun: a bug in libmysql and
test suite fixed.
2004-06-22 23:07:08 +04:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
guilhem@mysql.com
c5544563ac swapping lines to make gcc happy 2004-06-19 15:35:41 +02:00
guilhem@mysql.com
6b45c24d39 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
2004-06-18 23:51:15 +02:00
guilhem@mysql.com
19dbf58eec API change: mysql_shutdown() now requires a 2nd argument, the shutdown level.
mysqld >=4.1.3 will however understand shutdown requests sent by clients <4.1.3.
And mysqld <4.1.3 will understand shutdown requests sent by clients >=4.1.3
(it will ignore the level). Those shutdown level are just PLACEHOLDERS now.
So this change is just to make the 4.1 API suitable before it is frozen. Later
we will actually implement the shutdown levels.
2004-06-18 23:50:04 +02:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173)
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
2004-06-18 03:02:29 +03:00
monty@mysql.com
6e820c8024 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0 2004-06-18 02:48:01 +03:00
guilhem@mysql.com
5a0a4a134f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
2004-06-17 15:41:54 +02:00
guilhem@mysql.com
69bea44bc9 Fix for BUG#4017 "mysql_real_connect buffer overflow" 2004-06-17 15:40:13 +02:00
konstantin@mysql.com
5b5af92fa3 - mysql_stmt_send_long_data commented. A few other comments. 2004-06-17 02:03:15 +04:00
konstantin@mysql.com
e9f2c7d478 Comments and cleanups in client library. 2004-06-16 23:11:02 +04:00
konstantin@mysql.com
5f8ef7a38d Another place where Bug#4079 "error checking in prepared statements"
pops up fixed.
2004-06-16 14:06:39 +04:00
guilhem@mysql.com
f1fda6387e API change: mysql_shutdown() now needs a 2nd parameter, the shutdown level.
Server will however still accept shutdown without specified level; so that old
mysqladmin can still shut server down.
I would like your comments on the names of shutdown level which I chose. You
are welcome to propose better names. Please however check WL#709 before.
Reason for the names I propose is to be accurate, thus leaving possibility
for other levels which we may imagine in the future; that's why I have rejected
names like "fast", "smart", "graceful" so far. My position is that WAIT_ALL_BUFFERS
or WAIT_CRITICAL_BUFFERS say what the shutdown does, whereas for "smart", "fast" you
need to remember what it does.
This should be pushed in 4.1.3 but only after your comments.
2004-06-15 11:35:23 +02:00
konstantin@mysql.com
b9f2b34200 Fixed to compile with IBM C Compiler for AIX Version 6 2004-06-15 12:29:22 +04:00
konstantin@mysql.com
21c524e712 Fix for Bug#4079 "error checking in prepared statements":
reset mysql->status if there was an error in row reading.
2004-06-11 13:12:29 +04:00
konstantin@mysql.com
f08bbd1f12 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for
some reason wasn't included before.
A lot of files cleaned up from #include <assert.h>
2004-06-10 23:58:39 +04:00
konstantin@mysql.com
dc11d3cfa1 Proposed fix for Bug#4026 "Microseconds part of TIME/DATETIME types
is broken (prepared statements)": fixed date handling in many places 
of prepared statements code.
2004-06-09 03:21:50 +04:00
konstantin@mysql.com
dabc0e774e mysql_stmt_field_count() 2004-06-06 02:27:05 +04:00
konstantin@mysql.com
231ec66652 More comments in prepared statements code. 2004-06-06 00:33:16 +04:00
monty@mysql.com
42c35d4569 Added authentication code that was missed in merge
Added new windows configuration
2004-06-03 01:55:47 +03:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
hf@deer.(none)
9145dcef5e mysql_get_parameter interface fixed 2004-05-31 13:53:10 +05:00
dlenev@brandersnatch.localdomain
03b705ff44 Made my_snprintf() behavior snprintf() compatible when printing %x arguments (it should
produce hex digits in lower case). (fixed version)

Replaced _dig_vec array with two _dig_vec_upper/_dig_vec_lower arrays.
Added extra argument to int2str function which controls case of digits you get.
Replaced lot of invocations of int2str for decimal radix with more optimized int10_to_str()
function.
Removed unused my_itoa/my_ltoa functions.
2004-05-27 17:54:40 +04:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
hf@deer.(none)
78f58ff384 Fix to make Windows compilation smoother 2004-05-26 21:40:27 +05:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03:00
monty@mysql.com
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation)
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
konstantin@mysql.com
f207b33a7b Support for character set conversion in binary protocol: another go
after Monty's review.
- Item_param was rewritten.
- it turns out that we can't convert string data to character set of
  connection on the fly, because they first should be written to the binary
  log.
  To support efficient conversion we need to rewrite prepared statements
  binlogging code first.
2004-05-25 02:03:49 +04:00
hf@deer.(none)
e18cd2ea9f Fixes for #3371, #3372, #3374, #3375, #3376 2004-05-15 17:07:44 +05:00
miguel@hegel.local
feb5d24d04 Fix VC++ compiler error (function redifinition) for embedded server 2004-05-10 20:55:52 -03:00
georg@beethoven.local
c745ae9503 Added additional parameter userdata for mysql_set_local_infile_handler
to allow binding of userland functions in PHP.
2004-05-07 14:50:10 +02:00
monty@mysql.com
9e71351122 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-07 01:44:07 +03:00
monty@mysql.com
939ea71ecd Portability fixes
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
2004-05-07 01:43:17 +03:00
konstantin@mysql.com
b58df2e9d4 mysql_stmt_reset now expects ok/error packet from server. 2004-05-06 22:44:00 +04:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447)
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
2004-05-04 15:02:38 +03:00
monty@mysql.com
661aeb5af2 Only calculate MYSQL_FIELD->max_length if mysql_stmt_attr_set(..., STMT_ATTR_UPDATE_MAX_LENGTH) is done. 2004-04-30 14:24:06 +03:00
monty@mysql.com
0a95918ee9 Merge 2004-04-30 14:04:51 +03:00
monty@mysql.com
6678ecf19a Update 'MYSQL_FIELD->max_length' on mysql_stmt_store_result() (Bug #1647)
Added checking of cut read lines in bootstrap thread (Bug #2874)
2004-04-30 14:02:17 +03:00
konstantin@mysql.com
07eaf18642 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-u2
2004-04-30 03:00:55 +04:00
konstantin@mysql.com
aec8522569 Fix for Bug#3035 "Prepared statement integer inserts": now unsigned
flag is sent to server with placeholder types.
There were no need to extend the protocol as one additional byte
was reserved for placeholder code, when placeholder code is in range 0-255.
So this byte is now used for flags. Post-review fixes added.
2004-04-30 03:00:19 +04:00
konstantin@mysql.com
392481dae5 Implementation of mysql_stmt_attr_get and mysql_stmt_attr_set
requested by Monty for Bug#1647 (No way to determine what size 
blob/clob is being returned into bound buffer)
2004-04-30 01:02:29 +04:00
monty@mysql.com
32d0b69503 Allow one to send empty strings with mysql_stmt_send_long_data()
mysql_stmt_reset() now resets param->long_data_used
Abort if --defaults-file=path-name uses a non-existing file (Bug #3413)
Fixed problem with symlink test (bug in 4.1.2)
2004-04-28 20:19:50 +03:00
konstantin@dragonfly.local
4a4f5fc601 Stubs for types/names of placeholders, cursor flags and array execution count
implemented in the client library and server.
Warning: this makes the new client library and server incompatible with all 
previous versions and 5.0.
2004-03-31 02:27:49 +04:00
konstantin@mysql.com
889790a15c Simplification: MYSQL_RES *result replaced with MYSQL_DATA result;
No need to check for result existence any more, store_result functions
now are shorter.
cli_read_binary_rows rewritten to handle MYSQL_DATA directly.
2004-03-28 17:22:04 +04:00
serg@serg.mylan
072ddb0194 bad merge (?) fixed 2004-03-26 13:21:48 +01:00
monty@mysql.com
1448199bd7 Cleanups & safety fixes 2004-03-25 22:11:22 +02:00
bar@bar.intranet.mysql.r18.ru
3827fa5589 Unicode Collation Algorithm subset implementation 2004-03-24 16:16:08 +04:00
jcole@mugatu.jcole.us
15cc92cacb Added LOCAL INFILE callback function support. 2004-03-22 19:58:49 -05:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
konstantin@mysql.com
b9f51f7081 WL #1510 "Implement support for "commercial" binaries on handshake",
client library:
- implemented 'check_license' function
2004-03-17 20:04:50 +03:00
miguel@hegel.local
bdd771edc5 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-16 15:55:51 -03:00
konstantin@mysql.com
420c956d27 Intermediate commit of client library (cleanups + fixes of 3 items from
flaws list)
TODO: 
 * verify that no sequence of API calls produces SIGSEGV.
 That is, verify that mysql_stmt_init  -> mysql_stmt_fetch is OK,
 or mysql_stmt_prepare -> mysql_stmt_fetch_column is OK and sets
 meaningful error.
 * remove alloc_stmt_fields call
 * revise stmt->state codes and statement states.
 * there are other items in prepared statements 'to fix' document.

Done:
 - cleanups and comments
 - revision of prepared statement error codes.
 - mysql_stmt_prepare is now can always be called (that is, you can reprepare
   a statement)
 - new implementation of mysql_stmt_close and fetch cancellation
2004-03-16 01:04:04 +03:00
miguel@hegel.local
9c3f21583c Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-12 17:59:06 -03:00
miguel@hegel.local
7efba206fd For to export the renamed functions 2004-03-12 15:51:18 -03:00
konstantin@oak.local
001ad87554 fix to make client.c compile on windows 2004-03-12 18:53:45 +03:00
konstantin@oak.local
a1834919a9 Rudimentary part of libmysql patch:
set_mysql_error is deployed
2004-03-12 15:21:48 +03:00
monty@mysql.com
98fb8ea4c7 Merge with 3.23 to get patch for floor() 2004-03-12 01:12:14 +02:00
konstantin@oak.local
082a01d1e0 Rename:
read_statistic -> read_statistics
(statistic is adjective)
2004-03-10 20:12:24 +03:00
konstantin@mysql.com
1d624d3546 Fix for C++ style declaration 2004-03-05 19:04:59 +03:00
konstantin@mysql.com
7753c6b93e New call mysql_stmt_init() introduced.
Renames:
mysql_bind_param      -> mysql_stmt_bind_param
mysql_bind_result     -> mysql_stmt_bind_result
mysql_execute         -> mysql_stmt_execute
mysql_fetch           -> mysql_stmt_fetch
mysql_fetch_column    -> mysql_stmt_fetch_column
mysql_get_metadata    -> mysql_stmt_result_metadata
mysql_param_count     -> mysql_stmt_param_count
mysql_param_result    -> mysql_stmt_param_metadata
mysql_prepare         -> mysql_stmt_prepare
mysql_send_long_data  -> mysql_stmt_send_long_data

client_test.c cleaned up from memory leaks
2004-03-05 16:55:09 +03:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-02-22 11:01:28 +02:00
monty@mashka.mysql.fi
f816e51096 Added missing argument to strxnmov() (Applies for windows debug mode) 2004-02-20 17:58:34 +02:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
hf@deer.(none)
9ceddd4ad1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2237
2004-02-20 12:18:48 +04:00
hf@deer.(none)
e01ea15029 Fix for #1429 (Segfault in mysql_stmt_close)
Problem was that we checked for existing connection in stmt_close
and did not free(stmt) if it's closed (that didn't work well with
embedded)
I just added new flag to the stmt_close and now we check it instead
of connection
2004-02-20 12:18:06 +04:00
monty@mysql.com
e1fee022fa Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-02-19 22:04:46 +02:00
monty@mysql.com
14dc56b2a1 Fixed usage of strxnmov() in recent changesets 2004-02-19 22:04:31 +02:00
monty@mashka.mysql.fi
e347f63192 Max open files handling moved to my_set_max_open_files()
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
2004-02-19 19:33:09 +02:00
greg@mysql.com
25872043b5 Merge gweir@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/bk/mysql-4.0
2004-02-19 14:56:31 -01:00
serg@serg.mylan
7a03cf04af potential problem fixed afer some reasoning 2004-02-19 09:11:46 +01:00
monty@mysql.com
e9315f984d Changed wellformedlen to well_formed_len
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
2004-02-17 01:35:17 +02:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
hf@deer.(none)
e100530b3e Fix for #2212 (mysql_change_user doesn't work in embedded library)
now it's working
2004-02-14 20:26:21 +04:00
serg@serg.mylan
01c2ca5b8a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-02-13 15:30:00 +01:00
serg@serg.mylan
5914e5705c my_atof is deleted
strtod from mit-threads is restored and cleaned up
2004-02-13 15:27:21 +01:00
konstantin@mysql.com
b865fb1cf3 manual merge, bug #2247 2004-02-13 00:50:03 +03:00
dlenev@mysql.com
8e6a2e98ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-bg2248
2004-02-11 16:09:33 +03:00
hf@deer.(none)
f347208ac9 Addition to the fix for #2208
Made code shorter and more correct
2004-02-11 16:35:56 +04:00
gluh@gluh.mysql.r18.ru
d5fa169fd1 Fix for bug#2021: Wron error message from the client 2004-02-11 12:30:20 +04:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
dlenev@dlenev.mshome
8ec663ef5b Fixed bug #2248 "mysql_fetch without prior mysql_execute hangs"
Done clean-up in prep stmt API functions:
1) Removed some checks that were performed only in debug version
were making debug version more tolerable to user errors than 
production (and thus caused problems for example masking some
bugs). 
2) Also removed some other checks to make prep stmt API 
consistent with the rest of C API (this also in line with 
general politics - make checks in only those places where 
errors are very common and hard to spot).
2004-02-10 16:58:20 +03:00
hf@deer.(none)
348bd98e48 Fix for #2208 (multi-query returns wrong result in embedded library)
now we execute only one first select during mysql_real_query
others - during 'mysql_next_result'
2004-02-10 17:09:59 +04:00
greg@mysql.com
1021948a3e Merge 2004-02-09 12:16:33 -01:00
konstantin@oak.local
69d00bdb88 Fix for bug #2247: "mysql_stmt_affected_rows returns affected rows from
last command"
2004-02-06 16:03:09 +03:00
miguel@hegel.local
108a7eabb6 For to export the right functions with changes done from 4.0.16 2004-02-04 13:39:01 -04:00
greg@mysql.com
e845a6685c Revise Windows build script, correct comment re NetWare in libmysql.c 2004-01-21 16:06:26 -01:00
paul@teton.kitebird.com
d1517d4997 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-23 09:47:02 -06:00
hf@deer.(none)
a735a51402 Fix for #2181 (mysql_execute crashed instead of returning error on embedded
server)
We didn't perform the check for the error for embedded server
2003-12-23 18:24:33 +04:00
paul@teton.kitebird.com
4050a2f58a Minor comment edits. 2003-12-22 13:08:16 -06:00
monty@mysql.com
eeff10e4c1 merge 2003-12-19 16:34:48 +02:00
hf@deer.(none)
de470e6f83 Fix for #2126
additional changes (after discussion with Monty)
2003-12-18 18:12:00 +04:00
hf@deer.(none)
42799cc584 Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters
mysql_once_init code included to mysql_server_init.
embedded-specific initialization is in init_embedded_server function
2003-12-18 15:51:22 +04:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
monty@mysql.com
7e92336b1d Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)
mysql_server_init() now returns error code if something went wrong (Bug #2062)
Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)
Fixed bug in UNION statement with alias '*'. (Bug #1249)
Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).
FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)
2003-12-11 06:24:08 +02:00
serg@serg.mylan
eaa0c4494f code cleanup after some reasoning 2003-12-09 20:49:48 +01:00
monty@mysql.com
a7610584d6 Merge mysql.com:/my/mysql-4.0 into mysql.com:/my/mysql-4.1 2003-11-28 20:44:26 +02:00
monty@mysql.com
cad6b7c8be rpl_parse and rpl_probe don't have to be reset as they are already 0 2003-11-28 20:41:33 +02:00
serg@serg.mylan
d2e065022f "optimization cleanup" reverted - problems on rpl_redirect test.
It happens that mysql->client_next->client_next=mysql
and mysql_close() goes into infinite loop.
Results vary from simple sigsegv (FreeBSD), to hard system lockup (Linux)
:)
2003-11-28 18:15:58 +01:00
monty@mysql.com
5914033478 merge with 4.0 to get fix for range bug 2003-11-28 15:55:43 +02:00
monty@mysql.com
320fcb0ef6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-11-28 14:23:54 +02: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
konstantin@oak.local
2e8cf31abc Second part of WL #519:
Client option secure-auth deployed on all possible layers:
- mysql client command-line and config file option
- mysql_options option MYSQL_SECURE_AUTH
- mysql_real_connect will automatically take into account that option if
  mysql->options.my_cnf_file/my_cnf_group is set
2003-11-28 13:11:44 +03:00
konstantin@mysql.com
3b9eb09276 no need to zero-initialize mysql->master->{rpl_pivot, options.rpl_parse,
options.rpl_probe} as they are zero-initialized in spawn_init()
2003-11-28 01:57:05 +03:00
konstantin@mysql.com
48ef39ee65 cleanup:
no need to set rpl_parse, rpl_probe and rpl_pivot to zero as whole mysql
structure is bzeroed in mysql_init(0) few lines before
2003-11-28 01:54:34 +03:00
monty@mysql.com
d87494c5ac Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
2003-11-22 03:21:40 +02: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
monty@mashka.mysql.fi
ac76198330 Portability fixes for AIX43 2003-11-20 02:48:09 +02:00
monty@mashka.mysql.fi
0bd17351ca Changed mysql_next_result() to return int instead of bool
Changed ~Item_func_in() to call cleanup() (to fix memory leak)
Fixed test_multi_statements() test in client_test
2003-11-19 17:31:57 +02: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
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
guilhem@mysql.com
c1f7f33960 4 small items in this:
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.
2003-10-31 23:20:23 +01:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows
After merge fixes
2003-10-15 22:40:36 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
2003-10-15 21:41:13 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
monty@mishka.mysql.fi
53fa223ed6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
2003-10-06 22:56:34 +03:00
hf@deer.(none)
8bc13b1874 Fix for bugs #1437, #1446 2003-10-04 19:28:08 +05:00
lenz@kallisto.local
5ce5a68b4e - Code cleanup: replaced C++-style comments with the proper syntax for
.c files (the IBM Visual Age C compiler aborts with a syntax error
   on these)
2003-09-24 08:35:02 +02:00
monty@narttu.mysql.fi
f05a1c8394 Block SIGPIPE also for not threaded client programs.
Added --include and --libs_r options to mysql_config.
Added mysql_get_client_version() to client library
Fixed some minor benchmark issues
2003-09-23 13:36:01 +03:00
hf@deer.(none)
cda32e123c SCRUM
prepared statements in embedded library.
some fixes after testing
2003-09-19 14:05:28 +05:00
hf@deer.(none)
0e059dcb74 SCRUM:
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries

Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
2003-09-18 18:28:42 +05:00
hf@deer.(none)
ddbca4176d SCRUM:
prepared statements in embedded library
2003-09-17 20:48:53 +05:00
hf@deer.(none)
7a763f3fe3 SCRUM
prepared statements in embedded library
2003-09-17 15:18:18 +05:00
hf@deer.(none)
bf017a2eb0 SCRUM
Prepared statements in embedded server
Several changes in library code with two goals:
to make mysql_prepare_stmt working in embedded server
to get rid of #define mysql_interface_func mysql->methods->interface_func
in user's interface
2003-09-16 16:06:25 +05:00
hf@deer.(none)
e63e2229b6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-09-12 19:36:42 +05:00
hf@deer.(none)
9f3996cde9 SCRUM:
#977 Prepared statements in embedded library
2003-09-12 19:35:34 +05:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes.
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
2003-09-11 19:06:23 +03:00
hf@deer.(none)
f434b329f5 SCRUM
embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'
2003-09-11 09:46:31 +05:00
hf@deer.(none)
2ba517a3f1 fix for #1210 2003-09-08 13:11:18 +05:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
serg@serg.mylan
2317fa3ba5 C cleanups 2003-09-03 16:31:01 +02:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were
lost.
2003-09-03 14:12:10 +04:00
vva@eagle.mysql.r18.ru
dc554ab989 fixed bug #1174 2003-09-02 12:09:27 -04:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
8a77f97079 Add detection of in_addr_t
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
2003-08-28 06:08:17 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _)
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
2003-08-27 02:51:39 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03: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)
cbff55a59d SCRUM
Including client code into embedded library
fixes
2003-07-18 16:26:35 +05:00
hf@deer.(none)
6b303f846b Including client code into libmysqld
Merging
2003-07-14 16:41:58 +05:00
hf@deer.(none)
1b1a126aa1 Some mistakes fixed 2003-07-14 16:38:51 +05:00
kostja@oak.local
941a8623ca resolved conflict with pulled changeset 2003-07-09 18:24:43 +04:00
venu@myvenu.com
bb718b31d0 implementation of mysql_stmt_reset client end 2003-07-08 02:27:21 -07:00
kostja@oak.local
a232225b69 Preliminary support for options --secure-auth,
--old-passwords
Support for option --old-protocol was removed.
Some test performed.
Tests for SSL and replication are pending.
More strict following to specification for --old-passwords
is in the TODO.
2003-07-08 02:36:14 +04:00
kostja@oak.local
1d20b23247 Bug fixes for authentication
OLD_PASSWORD made a keyword to allow set password=old_password('abc') constructions.
2003-07-04 20:52:04 +04:00
hf@deer.(none)
9d4bae335c Resolving conflicts 2003-07-04 13:21:14 +05:00
hf@deer.(none)
c224b55835 SCRUM
Including client code into embedded library

Code trimming (fixes of comments etc)
2003-07-04 11:40:10 +05:00
monty@narttu.mysql.fi
be22700954 Fix for UNIXWARE 7
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors
2003-07-03 19:23:06 +03:00
kostja@oak.local
7df0475847 First version of new authentification procedure: now authentification is one-stage (instead of two-stage in 4.1)
For now following tasks have been done:
- PASSWORD() function was rewritten. PASSWORD() now returns SHA1
  hash_stage2; for new passwords user.password contains '*'hash_stage2; sql_yacc.yy also fixed; 

- password.c: new functions were implemented, old rolled back to 4.0 state

- server code was rewritten to use new authorization algorithm (check_user(), change
  user, and other stuff in sql/sql_parse.cc)

- client code was rewritten to use new authorization algorithm
  (mysql_real_connect, myslq_authenticate in sql-common/client.c)

- now server barks on 45-byte-length 4.1.0 passwords and refuses 4.1.0-style
  authentification. Users with 4.1.0 passwords are blocked (sql/sql_acl.cc)

- mysqladmin.c was fixed to work correctly with new passwords

Tests for 4.0-4.1.1, 4.1.1-4.1.1 (with or without db/password) logons was performed;
mysqladmin also was tested. Additional check are nevertheless necessary.
2003-07-01 23:40:59 +04:00
monty@narttu.mysql.fi
1bd306ccd4 Fixed some new memory leaks
Updated VC++ files
2003-06-24 12:10:35 +03:00
monty@narttu.mysql.fi
039554f38b Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files 2003-06-23 23:32:07 +03:00
hf@deer.(none)
fed7a8d672 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
2003-06-19 16:38:51 +05:00
lenz@kallisto.local
853c3dd77f - added libmysql/client_settings.h to distribution 2003-06-19 10:46:45 +02: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)
66ecacb3c3 Last part of resolving conflicts after pull
Some intersections with Monty encountered
2003-06-18 10:34:09 +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
hf@deer.(none)
60a260d86d Fix for compilation error.
Compiler can signal error when init_sigpipe_variables expands as empty place.
Had to remove all semicolons after init_sigpipe_variables
2003-06-16 03:13:22 +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
venu@myvenu.com
d764294f12 Fix for mysql_list_fields & reset stmt buffers from stmt_free_result
Windows build fix
2003-06-08 09:11:14 -07:00
monty@narttu.mysql.fi
dad0664579 merge with public tree 2003-06-05 00:12:45 +03:00
monty@narttu.mysql.fi
40109c574a Merge with 4.0.13 2003-06-04 19:21:51 +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
monty@narttu.mysql.fi
6217b578b9 Fixed (not fatal) buffer overflow 2003-06-04 18:22:48 +03:00
venu@myvenu.com
c14de0f584 1. Portability fixups for Connector/ODBC 3.52 & DBD
(Addition of mysql_fetch_column & mysql_stmt_free_result)
 2. Windows build fixups for libmysqld, mysqlbinlog and mysqldemb
2003-06-04 00:17:48 -07:00
venu@myvenu.com
45fc8cc25b Fix windows build after applyiing the changes from new client.c(sql-common)
NOTE: Still the build fails to compile core server on Windows due to slave_net_timeout linker error from client.obj
      and make sure to have the next changeset, which fixes this.
2003-06-03 20:59:32 -07:00
hf@deer.(none)
9ad3c1cdca SCRUM:
splittiln common client's parts
2003-06-03 15:02:57 +05:00
hf@deer.(none)
02d3d7e8bd SCRUM:
Here is another pack of changes about gathering common client code in
sql-common/client.c.
Now i symlink the client.c from sql/ and libmysql/. These directories
have client_settings.h files to be included to client.c. It contains
defines and declarations to compile client.c in appropriate manner.
Also i've added include/sql_common.h, containing declarations of what
is exported from client.c

I removed as many #ifdef-s from client.c as i dared to. I think it's better
push it with some extra #ifdef-s now (of course, if everythihg besides it is
ok) so other people can check the code.
2003-05-31 15:15:46 +05:00
hf@deer.(none)
e5428b2fe9 Lots of conflicts resolved 2003-05-28 13:54:58 +05:00
monty@narttu.mysql.fi
bdb66d24dd ORDER BY optimization
Fixed new bug when reading field types
2003-05-27 18:40:37 +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
monty@mashka.mysql.fi
cb7061ebe4 merge 2003-05-22 02:57:27 +03:00
bar@bar.mysql.r18.ru
c03d807417 UCS2 and UTF8 are in separate files now 2003-05-21 15:29:44 +05:00
venu@myvenu.com
9ad75823e7 Fix for Windows build by adding pack.c to appropriate .dsp files 2003-05-20 23:44:28 -07:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
2003-05-20 23:41:15 -07:00
monty@narttu.mysql.fi
dd2b7918cd Merge with 4.0.13 2003-05-19 16:35:49 +03:00
hf@deer.mysql.r18.ru
7a7e0e1575 SCRUM
common parts of libmysql.c and sql/mini_client.cc moved to sql-common/client.c
names of functions now are same in both cases
2003-05-02 21:07:41 +05:00
hf@deer.mysql.r18.ru
ca02714715 SCRUM
Protocol_cursor class and sql-common/ directory
2003-04-23 19:37:33 +05:00
venu@myvenu.com
6120bc2bc7 Fix to have a reserved OK byte (prepare result) 2003-04-16 16:47:01 -07:00
venu@myvenu.com
077d7e81c8 Fix broken windows distribution workspace file (libmysql.dsp), which is causing VC IDE to crash while loading
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
2003-04-16 11:49:52 -07:00
miguel@hegel.local
63f911733b Exported functions required by MySQLCC 2003-04-16 11:43:04 -04:00
venu@myvenu.com
5cdcbb5782 Added the support of statement result navigation APIs 2003-04-16 00:07:10 -07:00
miguel@hegel.local
ca1f67c04e Exported functions claimed by MySQLCC 2003-04-11 14:48:03 -04:00
bar@bar.mysql.r18.ru
4e06f1f5bd German Phone book collation is always compiled
Some collation names have been renamed
2003-03-26 13:27:19 +04:00
monty@narttu.mysql.fi
b883a9c01c Merge with 4.0.12 2003-03-19 22:25:44 +02:00
lenz@mysql.com
04071da35a - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)
2003-03-18 22:14:02 +01:00
monty@narttu.mysql.fi
3ec97824b7 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
monty@narttu.mysql.fi
a434bca704 Merge with 4.0 2003-03-16 19:17:54 +02:00
root@home.(none)
5c6c54c09a system_charset_info has been moved to /sql directory
and isn't used in libraries any longer
2003-03-16 12:30:10 +04:00
monty@narttu.mysql.fi
f1635f64f9 Merge with 3.23 to get fixes for --user and BACKUP TABLE 2003-03-10 12:48:43 +02:00
monty@narttu.mysql.fi
1101613414 Better fix for connect timeout problem. 2003-03-10 11:50:46 +02:00
Sinisa@sinisa.nasamreza.org
e3c64d30a5 Additional bug fix 2003-03-08 22:37:22 +02:00
Sinisa@sinisa.nasamreza.org
df1ebd2a25 A correct fix for the timeout problem 2003-03-08 19:35:44 +02:00
monty@narttu.mysql.fi
3b073a08e0 Portability fixes
Don't define crc32 if we are not linking with gzip
2003-02-27 03:44:44 +02:00
Sinisa@sinisa.nasamreza.org
8439a4949f merge fix 2003-02-22 17:14:50 +02:00
venu@myvenu.com
1bd3cb7350 Fix for mysql_stmt_close(), so that the PHP layer can map it easily to know whether the 'stmt' is really freed, so that they can free their internal stmts 2003-02-21 15:00:05 -08:00
monty@mashka.mysql.fi
90bf074438 Merge with 4.0.11 tree to get latest bug fixes 2003-02-17 05:43:37 +02:00
monty@mashka.mysql.fi
6051b2f998 Fixed multi-table-delete for InnoDB tables
Novell patches
2003-02-17 02:14:37 +02:00
venu@myvenu.com
0ceba0e5cf Fix to read the correct 'default value' 2003-02-15 17:08:18 -08:00
venu@myvenu.com
c52d1035a3 Updated tests for MYSQL_FIELD members for misc cases 2003-02-15 15:01:04 -08:00
Sinisa@sinisa.nasamreza.org
f2a8927db7 Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-02-15 16:06:58 +02: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
Sinisa@sinisa.nasamreza.org
c75fa953e3 merge 2003-02-13 15:16:00 +02:00
monty@mashka.mysql.fi
3695c64111 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2003-02-12 23:18:00 +02:00
monty@mashka.mysql.fi
e327393e9d Fixed a lot of wrong memory references as reported by valgrind
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
2003-02-12 21:55:37 +02:00
Sinisa@sinisa.nasamreza.org
58f20edf9c connect timeout bug fix 2003-02-10 17:50:06 +02:00
monty@mashka.mysql.fi
60556efaca Update lengths for fields in MYSQL_FIELD 2003-02-08 01:00:35 +02:00
Sinisa@sinisa.nasamreza.org
08f2001e0c Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-02-07 14:57:15 +02:00
venu@myvenu.com
9aecb8d592 Fix compilation errors reported by Lenz on misc platforms 2003-02-06 14:47:56 -08:00
venu@myvenu.com
03fd42e601 Fix stupid signed and unsigned conversion - When field and buffer types are different (Client receiving end)
Added tests for singed and unsigned conversion (client_test.c)
2003-02-05 12:21:01 -08:00
Sinisa@sinisa.nasamreza.org
f825be63d0 a fix in libmysql.c 2003-02-05 22:13:06 +02:00
venu@myvenu.com
4e1d69d618 Conversion fix - bug report from PHP
Added a new conversion bug test
Changed options with default_options read from my.ini from [client] section
More cleanups for better usage
2003-02-04 18:54:14 -08:00
monty@mashka.mysql.fi
023d6dd39b Merge with 4.0.11 2003-02-04 21:52:14 +02:00
monty@mashka.mysql.fi
303c3e30ab Added charset number to result header 2003-02-04 03:19:19 +02:00
venu@myvenu.com
0aaab85f70 Force to read all unread packets on stmt_close 2003-01-31 15:20:03 -08:00
venu@myvenu.com
5c1d2a5626 Few misc cases check from PHP - client_test
Fix the buffer_length ovveride when length ptr is NULL - libmysql
2003-01-31 13:43:38 -08:00
venu@myvenu.com
2669ec02c4 Fix typo - un supported -> unsupported 2003-01-31 10:15:45 -08:00
venu@myvenu.com
87206f104a Fix alloc_stmt_fields for non-select statements
Add tests for show commands + MYSQL_TYPE_NULL coverage
2003-01-30 14:33:49 -08:00
venu@myvenu.com
81c580af37 Merge conflict 2003-01-30 01:02:57 -08:00
venu@myvenu.com
7e09f1db4b Fix 'n' concurrent prepared executions 2003-01-30 00:38:11 -08:00
bar@bar.mysql.r18.ru
735399a850 Move latin1 into a separarte file 2003-01-29 17:31:20 +04:00
bar@bar.mysql.r18.ru
08129eea2b Reorganization to restore generating charset C files from conf files 2003-01-29 15:08:09 +04:00
venu@myvenu.com
79e1fd8d0e Fix leak when the client disconnects with open prep statements 2003-01-28 09:24:27 -08:00
monty@mashka.mysql.fi
152f0603e7 Merge with 3.23.56 (Replace manual with 'empty' document)
Fix for bug when using auto_increment column and LAST_INSERT_ID()
2003-01-28 08:51:03 +02:00
monty@mashka.mysql.fi
689578a099 Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
2003-01-28 08:38:28 +02:00
monty@mashka.mysql.fi
9aa49681b8 Make PACKET_TOO_LARGE error handling safer in client 2003-01-28 02:10:56 +02:00
venu@myvenu.com
ca62e9f6a0 Fix stmt_close not to close the resources on error(libmysql)
Enable test_stmt_close() and test output to stdout(client_test)
2003-01-27 10:54:45 -08:00
monty@mashka.mysql.fi
1bdd1d0626 Merge with 3.23.55 2003-01-25 15:31:07 +02:00
venu@myvenu.com
bea75a4211 Misc cleanups + pure coverage test + Monty's comments 2003-01-24 03:17:26 -08:00
venu@myvenu.com
67579f4c48 MYSQL_TIME handling - client
Remove get_binary_length 
Enable the clients to work wih date,time and ts directly with binary protocol
2003-01-23 22:36:27 -08:00
monty@mashka.mysql.fi
9af5e6b70a Avoid memory overruns when buffer_length is too small (when fetching binary data in prepared statements) 2003-01-23 21:49:28 +02:00
venu@myvenu.com
93d4055e21 Remove bind_length + Fix the client-test 2003-01-22 01:30:13 -08: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
Sinisa@sinisa.nasamreza.org
4f50b80274 a symlink that was missing ... 2003-01-21 17:30:42 +02:00
venu@myvenu.com
082f7c9bda Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-18 11:59:36 -08:00
monty@mashka.mysql.fi
46ec0c5d33 Removed compiler warnings 2003-01-18 21:55:01 +02:00
venu@myvenu.com
a39da98d0d Initial multi query execution support 2003-01-18 11:53:38 -08:00
monty@mashka.mysql.fi
8acc22296c Change client_flag to unsigned long (16 -> 32 bits) to handle more options.
Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows
2003-01-18 16:39:21 +02:00
monty@mashka.mysql.fi
76f146a175 Merge with 4.0.9 2003-01-18 03:13:37 +02:00
venu@myvenu.com
51eb44c9e6 Merge work.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/bk/src-4.1
2003-01-16 15:47:46 -08:00
venu@myvenu.com
370b88f94c Implement store_result (read_binary_rows & mysql_stmt_store_result) 2003-01-16 15:00:22 -08:00
monty@mashka.mysql.fi
f4b950df96 Merge with 3.23 2003-01-16 20:47:46 +02: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
monty@mashka.mysql.fi
22b7e67b0b merge 2003-01-14 14:33:10 +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
miguel@light.
0928c8b4b4 Added functions required by MySQLCC 2003-01-11 01:56:00 -02:00
bar@bar.mysql.r18.ru
04ba0e85f0 xml.c has been moved to /strings from /mysys
This is to reuse code to generate charset related C files
from ther descriptions written in XML files
2003-01-10 17:01:55 +04:00
venu@myvenu.com
045b2f2336 Remove/change unwanted variables in client protocol
Add missed mysql_stmt_affected_rows()
sql_yacc.yy : Fix the compilation error .. bison 1.75
2003-01-09 17:56:34 -08:00
Sinisa@sinisa.nasamreza.org
e01bd0b26b Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-01-08 14:11:37 +02:00
venu@myvenu.com
c22219563a Code cleaup to fix the conversion routines - binary protocol 2003-01-07 18:57:39 -08:00
monty@mashka.mysql.fi
803dff1002 Merge with 4.0.8 2003-01-06 02:04:52 +02:00
Sinisa@sinisa.nasamreza.org
0ccaf94016 Fixing that 3.23 API / clients do not disconnect if a large
packet is issued.
2003-01-04 21:02:58 +02:00
monty@mashka.mysql.fi
f9772317ee merge 2003-01-04 15:40:55 +02:00
monty@mashka.mysql.fi
6d6f051178 Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
2003-01-04 15:37:20 +02:00
monty@mashka.mysql.fi
6d5ad61a11 Added support for max_allowed_packet in option files read by mysql_option()
Extended max_allowed_packet for clients to 1G
Fixed bug in sending compressed rows >= 16M
Fix bug in skiping too long packets from clients.
Added checking of wrong command number sent by client.
2003-01-04 15:17:16 +02:00
bar@bar.mysql.r18.ru
259b79beac libmysql.c:
SLL -> SSL
2003-01-04 13:35:52 +04:00
venu@myvenu.com
fc7a1bfacf Fix date,time,timestamp,year - binary protocol 2003-01-03 23:37:16 -08:00
venu@myvenu.com
881c9808a4 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-01-03 03:54:18 -08:00
venu@myvenu.com
5c4b7a2e96 Binary protocol changes (to monty) 2003-01-03 03:52:53 -08:00
bar@bar.mysql.r18.ru
c9000c247c Charset index is sotred in XML now 2003-01-03 14:35:32 +04:00
monty@mashka.mysql.fi
07daf3169e Merge with 4.0.8 2003-01-03 00:04:33 +02:00
lenz@mysql.com
fc8a78955b - fixes to properly make a "make distclean" (some files were not removed)
(There are probably some more to fix)
2002-12-27 17:37:55 +01:00
vva@eagle.mysql.r18.ru
6961e0069b fix some warnings 2002-12-21 02:53:07 +04:00
vva@eagle.mysql.r18.ru
9a0780cce0 fix warnings 2002-12-19 09:37:33 +04:00
vva@eagle.mysql.r18.ru
e5cc1ab97b Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/4.1
into eagle.mysql.r18.ru:/home/vva/work/MANY_INIT_COMMANDS/4.1
2002-12-17 19:14:38 +04:00
vva@eagle.mysql.r18.ru
f3871cf9b4 Many init commands on connect 2002-12-17 19:13:07 +04:00
monty@mashka.mysql.fi
146814f2ea Merge with 3.23 2002-12-11 13:32:31 +02:00
monty@mashka.mysql.fi
53ac261312 Added back -max to server name if we are using InnoDB. 2002-12-11 12:59:55 +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
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
monty@mashka.mysql.fi
f1d35b29bc merge fix 2002-12-06 21:15:05 +02:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
peter@mysql.com
dac10a8c81 Fix minor bug and add test of connection with new/old/without passwords 2002-12-05 14:01:15 +03:00
serg@serg.mysql.com
7b58a93a99 Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql 2002-12-05 02:02:44 +01:00
peter@mysql.com
3ee8bee22f Basically minor code optimizations and cleanups 2002-12-05 03:55:29 +03:00
serg@serg.mysql.com
eb37c17d34 better fix for read_rows, same for read_one_row 2002-12-05 01:01:38 +01:00
serg@serg.mysql.com
44db958ba2 new client error added: CR_MALFORMED_PACKET 2002-12-04 17:37:51 +01:00
lenz@mysql.com
1935183975 - Portability fixes for HP compiler on HPUX11 (backport from 4.0 tree)
- sql_analyse.cc: Fixed bug in decimal handling
2002-12-04 16:16:06 +01:00
serg@serg.mysql.com
6dfd1d867e merged 2002-12-04 10:16:19 +01:00
serg@serg.mysql.com
615c94655d protect from [heap] buffer overrrun by malicious server 2002-12-04 01:26:32 +01:00
peter@mysql.com
a24258375a SCRUM: Montymise code
fix mysql_change_user() for old clients
2002-11-30 20:58:53 +03:00
peter@mysql.com
54ff0efe7c SCRUM: Secure auth
Implement mysql_change_user
Get rid of double user search at authentication
Some cleanups
2002-11-30 16:31:58 +03:00
peter@mysql.com
08f51eaedd Merging.... 2002-11-29 22:03:14 +03:00
monty@mashka.mysql.fi
78037ac6b5 Merge work:/home/bk/mysql-4.1 into mashka.mysql.fi:/home/my/mysql-4.1 2002-11-28 11:29:35 +02:00
monty@mashka.mysql.fi
a44dfdde2d Fix wrong increment in prepared statements handling 2002-11-28 11:28:49 +02:00
venu@myvenu.com
70abdf3a51 Merge myvenu.com:/home/venu/bk/src-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2002-11-26 18:54:17 -08:00
venu@myvenu.com
e01a6c832d select_test.c, insert_test.c:
Added my_global.h to compile after my_list.h is added to mysql.h
sql_prepare.cc:
  Handle close stmt from client
  Minor fixups to make SET variable=? to work
sql_parse.cc:
  Added missed COM_CLOSE_STMT
mysql_priv.h:
  Change mysql_stmt_close to mysql_stmt_free to not to conflict with client type
libmysql.c:
  Clean all open stmts during mysql_close() implicitly
2002-11-26 18:51:38 -08:00
serg@serg.mysql.com
b385eb4a05 removed redundant -I include-dirs 2002-11-26 14:01:08 +01:00
peter@mysql.com
d2aa1fb8e7 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-11-24 17:35:24 +03:00
peter@mysql.com
925155cf5a Merge.... 2002-11-24 17:26:26 +03:00
peter@mysql.com
35ccfd0b42 SCRUM: Main change for Secure connection handling. Still needs some more coding. Commit
done for merge with newer version of code.
2002-11-24 17:07:53 +03:00
venu@myvenu.com
93fdc6a584 libmysql.c:
fix merge conflict
2002-11-22 10:52:52 -08:00
venu@myvenu.com
47b51f613e merge 2002-11-22 10:21:29 -08:00
venu@myvenu.com
a9aebd433d protocol merge 2002-11-22 10:20:14 -08:00
venu@myvenu.com
b74c43f475 protocol fixups 2002-11-22 10:04:42 -08:00
monty@mashka.mysql.fi
dac6498f9b Merge with 4.0 2002-11-21 15:56:48 +02:00
monty@mashka.mysql.fi
f86d328927 Added some compatibility modes (for the future) 2002-11-20 21:44:32 +02:00
monty@mashka.mysql.fi
1a96948e81 Small improvement to alloc_root
Add support for LIMIT # OFFSET #
Changed lock handling:  Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
2002-11-16 20:19:10 +02:00
wax@mysql.com
e91d1b2cbe Add shared memory protocol and option --protocol 2002-11-15 00:16:30 +05:00
monty@hundin.mysql.fi
b0fae584b9 Portability fixes for HP compiler and HPUX11 2002-11-09 13:26:46 +02:00
gluh@gluh.(none)
7bf903ea10 Error code for ssl connection
Fix bug when server hang(with SSL, with modified libmysql)
Add options master-ssl-capath and master-ssl-cipher
Add some error checking(SSL)
2002-11-05 12:05:58 +04:00
lenz@mysql.com
9b769dbd22 - replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11)
2002-10-24 14:30:25 +02:00
peter@mysql.com
3d32b14de5 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-23 23:28:36 +04:00
bar@bar.mysql.r18.ru
6539c6a51f ctype.c, Makefile.am, Makefile.shared:
binary charset
ctype-bin.c:
  new file
2002-10-23 15:40:22 +05:00
peter@mysql.com
4825e3264d Merge to update to recent tree version 2002-10-20 00:09:11 +04:00
monty@narttu.mysql.fi
3c7f6a9835 merge 2002-10-14 12:07:16 +03:00
peter@mysql.com
5e873b2075 Merge mysql.com:/home/pz/mysql/mysql-4.1-root
into mysql.com:/home/pz/mysql/mysql-4.1
2002-10-09 22:02:43 +04:00
bar@bar.mysql.r18.ru
50c391538a my_sortcmp -> my_strnncoll 2002-10-09 16:33:35 +05:00
monty@narttu.mysql.fi
da2abaf887 Portability fixes to be able to compile MySQL with VC++ 2002-10-08 22:28:24 +03:00
peter@mysql.com
d21402052c One more commit to do the merge of new 4.1 tree 2002-10-06 13:42:16 +04:00
monty@mashka.mysql.fi
62a26cf891 Update after last merge. Fixes some wrong test results. 2002-10-03 16:54:26 +03:00
monty@mashka.mysql.fi
0f39457613 Merge with 4.0.4 2002-10-02 17:55:12 +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
monty@mashka.mysql.fi
efaaf0b4b8 Updated VC++ project files for 4.0.4
Only write short usage if one starts mysqldump without any options
Added query cache on windows
Added error message if one can't read privilege tables
2002-09-24 17:11:59 +03:00
monty@mashka.mysql.fi
f3a186c905 Portability fixes.
Improve mysql-test to be more robust.
Fix that GRANT doesn't delete SSL options
Change innobase_flush_log_at_trx_commit to uint.
Don't rotate logs if we read a rotate log entry from the master.
2002-09-11 06:40:08 +03:00
monty@mashka.mysql.fi
a01a0840dc Some trivial optimzations
Check if AND/OR expression can be NULL; Fixed bug in GROUP BY and-or-expression where expression could be NULL
Bug fix for SHOW OPEN TABLES when user didn't have privilege to access all open tables.
Better fix for ALTER TABLE on BDB tables.
2002-09-03 15:44:25 +03: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
monty@mashka.mysql.fi
7229f85340 Don't require call to mysql_ssl_set() to use ssl. 2002-08-25 22:40:49 +03:00
monty@mashka.mysql.fi
04723cf74d Give better error from reconnect()
Fixed hang in start_slave_threads() when thread dies quickly.
2002-08-24 05:44:16 +03:00
monty@hundin.mysql.fi
03b0179af9 Use our version of RWLOCKS on UNIXWARE 7
More DBUG info for replication
Better error messages from replication
Fixed bug in replication code when connecting to 'localhost' (time was not released properly)
Block ALARM signal on Linux for signal handler thread (Fixes problem with running mysqld with --debug)
Removed warning when setting an AUTO_INCREMENT field to NULL
2002-08-21 22:04:22 +03:00
monty@hundin.mysql.fi
a5edb20042 Fixed timing problem with rpl000001 replication test.
Fixed configure problems with HPUX and openbsd
SHOW SLAVE STATUS returns empty set if slave is not initialized
SHOW MASTER STATUS returns empty set if binary logging is not enabled.
Fixed shutdown problem on Solaris.
2002-08-18 16:04:26 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +03:00
monty@hundin.mysql.fi
b779b63862 Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
2002-08-12 03:28:02 +03:00
monty@hundin.mysql.fi
ac6e640c4d Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
2002-08-09 16:47:16 +03:00
monty@hundin.mysql.fi
8832927d5c Added nety_retry_count as a changeable variable
Make safe_mysqld a symlink to mysqld_safe in binary distribution
Fixed problem with CTRL-C when using mysqld --bootstrap
2002-08-08 20:49:06 +03:00
monty@hundin.mysql.fi
77296b3f67 Fix after merge
Updated WEEK() and DATE information in the manual.
2002-08-08 16:41:04 +03:00
monty@hundin.mysql.fi
087261482a merge with 3.23.52 2002-08-08 15:24:47 +03:00
monty@mashka.mysql.fi
2c4fa340cc Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile.
Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables.
Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions
Extended my_chsize() to allow one to specify a filler character.
Extend vio_blocking to return the old state (This made some usage of this function much simpler)
Added testing for some functions that they caller have got the required mutexes before calling the function.
Use setrlimit() to ensure that we can write core file if one specifies --core-file.
Added --slave-compressed-protocol
Made 2 the minimum length for ft_min_word_len
Added variables foreign_key_checks & unique_checks.
Less logging from replication code (if not started with --log-warnings)
Changed that SHOW INNODB STATUS requre the SUPER privilege
More DBUG statements and a lot of new code comments
2002-08-08 03:12:02 +03:00
monty@hundin.mysql.fi
5fadf19295 Fixed problem with make distcheck
Fixed bug in automatic repair of MyISAM tables where table cache was not locked properly
2002-08-06 22:20:11 +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
monty@hundin.mysql.fi
ade20c5b19 Indentation cleanup & new comments 2002-06-28 09:18:23 +03:00
monty@hundin.mysql.fi
8a2daeac77 Removed mysql_ssl_clear()
Added statistics information for alarms (for bug tracking)
Don't store "incomplete" in the xxx.cfg file if we are not using --restart. (Crash-me)
Enlarged STACK_BUF_ALLOC becasue of failed crash-me test
Aded new script mysql_tableinfo to make a system directory.
2002-06-27 11:27:04 +03:00
venu@myvenu.com
75959e6e26 Client-Server Protocol 4.1 changes - Client side:
- Support of prepared execution
  - Support of Original Table and Column names
  - Support of direct transactional API
  - And lot of misc handling

  (Note that, the pull will not work, unless you have the Server side changes also which will be followed by this commit)
2002-06-12 13:47:32 -07:00
monty@mashka.mysql.fi
2aecdd1a91 Big code cleanup/review before 4.0.2 release.
(All commit emails since 4.0.1 checked)
This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree.
2002-06-11 11:20:31 +03:00