konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
andrey@lmy004.
736faf4730
fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
2006-02-01 20:35:16 +01:00
konstantin@mysql.com
d2bba04183
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 15:15:09 +03:00
konstantin@mysql.com
19fd36e254
A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
...
use the right type in mysql_stmt_attr_get
2006-01-17 23:19:43 +03:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
hf@deer.(none)
1311d4dc79
Merging
2005-08-04 16:27:53 +05:00
hf@deer.(none)
39ef54fd8e
Fix for bug #12177 (errorlog file isn't closed)
...
4.1 version of the patch
2005-08-04 15:23:21 +05:00
monty@mysql.com
b3cbd0048f
Cleanups during review of new code
...
Ensure mysql_close() is called if mysql_set_character_set() fails
2005-07-28 16:10:14 +03:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
georg@lmy002.wdf.sap.corp
21a88afeed
minor fix (backport from 5.0) - changed function prototype/definition
2005-07-19 17:12:00 +02:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
georg@lmy002.wdf.sap.corp
53c630a524
Restore previous used client charset in mysql_reconnect
...
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
2005-07-16 07:13:40 +02:00
georg@lmy002.wdf.sap.corp
8c4cd0427f
Fix for bug #11037 .
...
When all rows are fetched subsequent calls to mysql_stmt_fetch return
now MYSQL_NO_DATA instead of errorcode 1.
2005-07-15 14:30:47 +02:00
konstantin@mysql.com
1c142ee631
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2005-07-14 20:02:34 +04:00
konstantin@mysql.com
a1270b65db
A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't reset
...
information about error".
2005-07-14 20:02:33 +04:00
konstantin@mysql.com
509531421c
Implement MarkM optimization request to avoid redundnat packet exchange
...
in cursors.
2005-07-14 15:27:24 +04:00
georg@lmy002.wdf.sap.corp
55d413252f
changes after Bar's review: renamed CHARACTER_SET to MY_CHARSET_INFO
2005-07-12 10:58:21 +02:00
georg@lmy002.wdf.sap.corp
ceba4ee9cd
New attempt after Bar's review
...
Added api function mysql_get_character_set_info which provides
information about the current client character set.
2005-07-12 10:31:43 +02:00
jimw@mysql.com
485f2c93c2
Merge mysql.com:/home/jimw/my/mysql-5.0-10214
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-05 09:47:20 -07:00
konstantin@mysql.com
f60ebc4815
A fix and a test case for Bug#10794 "mysql_stmt_attr_set no
...
open cursor after mysql_stmt_execute" + post-review fixes.
The bug was caused by wrong flags in stmt->server_status on the client
side: if there was no cursor, the server didn't send server_status
flags to the client, and the old flags were used to set up the
fetch function of a statement. Consequently, stmt_read_row_from_cursor was
used when there was no cursor. The fix fixes the server to always
send server flags to the client.
2005-06-30 16:17:10 +04:00
jimw@mysql.com
3ccb90c085
Make status of NO_BACKSLASH_ESCAPES mode known to the client so
...
it can use it to switch to only quoting apostrophes by doubling
them when it is in effect. (Bug #10214 )
2005-06-23 18:29:56 -07:00
konstantin@mysql.com
b3d977df10
Rename all prepared statements COM_ commands to prefix with COM_STMT_
2005-06-17 23:26:25 +04:00
monty@mysql.com
4b7882dc73
merge
2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e
Cleanup during review
...
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
2005-06-05 17:01:20 +03:00
konstantin@mysql.com
ada8f09186
Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get
2005-06-04 12:37:10 +04:00
konstantin@mysql.com
d0b4e71bbd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 18:48:01 +04:00
konstantin@mysql.com
f1916b87d2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-9643
2005-05-16 18:29:04 +04:00
konstantin@mysql.com
38d68559bf
A fix and a test case for Bug#9643 " CURSOR_TYPE_SCROLLABLE dos not work"
...
- check on the client the unsupported feature and return
an error message if it's been requested.
Additionally added API support for STMT_ATTR_PREFETCH_ROWS.
Post-review fixes.
2005-05-16 18:27:21 +04:00
monty@mysql.com
9db45adb60
Merge with 4.1
2005-05-14 18:31:22 +03:00
monty@mysql.com
6588997eb8
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-05-14 16:28:52 +03:00
monty@mysql.com
beb5867dfb
After merge fixes
2005-05-14 16:24:36 +03:00
konstantin@mysql.com
89bd09fed2
Manual merge (again)
2005-05-14 12:38:12 +04:00
konstantin@mysql.com
6c981c0b80
Fix a valgrind warning: memcpy does not allow its arguments to overlap.
2005-05-14 02:31:26 +04:00
georg@lmy002.wdf.sap.corp
320d9cb4c2
added function mysql_set_character_set (reviewed by Monty)
...
as a work around for #8317 and #9637
This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.
2005-05-13 15:06:11 +02:00
konstantin@mysql.com
d0e24153b9
A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
...
(crash on attempt to re-execute a statement with an open cursor) +
post-review fixes.
2005-05-12 11:16:12 +04:00
hf@deer.(none)
64f4fd2bbd
Merging
2005-04-21 13:19:02 +05:00
hf@deer.(none)
c6464cab0d
Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)
...
One more free_charset call added
2005-04-21 10:58:58 +05:00
georg@lmy002.wdf.sap.corp
1cbe701d78
Fix for verification tests: loss of decimal places should not
...
return an error
2005-04-12 08:51:26 +02:00
georg@lmy002.wdf.sap.corp
698399dc98
Fix for verification tests: truncation of post digits should not return an error
2005-04-11 12:25:44 +02:00
ramil@mysql.com
ac2efb1300
Fix for bit type:
...
we have to handle bit fields as well.
2005-04-04 16:33:23 +05:00
konstantin@mysql.com
a8c1316c6b
Manual merge
2005-03-24 15:17:39 +03:00
konstantin@mysql.com
fd54ee4539
Fixes and test cases for Bug#8880 "Commands out of sync error with cursors"
...
and Bug#9159 "Server crash during mysql_stmt_close".
The patch adds support for single-row result sets in cursors.
2005-03-24 15:12:53 +03:00
serg@serg.mylan
f4d4df2ca4
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
serg@serg.mylan
da27256e12
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-18 20:12:31 +01:00
jimw@mysql.com
22e5d9cc0a
Fix HP/UX debug compile error. (Bug #8679 )
2005-03-17 10:27:23 -08:00
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
patg@krsna.patg.net
4b7bc748ea
WL #2094 Federated Storage Handler
...
This is the first changeset of suggested changes recommended in Kostja's
review of my patch, 1.1846, which includes only functionality changes.
Style changes/Documentation patch to follow.
2005-02-23 00:29:57 -08:00
monty@mysql.com
5e6ba9dec8
Fix errors in my last changeset
2005-02-22 15:08:12 +02:00
jani@ua141d10.elisa.omakaista.fi
a6106a0a67
Fixed Bug#7838, "pipe_sig_handler should be static".
2005-02-17 23:00:48 +02:00