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
32258 commits 2788 branches 343 tags 1.7 GiB
Commit graph

32258 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
jonas@perch.ndb.mysql.com
1ff0ef83ee Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-09-01 10:20:35 +02:00
tsmith@maint2.mysql.com
e2f40aa6d0 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-01 08:53:56 +02:00
jimw@rama.(none)
2b8f30a764 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-21288
 2006-08-31 21:23:25 -07:00
jimw@rama.(none)
9111a9c5c1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-08-31 21:03:25 -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
tsmith@maint2.mysql.com
39a139193f post-merge fix 2006-09-01 05:00:32 +02:00
tsmith@maint2.mysql.com
81708c66a8 Merge maint2.mysql.com:/data/localhome/tsmith/bk/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-09-01 03:44:03 +02:00
jimw@rama.(none)
5884eea9a3 Resolve conflicts 2006-08-31 18:24:37 -07:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
cmiller@zippy.cornsilk.net
1bbbc65cb5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-08-31 12:46:42 -04:00
cmiller@zippy.cornsilk.net
9c94dade04 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-08-31 12:45:49 -04:00
igor@rurik.mysql.com
ca3229dc1b Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug16249
 2006-08-31 08:58:26 -07: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
2d9187fcba Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-08-31 11:30:14 -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
gkodinov/kgeorge@macbook.gmz
e5bc4c7e77 Bug#14654 : Cannot select from the same table twice within a UNION statement 
Made the parser to support parenthesis around UNION branches.
 This is done by amending the rules of the parser so it generates the correct
 structure.
 Currently it supports arbitrary subquery/join/parenthesis operations in the 
 EXISTS clause. 
 In the IN/scalar subquery case it will allow adding nested parenthesis only 
 if there is an UNION clause after the parenthesis. Otherwise it will just  
 treat the multiple nested parenthesis as a scalar expression.
 It adds extra lex level for ((SELECT ...) UNION ...) to accommodate for the
 UNION clause.
 2006-08-31 18:00:25 +03:00
igor@rurik.mysql.com
c0389e7b0c Fixed bug #16249: different results for a range with an without index 
when a range condition use an invalid DATETIME constant.
Now we do not use invalid DATETIME constants to form end keys for
range intervals: range analysis just ignores predicates with such
constants.
 2006-08-31 07:27:34 -07:00
msvensson@shellback.(none)
9af6450e30 Update the generate_prefix_files.pl 2006-08-31 15:17:35 +02:00
msvensson@shellback.(none)
086fea9809 Bug#21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Don't add the signatures for CRYPTO_* when compiling yaSSL for MySQL
 2006-08-31 15:16:44 +02:00
msvensson@shellback.(none)
f368e0753e Bug #21930 libmysqlclient defines BN_bin2bn which belongs to OpenSSL! Breaks other apps! 
- Correct bug in perl script that faild to add rename macros for some functions.
 2006-08-31 14:26:12 +02:00
msvensson@shellback.(none)
d463972da7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-31 11:57:36 +02:00
msvensson@shellback.(none)
b0754b3d02 Disable testing of "encrypt" in ctype_ucs.test 2006-08-31 11:53:08 +02:00
kostja@bodhi.local
bddfef1e36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-31 12:34:06 +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
aelkin/elkin@dsl-hkigw8-feaaf900-177.dhcp.inet.fi
45568bbe11 BUG#18822 LOAD DATA FROM MASTER corrupts data 
there is a bunch of dups. It has been decided to declare this feature as
deprecated.
 2006-08-31 02:00:40 +03:00
tsmith@maint2.mysql.com
9a8ed3fe3e Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-31 00:23:15 +02:00
tsmith@maint2.mysql.com
0af0180468 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-31 00:01:43 +02:00
tsmith@maint2.mysql.com
4ae5e61620 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41 
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
 2006-08-30 23:49:21 +02:00
tsmith@maint2.mysql.com
b0adc47e86 Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-30 23:46:17 +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
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
acurtis/antony@xiphis.org/ltantony.xiphis.org
678e15174e Bug#20573 
"strict mode: inserts autogenerated auto_increment value bigger than max"
  Strict mode should fail if autoincrement value is out of range
 2006-08-30 13:20:39 -07:00
kostja@bodhi.local
3948fcf575 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-31 00:14:19 +04:00
tsmith@maint2.mysql.com
843135ae1f portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
hartmut@mysql.com/linux.site
e3d56d2cd3 make DNS based hostname queries work (bug #17582) 2006-08-30 20:45:43 +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
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
aa330d1910 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 19:57:09 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e5fbc6cff8 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 19:31:57 +02:00
msvensson@neptunus.(none)
f35371b9b4 Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-30 17:21:22 +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
gluh@mysql.com/gluh.(none)
af9895d4c2 Bug#20393 User name truncation in mysql client 
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
 2006-08-30 15:56:17 +05:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cda07adf32 sql_base.cc, config-netware.h: 
Auto merged
 2006-08-30 12:07:17 +02:00
jonas@perch.ndb.mysql.com
c2d2b88b4c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-08-30 08:24:45 +02:00
kostja@bodhi.local
cb26d47570 Post-merge fixes. 2006-08-30 03:22:59 +04:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
44a1f41e1a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-08-30 00:09:41 +02:00