0004fa3c5b
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
2007-02-13 00:55:45 +04:00
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
be389f62de
Mechanical class renaming:
...
Protocol_simple->Protocol_text; Protocol_prep->Protocol_binary
and also THD::protocol_simple->THD::protocol_text,
THD::protocol_prep->THD::protocol_binary.
Reason: the binary protocol is not bound to be used only with
prepared statements long term (see WL#3559 "Decouple binary protocol
from prepared statements"). Renaming now is pressing because
the fix for BUG#735 "Prepared Statements: there is
no support for Query Cache" will introduce a new member
in class Query_cache_flags telling about the protocol's nature.
Other reason: "simple" is less accurate than "text".
Future patches for BUG#735 will rely on this cset.
2007-01-30 22:48:05 +01:00
e3f4f02b64
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
...
Operating with the prepared statements we don't alloc MYSQL_DATA structure,
but use MYSQL_STMT's field instead (to increase performance by reducing
malloc calls).
So we shouldn't free this structure as we did before.
2007-01-29 11:48:31 +04:00
a4208cdc1c
BUG#25890 put previous fix in better place
2007-01-27 21:26:28 +01:00
26c6d2d231
BUG#25895 compiling the server with embedded fails on several 64-bit platforms
...
temporary fix
2007-01-27 20:16:15 +01:00
508d7da976
BUG#25890 mysqltest_embedded crashes on start
...
very temporary fix
2007-01-27 13:12:59 +01:00
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
a04157fbb3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-01-22 14:04:40 +02:00
f95e387212
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-03 02:43:59 +04:00
988e2e4cad
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-03 02:43:27 +04:00
12cd7c7b3e
warning count for embedded prepared statements added
2007-01-03 02:41:14 +04:00
e6b3a71cc0
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/common/my51-common
2007-01-02 17:55:18 +04:00
429b82bed3
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 17:54:38 +04:00
e7130631cb
merging fix
2007-01-02 17:53:55 +04:00
56155d83e7
merging fix
2007-01-02 17:51:32 +04:00
998167acce
embedded-server related fixes
2007-01-02 17:46:20 +04:00
842b23a8fc
WL#3630 (add embedded server to pushbuild)
...
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
2006-12-28 09:42:04 +04:00
a6481aa4c7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-12-15 01:01:52 +02:00
88dd873de0
Fixed compiler warnings detected by option -Wshadow and -Wunused:
...
- Removed not used variables and functions
- Added #ifdef around code that is not used
- Renamed variables and functions to avoid conflicts
- Removed some not used arguments
Fixed some class/struct warnings in ndb
Added define IS_LONGDATA() to simplify code in libmysql.c
I did run gcov on the changes and added 'purecov' comments on almost all lines that was not just variable name changes
2006-12-15 00:51:37 +02:00
edfbcc12cb
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/embt/my51-embt
2006-12-08 15:49:43 +04:00
4091806268
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/embt/my50-embt
2006-12-08 15:22:46 +04:00
f83bedabed
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/embt/my41-embt
2006-12-08 15:15:33 +04:00
966c569b94
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-29 23:36:26 +03:00
5fea0724bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-29 02:44:12 +03:00
bf3fbb44ae
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-29 02:39:17 +03:00
dd0b81885d
Merge mysql.com:/home/hf/work/mysql-5.0-mrg
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2006-11-17 18:27:28 +04:00
f6e4e2317e
Fix after manual merge: remove dead declaration.
2006-11-17 13:56:11 +03:00
1f699a4422
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
2006-11-17 12:33:59 +03:00
6d4558f7c3
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
2006-11-17 12:30:26 +03:00
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
