mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
24998 commits 2784 branches 343 tags 1.6 GiB
Commit graph

687 commits

Author SHA1 Message Date
schwenke@alpha.xl.local
84c5ce61c5 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
 2005-07-31 19:59:20 +02:00
schwenke@alpha.xl.local
4344cd39e0 fixed two bugs that break Windows build 2005-07-29 15:40:39 +02: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
bar@mysql.com
0255803b4e Merge mysql.com:/usr/home/bar/mysql-4.1.b10201 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-07-26 13:25:18 +05:00
georg@lmy002.wdf.sap.corp
5498a13751 fix for bug #7924. 
added export symbols mysql_server_init and 
mysql_server_end to allow client to connect to external and embedded
server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
 2005-07-25 07:51:17 +02: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
monty@mishka.local
21ae963205 Fixes to previous changeset 
get_defaults_file() -> get_defaults_options()
 2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03: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
kent@mysql.com
8e3b393d5c Merge 2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a Makefile.am: 
Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
 2005-07-05 23:24:48 +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
jani@a193-229-222-105.elisa-laajakaista.fi
c63ad3b549 New file default_modify.c. Fixed a typo on mysqld.cc 
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.
 2005-05-18 20:10:17 +03:00
georg@lmy002.wdf.sap.corp
b01ad9f88c Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-05-18 13:57:33 +02: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
5641664de7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-05-16 15:26:40 +03:00
petr@mysql.com
834c47f336 Merge 2005-05-16 03:01:05 +04:00
petr@mysql.com
180d0ed620 post-review fixes 2005-05-16 01:54:02 +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
konstantin@mysql.com
9c6ba43eb1 Add missing commas to errmsg.c 2005-05-13 19:15:03 +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
georg@lmy002.wdf.sap.corp
03cd2329eb reverted last push - as discussed with Monty we will add 
mysql_set_character_set
 2005-05-13 14:57:33 +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
georg@lmy002.wdf.sap.corp
65170a2341 Added export symbols for workaround of bugs #8317,#9637 in PHP5 2005-05-08 10:24:04 +02:00
shuichi@mysql.com
2244ae8cef Added cp932 character set 2005-05-05 11:37:52 -07: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