mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
52340 commits 2790 branches 343 tags 1.7 GiB
Commit graph

52340 commits

This branch
This branch
All branches
Author SHA1 Message Date
gni@dev3-221.dev.cn.tlan
4a6f3089f8 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2008-01-10 19:52:54 +08:00
gni@dev3-221.dev.cn.tlan
43f31db546 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
 2008-01-10 19:49:32 +08:00
kaa@kaamos.(none)
36773c170d Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 14:35:11 +03:00
kaa@kaamos.(none)
6e60a185d3 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 14:01:25 +03:00
kaa@kaamos.(none)
df8832bbea Merge kaamos.(none):/data/src/opt/bug33305/my51-bug33305 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-01-10 13:46:34 +03:00
kaa@kaamos.(none)
749157d66e Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-01-10 13:45:11 +03:00
kaa@kaamos.(none)
8db61db7e1 Merge kaamos.(none):/data/src/opt/bug33305/my50-bug33305 
into  kaamos.(none):/data/src/opt/bug33305/my51-bug33305
 2008-01-10 13:37:54 +03:00
gni@dev3-221.dev.cn.tlan
be015d1103 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30417
 2008-01-10 17:40:53 +08:00
gni@dev3-221.dev.cn.tlan
8b52881c24 Shouldn't let the non-deterministic temperary filename output in result file for bug#30417 2008-01-10 17:39:50 +08:00
gni@dev3-221.dev.cn.tlan
c891d92888 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:56:21 +08:00
gni@dev3-221.dev.cn.tlan
b5368c1b9a Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
 2008-01-10 13:51:09 +08:00
gni@dev3-221.dev.cn.tlan
2351ac241d Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
 2008-01-10 13:47:14 +08:00
gni@dev3-221.dev.cn.tlan
a42cf6f5e5 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30417
 2008-01-10 13:37:54 +08:00
evgen@moonbone.local
165dfa3eba Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/33675-bug-5.0-opt-mysql
 2008-01-09 23:19:46 +03:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
3677a2dd90 NdbRepStress.cpp: 
More code improvments
 2008-01-09 19:01:31 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
8b4a191645 DbUtil.hpp, DbUtil.cpp, NdbRepStress.cpp: 
More code improvments
 2008-01-09 18:54:32 +01:00
gkodinov/kgeorge@macbook.gmz
76c0aefcc2 merge of the fix for bug 33133 to 5.1-opt 2008-01-09 18:00:12 +02:00
gkodinov/kgeorge@macbook.gmz
83012461f0 Merge macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B33133-5.1-opt
 2008-01-09 17:10:09 +02:00
gkodinov/kgeorge@magare.gmz
5a01be841a Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B33133-5.0-opt
 2008-01-09 16:52:11 +02:00
gkodinov/kgeorge@macbook.gmz
2fc45f017d Bug #33133: Views are not transparent 
When resolving references we need to take into consideration
the view "fields" and allow qualified access to them.
Fixed by extending the reference resolution to process view
fields correctly.
 2008-01-09 16:49:13 +02:00
gni@dev3-221.dev.cn.tlan
9ca2177b2e Fix for view.test. 
the result should be added by 1 by the year(now()) function.
 2008-01-09 14:51:08 +08:00
gni@dev3-221.dev.cn.tlan
37a64e5cbf Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug29851
 2008-01-09 11:17:50 +08:00
gni@dev3-221.dev.cn.tlan
d0a50d15f7 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug31245
 2008-01-09 10:28:25 +08:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
4c8a24682c NdbRepStress.cpp: 
Updated with suggestions from Magnus and other fixes and adjustments I found along the way
DbUtil.hpp, DbUtil.cpp:
  fixes and adjustments I found along the way
 2008-01-08 23:34:30 +01:00
jmiller/ndbdev@ndb15.mysql.com
7b9d5f6b91 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  mysql.com:/data0/jebs_clones/mysql-5.1-new-ndb
 2008-01-08 23:26:45 +01:00
evgen@moonbone.local
ce111a0d73 Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused 
server crash.

The filesort implementation has an optimization for subquery execution which
consists of reusing previously allocated buffers. In particular the call to
the read_buffpek_from_file function might be skipped when a big enough buffer
for buffer descriptors (buffpeks) is already allocated. Beside allocating
memory for buffpeks this function fills allocated buffer with data read from
disk. Skipping it might led to using an arbitrary memory as fields' data and
finally to a crash.

