mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 18:41:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37204 commits 2789 branches 343 tags 1.7 GiB
Commit graph

37204 commits

This branch
This branch
All branches
Author SHA1 Message Date
tnurnberg@salvation.intern.azundris.com
fbff93ef75 Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-05 22:55:55 +02:00
tnurnberg@salvation.intern.azundris.com
72c6c14bb2 Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my41-21913 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913

21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver.

Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
 2006-09-04 07:01:15 +02:00
tnurnberg@salvation.intern.azundris.com
41f1932488 Bug#21913: DATE_FORMAT() Crashes mysql server if I use it through mysql-connector-j driver. 
Variable character_set_results can legally be NULL (for "no conversion.")
This could result in a NULL deref that crashed the server.  Fixed.

(Although ran some additional precursory tests to see whether I could break
anything else, but no breakage so far.)
 2006-09-04 06:16:34 +02:00
cmiller@maint1.mysql.com
51e4432b79 mysql-test-run.pl: 
'reorder' default off until test cases fixed.
 2006-09-02 13:30:37 +02:00
cmiller@maint1.mysql.com
ba0df1ca7e Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint
 2006-09-01 21:58:07 +02:00
cmiller@maint1.mysql.com
8cacf3f54c Merge maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my50-mtr_reorder 
into  maint1.mysql.com:/data/localhome/cmiller/mtr_reorder/my51-mtr_reorder
 2006-09-01 21:54:34 +02:00
cmiller@maint1.mysql.com
46b3997c51 mtr_cases.pl: 
Provide a more extensible, easier-to-change way of reordering
  test cases.
 2006-09-01 21:53:23 +02:00
msvensson@neptunus.(none)
ba7035ab55 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-01 16:57:51 +02:00
msvensson@neptunus.(none)
906d17779b Turn on reorder as default. 2006-09-01 16:56:46 +02:00
msvensson@neptunus.(none)
2036bdc88e Move test that requires innodb to "mysql_innodb" 2006-09-01 16:51:37 +02:00
msvensson@neptunus.(none)
4d359b80c6 Turn off reorder as default 2006-09-01 12:27:28 +02:00
msvensson@shellback.(none)
5a79f59e71 Merge shellback.(none):/home/msvensson/mysql/mtr/my51-mtr 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-01 10:33:52 +02:00
msvensson@shellback.(none)
a63285a647 Merge shellback.(none):/home/msvensson/mysql/mtr/my50-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my51-mtr
 2006-09-01 10:32:20 +02:00
msvensson@shellback.(none)
7afee46c55 Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr 
into  shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
 2006-09-01 10:25:50 +02:00
msvensson@shellback.(none)
324cf4ccb3 Add target to make "mtr", shortcut for running test suite 2006-09-01 10:21:08 +02:00
msvensson@shellback.(none)
9bdc99f130 Use "--skip-innodb" if running with testcases that does not need innodb 
Decreases test time when running a selected number of tests
 2006-09-01 10:01:47 +02:00
jimw@rama.(none)
ebf482c447 Fix results of mysqldump test after messy merge 2006-08-31 21:21:23 -07:00
jimw@rama.(none)
4d29dd1f3b Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean

mysqldump.result is wrong, will need to be cleaned up.
 2006-08-31 21:02:17 -07:00
jimw@rama.(none)
bd2825f5bb Restore bug fix lost in merge of client/mysqldump.c, and clean up mysqldump.test 
so that 4.1 and 5.0 tests are all in the right place and no tests are duplicated.
 2006-08-31 20:53:34 -07:00
jimw@rama.(none)
5884eea9a3 Resolve conflicts 2006-08-31 18:24:37 -07:00
msvensson@shellback.(none)
7f243b8d19 Only install the first masters db and copy it for the other 
Gives slightly faster startup
 2006-08-31 20:58:00 +02:00
cmiller@zippy.cornsilk.net
ee1ecdd33e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my51-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-08-31 12:47:15 -04: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
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
msvensson@shellback.(none)
31df5d1d0d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-31 10:33:35 +02:00
msvensson@shellback.(none)
71450a865f Bug#21721 Test suite does not start with NDB, hangs forever; problem around "ndb_mgmd" 
- Wait for ndb_mgmd with timeout
 2006-08-31 10:28:48 +02:00
msvensson@shellback.(none)
f19bdd996f Add check in 'spawn_impl' that we are not trying to span when the path to the executable is empty or undefined 2006-08-31 10:18:55 +02:00
cmiller@zippy.cornsilk.net
a55ba58dc9 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my51-bug04053
 2006-08-30 21:53:33 -04:00
cmiller@zippy.cornsilk.net
fdb54d4f05 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053
 2006-08-30 21:52:17 -04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
cmiller@zippy.cornsilk.net
f864c06e50 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-30 18:19:39 -04:00
tsmith@maint2.mysql.com
0f0256818e Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51
 2006-08-30 23:46:49 +02:00
cmiller@zippy.cornsilk.net
5a3922fbf1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
 2006-08-30 17:33:28 -04:00
cmiller@zippy.cornsilk.net
2c356ec7db Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \ 
event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.
 2006-08-30 17:28:34 -04:00
tsmith@maint2.mysql.com
6809271303 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/51
 2006-08-30 23:20:01 +02:00
tsmith@maint2.mysql.com
d5ee5049be Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50
 2006-08-30 23:14:29 +02:00
tsmith@maint2.mysql.com
e80741b3a5 Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows 2006-08-30 22:39:23 +02:00
tsmith@maint2.mysql.com
843135ae1f portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
tsmith@maint2.mysql.com
0da8a4e321 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40 
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
 2006-08-30 20:04:33 +02: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
georg@lmy002.wdf.sap.corp
0948809a3c Fix for bug #20907 
CMake versions > 2.4 allow linking to STATIC or SHARED libraries only.
 2006-08-30 12:17:35 +02:00
guilhem@gbichot3.local
121852a77f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
 2006-08-29 19:50:17 +02:00
kaa@polly.local
cde6246d27 Merge polly.local:/home/kaa/src/maint/m50-maint--07OGt 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-08-29 19:59:33 +04:00
kaa@polly.local
61482f3542 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-08-29 19:57:52 +04:00
guilhem@gbichot3.local
5890c2cfe2 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
 2006-08-29 17:38:15 +02:00
guilhem@gbichot3.local
73625c3a11 Fix for BUG#20866 "show table status on innodb raises assertion" 
and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
It was an assertion failure, only in debug builds, not present
in released versions (nothing to document).
It happened when doing SHOW TABLE STATUS on an InnoDB table
having an auto_increment column, right after creating the table.
The test which would have caught this problem was disabled in 
mid-April for another reason (how much I like tests disabled for
months...).
 2006-08-29 17:37:48 +02:00
timour/timka@lamia.home
0368914b9a Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456 
into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
 2006-08-29 16:39:09 +03:00