database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity
46,939 Commits 3,251 Branches 1,092 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
svoj@april.(none)
1d1f763f73 Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.1-engines
 2007-05-10 20:01:58 +05:00
svoj@mysql.com/april.(none)
3e21fb0f3b Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines
 2007-05-10 18:14:04 +05:00
msvensson@pilot.blaudden
954edae8f0 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-05-10 13:29:43 +02:00
msvensson@pilot.blaudden
f924d84c91 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-10 13:28:48 +02:00
msvensson@pilot.blaudden
b805507358 Bug#27344 Total failure to start the server 
- Give some more protection against "too long socket name by setting the max
length when to use a tmpdir for sockets to 70
 2007-05-10 13:28:24 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
70ecc6fe86 bigint.test made ps-protocol consistent 2007-05-10 16:22:38 +05:00
igor@olga.mysql.com
53888b4282 Fixed bug #28189: in some rare cases optimizer preferred a more expensive 
ref access to a less expensive range access. 
This occurred only with InnoDB tables.
 2007-05-10 00:06:24 -07:00
holyfoot/hf@hfmain.(none)
39597b791b Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28005/my51-28005
 2007-05-10 11:30:50 +05:00
tomas@whalegate.ndb.mysql.com
19a2814f47 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-10 08:06:09 +02:00
tomas@whalegate.ndb.mysql.com
fd5f5d0abd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-opt 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-05-10 07:15:46 +02:00
holyfoot/hf@hfmain.(none)
d76a3ef165 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/28005/my51-28005
 2007-05-10 08:16:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d535add013 bug 27921 (Views ignore precision for CAST) 
test result fixed
 2007-05-10 08:14:53 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
d99b4c6a1a Bug #27921 View ignores precision for CAST() 
Item_decimal_typecast::print properly implemented
 2007-05-10 00:17:21 +05:00
ibabaev@bk-internal.mysql.com
71b2667abd Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-05-09 17:07:11 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
e3fa9c594d Bug #27957 cast as decimal does not check overflow, also inconsistent with group, subselect 
Missing check for overflow added to the Item_decimal_typecast::val_decimal
 2007-05-09 17:27:14 +05:00
epotemkin@bk-internal.mysql.com
b0b4fecb99 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-05-09 12:55:05 +02:00
evgen@moonbone.local
b66298f455 loaddata.result, loaddata.test: 
A test case is corrected.
 2007-05-09 14:46:11 +04:00
msvensson@pilot.blaudden
0c1c191a1d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-05-09 10:56:53 +02:00
msvensson@pilot.blaudden
d424941b4a Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-05-09 10:55:09 +02:00
msvensson@pilot.blaudden
784ca670bd Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my50-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/bug28193/my51-bug28193
 2007-05-09 10:53:07 +02:00
msvensson@pilot.blaudden
9242d395cd Bug#28193 outfile fails randomly in pushbuild 
- Change testcase to use remove_file
 2007-05-09 10:52:28 +02:00
msvensson@pilot.blaudden
eeccd0de97 Merge pilot.blaudden:/home/msvensson/mysql/bug28193/my41-bug28193 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-05-09 10:49:52 +02:00
msvensson@pilot.blaudden
6c0f90e921 Bug #28193 outfile fails randomly in pushbuild 
- Change "exec rm" to "remove_file"
 2007-05-09 10:49:11 +02:00
msvensson@pilot.blaudden
548240a73d Merge bk-internal:/home/bk/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-05-09 10:48:45 +02:00
igor@olga.mysql.com
e4af9fc790 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-05-08 17:50:19 -07:00
evgen@moonbone.local
b45ef06e76 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/27670-bug-5.0-opt-mysql
 2007-05-09 00:35:21 +04:00
evgen@moonbone.local
98fa542a08 Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for a 
TIMESTAMP field when no value has been provided.

The LOAD DATA sets the current time in the TIMESTAMP field with
CURRENT_TIMESTAMP default value when the field is detected as a null.
But when the LOAD DATA command loads data from a file that doesn't contain
enough data for all fields then the rest of fields are simply set to null
without any check. This leads to no value being inserted to such TIMESTAMP
field.

Now the read_sep_field() and the read_fixed_length() functions set current
time to the TIMESTAMP field with CURRENT_TIMESTAMP default value in all cases
when a NULL value is loaded to the field.
 2007-05-09 00:23:16 +04:00
evgen@moonbone.local
fea4af6d49 item_cmpfunc.cc, type_datetime.result, type_datetime.test, item_cmpfunc.h: 
After merge fix.
 2007-05-08 22:28:24 +04:00