Now the read_buffpek_from_file function is always called. It allocates
new buffer only when necessary, but always fill it with correct data.
 2008-01-09 00:40:41 +03:00
jonas@perch.ndb.mysql.com
8b009296d4 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
 2008-01-08 13:25:54 +01:00
jonas@perch.ndb.mysql.com
9be1d56d87 ndb - bug#33739 
page need to refetched after timeslice
 2008-01-08 13:23:35 +01:00
gkodinov/kgeorge@macbook.gmz
5b9e61b282 merge of bug 33256 5.0-opt -> 5.1-opt 2008-01-08 12:27:15 +02:00
gkodinov/kgeorge@macbook.gmz
2710053416 Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.1-opt
 2008-01-08 11:49:40 +02:00
gkodinov/kgeorge@magare.gmz
7fe932ed82 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B33256-5.0-opt
 2008-01-07 18:55:05 +02:00
tomas@whalegate.ndb.mysql.com
2401f86cc2 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-01-04 16:50:28 +01:00
tomas@whalegate.ndb.mysql.com
4846306921 correct result file 2008-01-04 16:49:39 +01:00
tomas@whalegate.ndb.mysql.com
8db7aebcee Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-01-04 16:01:36 +01:00
tomas@whalegate.ndb.mysql.com
87e966336e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-01-04 15:57:41 +01:00
tomas@whalegate.ndb.mysql.com
6e4fff3fbd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
 2008-01-04 15:33:50 +01:00
tomas@whalegate.ndb.mysql.com
24be420c23 Bug#32648 Test failure between NDB Cluster and other engines 2008-01-04 15:33:01 +01:00
jonas@perch.ndb.mysql.com
b2c88ff871 ndb - dict 
remove dead code
 2008-01-04 11:34:23 +01:00
kaa@polly.(none)
578b3632cc Fix for bug #33305: Test case in 'skip_grants' file need dynamic loading 
to be compiled in

The problem was that on a statically built server an attempt to create
a UDF resulted in a different, but reasonable error ("Can't open shared
library" instead of "UDFs are unavailable with the --skip-grant-tables
option"), which caused a failure for the test case for bug #32020.

Fixed by moving the test case for bug #32020 from skip_grants.test to a
separate test to ensure that it is only run when the server is built
with support for dynamically loaded libraries.
 2007-12-24 17:42:13 +03:00
mhansson/martin@linux-st28.site
8b65423d9d Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  linux-st28.site:/home/martin/mysql/src/bug32848/my51-bug32848
 2007-12-21 14:52:39 +01:00
joerg@trift2.
a0fbcc0326 Merge trift2.:/MySQL/M50/merge-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 13:13:22 +01:00
joerg@trift2.
9f96125023 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-12-21 12:53:05 +01:00
joerg@trift2.
bf1ba3d416 Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M50/merge-5.0
 2007-12-21 12:48:14 +01:00
gkodinov/kgeorge@macbook.gmz
e4efb4a521 Bug #33256: CREATE ... SELECT creates obsolete table 
w/ Field_date instead of Field_newdate
  
Field_date was still used in temp table creation.
Fixed by using Field_newdate consistently throughout the server
except when reading tables defined with older MySQL version.
No test suite is possible because both Field_date and Field_newdate
return the same values in all the metadata calls.
 2007-12-21 12:44:24 +02:00
df@pippilotta.erinye.com
bea1bfd5c7 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-12-21 09:44:08 +01:00
df@pippilotta.erinye.com
f25c6ffaee Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-12-21 09:40:53 +01:00
df@pippilotta.erinye.com
f7527b7856 BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump 2007-12-20 21:37:21 +01:00
brian@zim.(none)
97e3c6cbf4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/bk/mysql-5.1-arch
 2007-12-20 12:32:16 -08:00
brian@zim.(none)
4316829b75 client_priv.h: 
Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
 2007-12-20 12:23:35 -08:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
d18541d946 DbUtil.cpp: 
Rename: storage/ndb/test/src/dbutil.cpp -> storage/ndb/test/src/DbUtil.cpp
DbUtil.hpp, DbUtil.cpp:
  Many changes based off a review from Magnus
DbUtil.hpp:
  Rename: storage/ndb/test/include/dbutil.hpp -> storage/ndb/test/include/DbUtil.hpp
 2007-12-20 21:06:52 +01:00