mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39407 commits 2774 branches 343 tags 1.6 GiB
Commit graph

14617 commits

Author SHA1 Message Date
msvensson@shellback.(none)
1c9b35cdd7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 11:39:41 +02:00
msvensson@shellback.(none)
5741683d12 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 11:30:07 +02:00
msvensson@shellback.(none)
3c66250e84 Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist 2006-10-12 11:29:13 +02:00
kaa@polly.local
a82e5d4a55 Merge polly.local:/tmp/maint/bug11655/my51-bug11655 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-10-12 12:36:13 +04:00
kaa@polly.local
1ceb8d34ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-12 12:12:09 +04:00
kaa@polly.local
2667443173 Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-12 11:28:44 +04:00
kaa@polly.local
105434f865 Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/tmp/maint/bug11655/my51-bug11655
 2006-10-12 11:21:52 +04:00
kaa@polly.local
e89fdaac73 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 2006-10-12 11:21:12 +04:00
tsmith/tim@siva.hindu.god
64e1a13d0e Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50
 2006-10-11 23:38:15 -06:00
tsmith/tim@siva.hindu.god
360540e891 Revert patch for bug #19764, which did not work with prepared statements. 2006-10-11 23:35:52 -06:00
msvensson@shellback.(none)
0eb2fff749 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 21:56:09 +02:00
msvensson@shellback.(none)
5b8312986c Fixes for embedded server test 2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
29238d914c Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 17:41:21 +02:00
msvensson@shellback.(none)
1b53615d05 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 16:01:51 +02:00
msvensson@shellback.(none)
7a6493f376 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 16:01:05 +02:00
msvensson@shellback.(none)
d02909910b mtr_im_stop returns 1 if all is well 2006-10-11 15:45:35 +02:00
msvensson@shellback.(none)
21d8e25303 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 14:57:59 +02:00
msvensson@shellback.(none)
c4db04fc27 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 14:54:36 +02:00
msvensson@shellback.(none)
3e37764216 Improve restart logic all code to detect restart is now in the functions 
'run_testcase_need_master/slave_restart'
Remove the faulty qw
Only look for mysql_fix_privilege_tables if not windows
 2006-10-11 14:50:19 +02:00
kaa@polly.local
737e13e526 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 14:57:09 +04:00
kaa@polly.local
a050de9837 Merge polly.local:/tmp/maint/bug11655/my41-bug11655 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 14:55:23 +04:00
kaa@polly.local
29b5e2955e Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/tmp/maint/bug11655/my51-bug11655
 2006-10-11 14:22:17 +04:00
kaa@polly.local
02ac635027 Merge polly.local:/tmp/maint/bug11655/my41-bug11655 
into  polly.local:/tmp/maint/bug11655/my50-bug11655
 2006-10-11 14:16:30 +04:00
Kristofer.Pettersson@naruto.
2e5063f97a Merge naruto.:C:/cpp/bug21811/my51-bug21811 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-10-11 11:05:55 +02:00
kaa@polly.local
456fe01d7e Fix for bug #22728 "Handler_rollback value is growing". 
The bug is present only in 4.1, will be null-merged to 5.0

For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
 2006-10-11 12:44:03 +04:00
Kristofer.Pettersson@naruto.
d51e3b6cb5 Merge naruto.:C:/cpp/bug21811/my50-bug21811 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-10-11 10:41:22 +02:00
msvensson@neptunus.(none)
5b24780877 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:16:46 +02:00
msvensson@neptunus.(none)
ed250c1763 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:01:43 +02:00
tsmith/tim@siva.hindu.god
9cb8ea76e4 Fix some bad code in mysqltest.c and mysql-test-run.pl which could cause segfault / wrong LD_LIBRARY_PATH settings. 2006-10-11 00:03:21 -06:00
ted@ted.mysql.internal
e8cee6dff0 BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on Solaris. Varying part of the message is now suppressed 2006-10-11 07:08:32 +04:00
ted@ted.mysql.internal
27bb6c08d9 BUG#21524 ps.test updated to meet recent changes in SQL parser 2006-10-11 02:36:36 +04:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-10-10 21:59:23 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-10 11:25:24 +02:00
cmiller@zippy.cornsilk.net
86c5603c72 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
 2006-10-09 18:55:09 -04:00
cmiller@zippy.cornsilk.net
6a870d4cfc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
 2006-10-09 18:54:48 -04:00
cmiller@zippy.cornsilk.net
0ab343a7dc Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583
 2006-10-09 18:53:17 -04:00
cmiller@zippy.cornsilk.net
681acdf055 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
 2006-10-09 18:51:02 -04:00
cmiller@zippy.cornsilk.net
438ffa81fb Bug#17583: mysql drops connection when stdout is not writable 
Porting forward tests to replacement files.
 2006-10-09 18:50:12 -04:00
cmiller@zippy.cornsilk.net
4812d81eab Bug#17583: mysql drops connection when stdout is not writable 
When the client program had its stdout file descriptor closed by the calling
shell, after some amount of work (enough to fill a socket buffer) the server 
would complain about a packet error and then disconnect the client.

This is a serious security problem.  If stdout is closed before the mysql is
exec()d, then the first socket() call allocates file number 1 to communicate
with the server.  Subsequent write()s to that file number (as when printing
results that come back from the database) go back to the server instead in 
the command channel.  So, one should be able to craft data which, upon being
selected back from the server to the client, and injected into the command
stream become valid MySQL protocol to do something nasty when sent /back/ to 
the server.

The solution is to close explicitly the file descriptor that we *printf() to, 
so that the libc layer and the OS layer both agree that the file is closed.
 2006-10-09 18:28:06 -04:00
tsmith/tim@siva.hindu.god
c5b6101c1b Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50
 2006-10-09 16:16:47 -06:00
mats@romeo.(none)
b8941bbc8f Post-merge fixes. 2006-10-09 13:47:06 +02:00
msvensson@shellback.(none)
182d37fa7c Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-08 17:50:40 +02:00
msvensson@shellback.(none)
61529f6a58 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-08 17:48:56 +02:00
msvensson@shellback.(none)
bf762c2d9e Print names of testcases that failed check_testcase, this makes it easier 
to run the whole testcase to find wich testcases need to be checked more carefully
and the just "copy and paste" the suspicious test case names to 
a new mysql-test-run.pl command.
 2006-10-08 17:48:01 +02:00
msvensson@shellback.(none)
55e6f74525 Do the check of special mysqld exe for master or slave after command line args have been parsed 2006-10-08 17:08:24 +02:00
msvensson@shellback.(none)
ca611ed679 Move list of mysqls src dirs into lib/mtr_gcov.pl as it's only used from there 2006-10-08 17:05:17 +02:00
msvensson@shellback.(none)
213c737626 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-08 16:13:58 +02:00
msvensson@shellback.(none)
2db1fadbbe Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-08 16:12:21 +02:00
msvensson@shellback.(none)
b896bd0a6e When looking for client binary directories it necessary to look for the one s that are "deep down" first. 2006-10-08 16:11:55 +02:00
msvensson@shellback.(none)
197f17481f Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-08 15:59:06 +02:00