mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38918 commits 2788 branches 343 tags 1.7 GiB
Commit graph

536 commits

Author SHA1 Message Date
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
kostja@bodhi.local
4bfc67fc3c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-08-02 14:13:01 +04:00
jimw@rama.(none)
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
kostja@bodhi.local
2ce1a07c89 A fix and a test case for Bug#15752 "Lost connection to MySQL server 
when calling a SP from C API"

The bug was caused by lack of checks for misuse in mysql_real_query. 
A stored procedure always returns at least one result, which is the 
status of execution of the procedure itself.
This result, or so-called OK packet, is similar to a result
returned by INSERT/UPDATE/CREATE operations: it contains the overall
status of execution, the number of affected rows and the number of
warnings. The client test program attached to the bug did not read this 
result and ivnoked the next query. In turn, libmysql had no check for 
such scenario and mysql_real_query was simply trying to send that query 
without reading the pending response, thus messing up the communication
protocol.

The fix is to return an error from mysql_real_query when it's called
prior to retrieval of all pending results.
 2006-07-24 14:56:53 +04:00
holyfoot/hf@mysql.com/deer.(none)
00f56da9af merging 2006-07-18 16:43:39 +05:00
holyfoot/hf@mysql.com/deer.(none)
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
kostja@bodhi.local
d7845b74db Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
 2006-07-13 22:09:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
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
monty@mysql.com
2f86009c9e Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2006-06-30 19:15:18 +03:00
kroki@mysql.com
79ca4c1d55 bug #20152: mysql_stmt_execute() overwrites parameter buffers 
When using a parameter bind MYSQL_TYPE_DATE in a prepared statement,
the time part of the MYSQL_TIME buffer was written to zero in
mysql_stmt_execute(). The param_store_date() function in libmysql.c
worked directly on the provided buffer.
Changed to use a copy of the buffer.
 2006-06-30 12:52:05 +04:00
holyfoot@deer.(none)
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
knielsen@mysql.com
a729d7fcdd Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 
into  mysql.com:/usr/local/mysql/tmp-5.1
 2006-05-16 14:34:35 +02:00
knielsen@mysql.com
b6ee2d2340 Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix 
into  mysql.com:/usr/local/mysql/tmp-5.0
 2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742 Fix two Valgrind memory leak warnings. 2006-05-15 18:07:18 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
msvensson@neptunus.(none)
b60540a862 Remove valgrind and compiler warnings 
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
 2006-05-08 17:14:06 +02:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
bar@mysql.com
0524cdbe70 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-06 13:08:07 +05:00
bar@mysql.com
13b5cdb126 Moving mysql_get_server_version() from libmysql.c to client.c, 
as it is now required by mysql_set_character_set()
 2006-04-06 13:03:22 +05:00
bar@mysql.com
45a3bb57d6 libmysql.c: 
Bug#18830: incompatibility new libraries with old server
  Don't execute SET NAMES with pre-4.1 server.
 2006-04-06 11:47:46 +05:00
georg@lmy002.wdf.sap.corp
556fbe7d68 fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) 
(approved by kostja)
 2006-03-21 22:02:36 +01:00
anozdrin@mysql.com
0e172496eb Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
 2006-03-10 22:37:38 +03:00
konstantin@mysql.com
2ea0b9b72c Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error": 
it breaks binary compatibility. The patch will be left intact
in 5.1.
 2006-03-05 00:38:54 +03:00
konstantin@mysql.com
951943c22a Undo the patch for Bug#16144 "mysql_stmt_attr_get type error", 
it breaks binary compatibility. The patch will be left intact
in 5.1. Warning: this changeset should be null-merged into 5.1.
A separate commit in order to push into the release clone of 
5.0.19.
 2006-03-04 23:04:48 +03:00
monty@mysql.com
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
msvensson@neptunus.(none)
e919f8e888 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:50:26 +01:00
msvensson@neptunus.(none)
25c4344656 Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 
into  neptunus.(none):/home/msvensson/mysql/bug14057/my51-bug14057
 2006-02-21 08:49:21 +01:00
msvensson@neptunus.(none)
56acf0a0c2 Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways 
- Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
 2006-02-16 13:44:56 +01:00
jimw@mysql.com
d33b03abef Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 12:06:20 -08:00
jimw@mysql.com
28a88a07ce Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 11:22:03 -08:00
msvensson@neptunus.(none)
12b23630db Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 20:16:33 +01:00
msvensson@devsrv-b.mysql.com
eb97818627 Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000' 
- Init sql_state in mysql_stmt_init
 2006-02-15 13:45:03 +01:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
msvensson@neptunus.(none)
e486d81a52 Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-13 10:56:45 +01:00
msvensson@neptunus.(none)
5000951ab4 Bug#14013 mysql_stmt_store_result() bombs if a cursor is open 
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
 2006-02-10 14:50:29 +01:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-08 23:53:45 +03:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 23:27:06 +03:00
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
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +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
holyfoot@deer.(none)
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
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