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

546 commits

Author SHA1 Message Date
kroki/tomash@moonlight.intranet
8aa33bf46d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 15:01:19 +04:00
kroki/tomash@moonlight.intranet
5ea8adfae7 BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 
Non-upper-level INSERTs (the ones in the body of stored procedure,
stored function, or trigger) into a table that have AUTO_INCREMENT
column didn't affected the result of LAST_INSERT_ID() on this level.

The problem was introduced with the fix of bug 6880, which in turn was
introduced with the fix of bug 3117, where current insert_id value was
remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
returned from that function until it was reset before the next
_upper-level_ statement (bug 6880).

The fix for bug#21726 brings back the behaviour of version 4.0, and
implements the following: remember insert_id value at the beginning
of the statement or expression (which at that point equals to
the first insert_id value generated by the previous statement), and
return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.

Thus, the value returned by LAST_INSERT_ID() is not affected by values
generated by current statement, nor by LAST_INSERT_ID(expr) calls in
this statement.

Version 5.1 does not have this bug (it was fixed by WL 3146).
 2006-10-02 14:28:23 +04:00
msvensson@shellback.(none)
2c3015499d Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:42:27 +02:00
msvensson@shellback.(none)
211aceca68 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
 2006-09-15 16:41:50 +02:00
msvensson@shellback.(none)
e890eed69b Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test 
- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
 2006-09-12 11:34:46 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
cmiller@zippy.cornsilk.net
8fbf3c5e8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

Fixes bad merge.
 2006-08-31 11:34:17 -04:00
cmiller@zippy.cornsilk.net
4340ec8ce9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-08-31 11:31:45 -04:00
cmiller@zippy.cornsilk.net
bd0451e232 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my51-no-strange-literals
 2006-08-31 11:28:57 -04:00
cmiller@zippy.cornsilk.net
797b8206ed Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my50-no-strange-literals
 2006-08-31 11:27:55 -04:00
cmiller@zippy.cornsilk.net
436d3a3798 Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a 
single file is a bad practice.
 2006-08-31 11:14:04 -04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
msvensson@neptunus.(none)
160a44dbc3 Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 
into  neptunus.(none):/home/msvensson/mysql/bug21813/my51-bug21813
 2006-08-30 17:25:56 +02:00
msvensson@neptunus.(none)
9d87db7767 Bug#21813 An attacker has the opportunity to bypass query logging, part2 
- Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
 - Add test case to check that also prepared statements end up in the query log
Bug#14346 Prepared statements corrupting general log/server memory
 - Use "stmt->query" when logging the newly prepared query instead of "packet"
 2006-08-30 17:11:00 +02:00
cmiller@zippy.cornsilk.net
5db9cce5fd Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-25 14:34:17 -04:00
iggy@rolltop.ignatz42.dyndns.org
a21ec5dbd4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972
 2006-08-24 15:03:33 -04:00
msvensson@neptunus.(none)
1682c8b463 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-22 08:31:18 +02:00
msvensson@neptunus.(none)
aa944afbe7 Remove debug printout from mysql_client_test 2006-08-22 08:30:33 +02:00
iggy@rolltop.ignatz42.dyndns.org
f6dbea4f2f Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_21757 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_21757
 2006-08-21 20:33:22 -04:00
iggy@rolltop.ignatz42.dyndns.org
39a8fe6e44 Bug#21757: mysql_client_test fails in testcase when reading master.log file 2006-08-21 20:29:11 -04:00
cmiller@zippy.cornsilk.net
f2f90320de Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-21 12:59:46 -04:00
msvensson@shellback.(none)
adaa3a2a60 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-21 14:09:38 +02:00
msvensson@shellback.(none)
2b2985e0ea Print lines from log file to see what's in them 2006-08-21 14:06:59 +02:00
cmiller@zippy.cornsilk.net
c821fa8bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-17 12:17:52 -04:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
 2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
6998c5140b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:53:12 -04:00
cmiller@zippy.cornsilk.net
7d38d61398 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:49:56 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:47:23 -04:00
rburnett@production.mysql.com
0199dda5a6 My previous change of replacing the call to sprintf with some memcpy type routines was not correct. This patch reverts that. 
mysql_client_test.c:
  reverting my previous change
 2006-08-14 20:48:37 +02:00
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
Reggie@xgeek.
e26aef9f64 Some small cleanups that will help get mysql_client_test passing on Windows 2006-08-10 17:39:01 -05:00
kroki/tomash@moonlight.intranet
5c272816ca Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
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
msvensson@neptunus.(none)
dee4105ce0 Remove extra whitespace 2006-08-07 19:21:43 +02:00
msvensson@neptunus.(none)
862d5626a5 Add some more code to analyze why the fgets fails. 2006-08-07 17:26:02 +02:00
msvensson@neptunus.(none)
419e4dd46f Add printouts in test case for bug17667 2006-08-07 14:02:57 +02:00
msvensson@neptunus.(none)
68168c8e8f Change the 'sleep' into an explicit FLUSH LOGS command 2006-08-07 11:29:41 +02:00
msvensson@neptunus.(none)
2e4dbadf9f fflush(NULL) before abort so that all pending writes are performed 2006-08-07 10:16:37 +02:00
msvensson@neptunus.(none)
e33bd1a309 Flush stderr before calling abort() 2006-08-06 23:56:51 +02:00
Reggie@xgeek.
7a8a33a941 please don't call methods that should always execute inside assert() 2006-08-05 18:58:38 -05:00
rburnett@production.mysql.com
a73a9da34b mysql_client_test.c: 
Moving call that processes select results out of the assert
 2006-08-05 23:15:23 +02: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
kroki/tomash@moonlight.intranet
cc98d26a23 Fix after manual merge. 2006-07-29 13:50:08 +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
holyfoot/hf@mysql.com/deer.(none)
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
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
ingo/mydev@chilla.local
18a76a953c Merge chilla.local:/home/mydev/mysql-5.0-mmerge 
into  chilla.local:/home/mydev/mysql-5.1-amain
 2006-07-20 21:28:55 +02:00
holyfoot/hf@mysql.com/deer.(none)
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