tomas@whalegate.ndb.mysql.com
9e8299240e correcting previous commit 2007-05-08 19:07:36 +02:00
tomas@whalegate.ndb.mysql.com
1f6d0fd55f increase heartbeat interval to avoid load related start up issues in mysql-test-run 2007-05-08 19:03:33 +02:00
tomas@whalegate.ndb.mysql.com
5463f4bd36 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-05-08 18:31:54 +02:00
tomas@whalegate.ndb.mysql.com
482e56f199 increate hearbeat interval to avoid load related start up issues in mysql-test-run 2007-05-08 18:30:03 +02:00
cbell/Chuck@mysql_cab.
9064773393 Merge mysql_cab.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab.:C:/source/c++/mysql-5.1_BUG_17233
 2007-05-08 10:36:33 -04:00
cbell/Chuck@mysql_cab.
e6718df345 BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
This patch corrects a bug involving a LOAD DATA INFILE operation on a 
transactional table. It corrects a problem in the error handler by moving
the transactional table check and autocommit_or_rollback operation to the 
end of the error handler. 

The problem was an assert was thrown after the operation completed. The 
assert found a non-sunk event in the transaction cache. The events in the 
transaction cache were added after commit_or_rollack and thereafter nothing 
removed them.

An additional test case was added to detect this
condition.
 2007-05-08 10:17:00 -04:00
evgen@moonbone.local
df081a3a4f Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/test-5.1-opt-mysql
 2007-05-08 15:54:49 +04:00
thek@adventure.(none)
4144dc7262 Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-05-08 12:18:36 +02:00
thek@adventure.(none)
770219c15a Merge adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-05-08 12:02:38 +02:00
thek@adventure.(none)
902b02ec0b Corrected test case for 5.1 requirements 2007-05-08 11:56:47 +02:00
thek@adventure.(none)
6927ddd85a Merge adventure.(none):/home/thek/Development/cpp/bug27792/my50-bug27792 
into  adventure.(none):/home/thek/Development/cpp/bug27792/my51-bug27792
 2007-05-08 11:29:07 +02:00
thek@adventure.(none)
5e774747bc 4.1 -> 5.0 Manual merge for Bug #27792 2007-05-08 11:24:07 +02:00
bar@bar.myoffice.izhnet.ru
c600629c22 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/home/bar/mysql-5.1.b26518
 2007-05-08 13:36:05 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
8bc4ded6aa Bug#26518 XPath and variables problem 
Problem: XPath variables didn't work.
Fix: adding variables support,
both user-defined and sp local variables are now supported by XPath.
 2007-05-08 13:32:29 +05:00
thek@adventure.(none)
4ea05eae31 Bug #27792 query cache returns wrong result, with certain system variables 
- Queries in the query cache are identified by the individual 
   characters in the query statement, the current database and 
   the current environment expressed as a set of system variable
   flags.
 - Since the set of environment flags didn't properly describe the
   current environment unexpected results were returned from the 
   query cache.
 - Query cache is now cleared when the variable ft_boolean_syntax is 
   updated.
 - An identification flag for the variable default_week_format is 
   added to the query cache record.
 
Thanks to Martin Friebe who has supplied significant parts of this patch.
 2007-05-08 09:09:25 +02:00
jonas@perch.ndb.mysql.com
6415a8528a Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-05-08 08:24:21 +02:00
jonas@perch.ndb.mysql.com
72fec5b346 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-05-08 08:10:32 +02:00
jonas@perch.ndb.mysql.com
a6153ce335 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-05-08 08:09:19 +02:00
jonas@perch.ndb.mysql.com
27b1f61924 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-05-08 07:52:10 +02:00
jonas@perch.ndb.mysql.com
e47e6f7931 ndb - bug#27437 
bug in interpretedupdate (used for auto-increment) that made TUPKEYREF be sent twice
  this was however "normally" shadowed, but made LQH crash when LCP was about to start
 2007-05-08 07:49:05 +02:00
gni@dev3-221.dev.cn.tlan
305d0eaf02 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
 2007-05-08 09:52:27 +08:00
cbell/Chuck@mysql_cab.
41b8ddc873 BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not flushed 
This patch corrects a bug involving a LOAD DATA INFILE operation on a 
transactional table. It corrects a problem in the error handler moving
the transactional table check and autocommit_or_rollback operation to the 
end of the error handler. An additional test case was added to detect this
condition.
 2007-05-07 20:43:19 -04:00