mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
30138 commits 2793 branches 343 tags 1.5 GiB
Commit graph

30138 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot@deer.(none)
5b5db01a46 merging fix 2006-05-03 19:01:29 +05:00
holyfoot@deer.(none)
81e625ac4a merging fix 2006-05-03 17:43:32 +05:00
holyfoot@mysql.com
f66bcd2535 Merge mysql.com:/home/hf/work/mysql-5.0.18455 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-03 16:48:15 +05:00
holyfoot@mysql.com
86cab8533f merging 2006-05-03 16:47:05 +05:00
holyfoot@mysql.com
7ee205f67a merging 2006-05-03 16:42:39 +05:00
svoj@april.(none)
365e38b05c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:37:42 +05:00
svoj@april.(none)
23d304b312 Merge april.(none):/home/svoj/devel/mysql/BUG18160/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
 2006-05-03 16:36:00 +05:00
holyfoot@mysql.com
9de68b8122 merging 2006-05-03 16:33:42 +05:00
jani@a193-229-222-105.elisa-laajakaista.fi
9b472ef26a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2006-05-03 14:10:33 +03:00
holyfoot@mysql.com
8667344572 Merge hf@192.168.21.28:work/mysql-4.1.16892 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:53:36 +05:00
holyfoot@mysql.com
486693e219 Merge mysql.com:/home/hf/work/mysql-4.1.15442 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:52:07 +05:00
holyfoot@mysql.com
0007484c26 Merge mysql.com:/home/hf/work/mysql-4.1.15225 
into mysql.com:/home/hf/work/mysql-4.1.mrg
 2006-05-03 15:51:19 +05:00
igor@rurik.mysql.com
ae4eb6b50f Fixed bug #14292: performance degradation for a benchmark query. 
This performance degradation was due to the fact that some
cost evaluation code added into 4.1 in the function find_best was
not merged into the code of the function best_access_path added
together with other code for greedy optimizer.
Added a parameter to the function print_plan. The parameter contains
accumulated cost for a given partial join.
 
The patch does not include a special test case since this performance
degradation is hard to reproduse with a simple example.

TODO: make the function find_best use the function best_access_path
in order to remove duplication of code which might result in incomplete
merges in the future.
 2006-05-02 18:31:20 -07:00
pekka@mysql.com
2b25349820 pekka:get - push push push 2006-05-02 21:47:53 +02:00
cmiller@zippy.(none)
d71f198333 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
 2006-05-02 15:08:47 -04:00
cmiller@zippy.(none)
0f63c3d39c An update to as-yet unused new feature of snprintf, which was added to bring 
our sprintf()-alike in sync with our fprintf()-alike features.
 2006-05-02 13:42:35 -04:00
dlenev@mysql.com
c40f8557dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
 2006-05-02 17:07:23 +04:00
pekka@mysql.com
5c0012cb98 ndb - bug#19201 (4.1), see comment in NdbBlob.cpp 2006-05-02 14:33:55 +02:00
ingo@mysql.com
13e67383e8 Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug10405
 2006-05-02 11:51:40 +02:00
ingo@mysql.com
5135a28d38 Merge mysql.com:/home/mydev/mysql-4.1-bug10405 
into  mysql.com:/home/mydev/mysql-5.0-bug10405
 2006-05-02 11:01:38 +02:00
knielsen@mysql.com
f0341ac431 Fix a bunch of non-Linux compile failures. 2006-05-02 09:19:54 +02:00
ramil@mysql.com
b337e83db2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b7643
 2006-05-02 11:33:26 +05:00
holyfoot@mysql.com
aaf2c26e01 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.clean
 2006-05-02 09:01:13 +05:00
holyfoot@deer.(none)
aab0e9c24e Win build fix 2006-05-02 08:59:49 +05:00
cmiller@zippy.(none)
1205ae8276 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
 2006-05-01 22:50:36 -04:00
cmiller@zippy.(none)
85ffd9640e SECURITY FIX 
Bug#17667: An attacker has the opportunity to bypass query logging.

This adds a new, local-only printf format specifier to our *printf functions
that allows us to print known-size buffers that must not be interpreted as 
NUL-terminated "strings."

It uses this format-specifier to print to the log, thus fixing this 
problem.
 2006-05-01 22:10:50 -04:00
jani@hundin.mysql.fi
5e102db342 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/jani/mysql-4.1
 2006-05-01 21:53:35 +03:00
jani@hundin.mysql.fi
70d2261d7a Merge jani@193.229.222.105:/my/bk/mysql-4.1 
into  hundin.mysql.fi:/home/jani/mysql-4.1
 2006-05-01 21:52:11 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
e2c3c37231 Added tests for Bug#14515 2006-05-01 21:30:09 +03:00
kent@mysql.com
715833dbb7 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-05-01 20:23:36 +02:00
kent@mysql.com
e8fb05845b Merge 2006-05-01 20:16:19 +02:00
jimw@mysql.com
c571f6ff57 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 10:59:14 -07:00
kent@mysql.com
f45d6d3cc6 mysql.spec.sh: 
Use "./libtool --mode=execute" to find real path to executables
 2006-05-01 19:48:31 +02:00
holyfoot@mysql.com
22fc7774d0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.clean
 2006-05-01 22:21:28 +05:00
holyfoot@deer.(none)
9b832153f9 Fix for Win build 2006-05-01 22:16:08 +05:00
jimw@mysql.com
189241b03e Merge mysql.com:/home/jimw/my/mysql-5.0-18607 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:12:36 -07:00
jimw@mysql.com
9ab852bb35 Merge mysql.com:/home/jimw/my/mysql-5.0-18312 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-01 09:11:57 -07:00
cmiller@zippy.(none)
6af3f88f07 Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
 2006-05-01 09:46:00 -04:00
jani@a193-229-222-105.elisa-laajakaista.fi
4154bc3ec0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2006-05-01 15:01:11 +03:00
jani@hundin.mysql.fi
c4280491e0 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/jani/mysql-4.1
 2006-04-30 16:20:26 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
a7a8143941 Fix for Bug#14515. 2006-04-30 16:01:34 +03:00
kent@mysql.com
39bd702756 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-29 22:48:22 +02:00
ingo@mysql.com
3c317fef53 Merge mysql.com:/home/mydev/mysql-4.0-bug10405 
into  mysql.com:/home/mydev/mysql-4.1-bug10405
 2006-04-29 19:38:41 +02:00
kent@mysql.com
5e717959d0 config-win.h: 
Fix strange "double" define for popen.
  Avoid warnings about sprintf() etc. being unsafe.
  Corrected typo "#endfif"
 2006-04-29 15:58:02 +02:00
kent@mysql.com
a14f1250d6 configure.in: 
Changed version to 4.1.20
 2006-04-29 07:32:12 +02:00
kent@mysql.com
b714a0cec4 mysql.spec.sh: 
Backport of changes in 5.0 (bug#18294)
 2006-04-29 01:28:04 +02:00
kent@mysql.com
cc6ad16b16 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-29 00:52:30 +02:00
elliot@mysql.com
604b5836bb BUG#19145: mysqld crashes if you set the default value of an enum field to NULL 
Now test for NULLness the pointers returned from objects created from the
default value. Pushing patch on behalf of cmiller.
 2006-04-28 12:15:29 -04:00
msvensson@devsrv-b.mysql.com
bad7e32a94 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
 2006-04-28 17:48:50 +02:00
kent@mysql.com
0222a31358 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-04-28 17:23:14 +02:00