1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

313 Commits

Author SHA1 Message Date
5e2ef3a68e BUG#23383: mysql_affected_rows() returns different values than
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.
2006-11-17 12:21:32 +03:00
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-16 23:16:44 +04:00
385541131b Merge mysql.com:/home/hf/work/embt/my50-embt
into  mysql.com:/home/hf/work/embt/my51-embt
2006-11-13 20:16:46 +04:00
7ece4caad3 several fixes to make tests pass in embedded-server mode 2006-11-13 20:06:45 +04:00
7805cdef84 Merge mysql.com:/home/hf/work/embt/my41-embt
into  mysql.com:/home/hf/work/embt/my50-embt
2006-11-13 10:45:22 +04:00
6e0045ed20 embedded-mode tests fixed 2006-11-13 10:39:15 +04:00
da721fe7aa Bug #23427: incompatible ABI change in 5.0.26?
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-24 19:05:11 +02:00
e203abf0a1 Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmt
into  mysql.com:/home/hf/work/current_stmt/my51-current_stmt
2006-10-24 17:53:15 +05:00
887e6af60c Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmt
into  mysql.com:/home/hf/work/current_stmt/my50-current_stmt
2006-10-24 17:50:46 +05:00
d0ef58b6a4 Bug #23427 (incompatible ABI change)
the incompatibility was caused by current_stmt member added to the MYSQL
structure.
It's possible to move it to THD structure instead which saves ABI
2006-10-24 17:19:02 +05:00
b96ab282ea Bug #23427: incompatible ABI change in 5.0.26?
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-20 17:17:24 -04:00
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
8d1e5a5bb1 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2

Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:

bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
2006-08-08 09:01:32 -07:00
f7e19b40f3 Merge rama.(none):/home/jimw/my/tmp_merge
into  rama.(none):/home/jimw/my/mysql-5.1-clean
2006-07-28 15:51:48 -07:00
a9a345d9a5 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into  mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-25 13:50:17 +05:00
95b88445fb Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mysql-4.1.19983
2006-07-20 16:03:21 +05:00
00f56da9af merging 2006-07-18 16:43:39 +05:00
bed7b69243 Merge mysql.com:/home/hf/work/mysql-4.1.mrg
into  mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-18 14:52:29 +05:00
eddaafb12b Merge bk@192.168.21.1:mysql-4.1
into  mysql.com:/home/hf/work/mysql-4.1.16017
2006-07-13 22:32:18 +05:00
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 13:18:00 +02:00
a21071d912 Merge mysql.com:/home/mydev/mysql-4.1-bug14400
into  mysql.com:/home/mydev/mysql-5.0-ateam
2006-07-05 11:20:10 +02:00
0a9a755419 merging 2006-06-26 22:32:02 +05:00
d8d42948b2 bug #20318 (ctype_ucs2_def test fails with embedded)
there was two problems about charsets in embedded server
1. mysys/charset.c - defined there default_charset_info variable is
modified by both server and client code (particularly when
--default-charset option is handled)
In embedded server we get two codelines modifying one variable.
I created separate default_client_charset_info for client code

2. mysql->charset and mysql->options.charset initialization isn't
properly done for embedded server - necessary calls added
2006-06-19 22:11:01 +05:00
7a1c9459b3 bug #19983 (mysql_client_test_embedded fails) 2006-06-02 22:33:22 +05:00
bc35c50063 bug #16017 (memory leaks in embedded server)
There actually was 3 different problems -
hash_user_connections wasn't cleaned
one strdupped database name wasn't freed
and stmt->mem_root wasn't cleaned as it was
replased with mysql->field_alloc for result
For the last one - i made the library using stmt's
fields to store result if it's the case.
2006-06-01 17:06:42 +05:00
765024d829 Remove unused variables and label 2006-04-10 18:34:18 +02:00
8e7907c36e Add embedded server build to the CMake build files. 2006-04-03 10:25:36 +02:00
84ff8192ff merged 2006-03-06 23:20:19 +01:00
5a1672dd66 compilation fixes 2006-03-06 22:08:29 +01:00
82b77cdd90 Fixes to embedded server to be able to run tests with it
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
4d2173d997 gcc295 fixes for embedded 2006-01-26 20:56:56 +01:00
0b8ebc2454 Fixes about the embedded-server in 5.1 2006-01-23 11:58:14 +04:00
e8697cf428 Big patch to make embedded-server working in 5.x
Now it supports queries returning several results
(particularly important with the SP)
2006-01-04 14:20:28 +04:00
6f7928c293 Fix for bug #13546 "Build errors with --with-embedded-server
--with-embedded-privilege-control options". One more (hopefully last) build
failure which was introduced during work on WL#2787 "Add view definer/owner
to the view definition..."
2005-09-28 18:43:46 +04:00
dc50fc2403 Merge mysql.com:/home/dlenev/src/mysql-4.1-bg13501
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-09-28 15:59:55 +04:00
ed1c0cbd07 Fix for bug #13501 "build problem: too many arguments to function my_bool
acl_init".

Updated calls to acl_init()/grant_init() in init_embedded_server() - their
signatures were changed recently, now they don't need argument for passing
pointer to THD object (this code was only compiled if one built embedded
server library with --with-embedded-privilege-control switch).
2005-09-27 23:36:02 +04:00
506c6eb922 postmerge fixes 2005-09-21 08:29:47 +03:00
aec371f910 WL#2787 (part 2, ver 3 (merged)) changed securety context switching 2005-09-15 22:29:07 +03:00
41c83870a2 Merge deer.(none):/home/hf/work/mysql-4.1.9110
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-07-27 12:56:23 +05:00
9bab1c09a6 Fix for bug #9110 (Max_join_size error) 2005-07-26 12:08:00 +05:00
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
b3d977df10 Rename all prepared statements COM_ commands to prefix with COM_STMT_ 2005-06-17 23:26:25 +04:00
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
0a6b7aedb2 Remove compiler warnings and remove not used variables
(Found during build process)
2005-02-25 16:53:22 +02:00
196c95e938 Merging conflicts resolved 2005-01-11 21:00:53 +04:00
dbd6589851 A fix for Bug#7365 "embedded server for MacOS: problem with prepared
statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.
2005-01-11 18:02:44 +03:00
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
72dd42bee6 Tabs removed 2004-12-21 12:31:38 +04:00
e91a4ce0be Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-12-21 10:26:01 +04:00