mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32900 commits 2791 branches 343 tags 1.7 GiB
Commit graph

32900 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@shellback.(none)
1d77363c40 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 12:19:52 +02:00
msvensson@shellback.(none)
d093b1029a Look for mysql_client_test in $path_client_bindir 2006-10-12 12:19:23 +02:00
msvensson@shellback.(none)
42a227e967 Switch to use yaSSL instead of OpenSSL on Netware 2006-10-12 12:11:23 +02:00
kaa@polly.local
8c88bb4eaa Merge polly.local:/tmp/maint/bug22728/my41-bug22728 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-12 13:39:52 +04: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
msvensson@shellback.(none)
71cb0e8dc5 Only print cur_file->filename if cur_file->file is set 
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
 2006-10-12 10:49:59 +02:00
msvensson@shellback.(none)
d534a6b905 Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called 
Add DBUG_PRINT to show the value of mysql->reconnect
 2006-10-12 10:27:44 +02: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
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)
50cc20aff1 Check that TERM has been set to avoid problem "Error opening 
terminal: unknown" when the script is executed using non interactive ssh
Set TERM to "linux" as default
 2006-10-11 19:40:55 +02:00
kaa@polly.local
add9cffb49 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 19:28:46 +04: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
kaa@polly.local
0561e65a22 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 17:19:19 +04: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
andrey@example.com
f0cfcd90c0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  example.com:/work/bug23074/my41-bug23074
 2006-10-11 13:58:31 +02:00
Kristofer.Pettersson@naruto.
b62f0c7b93 Cset exclude: Kristofer.Pettersson@naruto.|ChangeSet|20060922092201|15946 2006-10-11 13:42:48 +02:00
msvensson@neptunus.(none)
cfbc0de658 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-11 13:39:00 +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
andrey@example.com
456fbba537 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug23074/my50-bug23074
 2006-10-11 12:32:18 +02: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
msvensson@shellback.(none)
eb6cb97a4d Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 11:39:08 +02:00
msvensson@shellback.(none)
f807b6e893 Fix some bad code in mysqltest.c which cause segfault 2006-10-11 11:21:44 +02:00
andrey@example.com
dfa7dbf241 Merge example.com:/work/bug23074/my41-bug23074 
into  example.com:/work/bug23074/my50-bug23074
 2006-10-11 11:14:42 +02:00
andrey@example.com
a846909e6a Fix a typo regarding checking whether HA_VAR_LENGTH_KEY is 
set. This has always worked because when flag is !=0 then
HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot
reveal a faulty behavior.

Fix for bug#23074: typo in myisam/sort.c
 2006-10-11 11:07:25 +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
Kristofer.Pettersson@naruto.
79f1355b06 Merge naruto.:C:/cpp/bug21811/my41-bug21811 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-10-11 10:27:28 +02:00
msvensson@neptunus.(none)
2c7ef3ebac Merge bk-internal:/home/bk/mysql-5.0-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-10-11 10:13:56 +02:00
lars@mysql.com/black.(none)
f28e9eb64b Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-10-10 21:58:46 +02:00
joerg@trift2.
c1e351abdf Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-10-10 13:25:55 +02: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
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
4d0023edf6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my41-bug17583 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
 2006-10-09 18:46:28 -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
Kristofer.Pettersson@naruto.
3b316569a7 Bug#23010 _my_b_read() passing illegal file handles to my_seek() 
- The io cache flag seek_not_done was not set properly in the reinit_
io_chache function call and this led my_seek to be called despite an
invalid file handle.
- Added a test in reinit_io_cache to ensure we have a valid file handle
before setting seek_not_done flag.
 2006-10-09 21:13:37 +02:00
svoj@mysql.com/april.(none)
7683b297cf Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
 2006-10-08 22:40:25 +05:00
svoj@mysql.com/april.(none)
0830486836 After merge fix. 2006-10-08 22:34:32 +05: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