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
37075 commits 2793 branches 343 tags 1.5 GiB
Commit graph

37075 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
d04ce2df7a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-14 20:17:46 +02:00
msvensson@neptunus.(none)
91c2e68c2b Bug#21327 OpenSSL-checking in configure 
- Change $d to $libs as suggested.
 - Thanks to Michael Prohm for the patch!
 2006-08-14 20:16:47 +02:00
joerg@trift2.
a560c3ee1f scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages. 2006-08-14 19:56:41 +02:00
brian@zim.(none)
c43a332859 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.0
 2006-08-14 09:45:41 -07:00
patg@govinda.patg.net
a60a43c207 Post 5.0engines to 5.1 engines merge fix that didn't make it into that push. 2006-08-14 08:43:37 -07:00
kostja@bodhi.local
d03b39aaab Fix a test case (proper clean up). 2006-08-14 19:18:33 +04:00
rburnett@bk-internal.mysql.com
4bb7715482 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-14 17:13:31 +02:00
kostja@bodhi.local
14e237a957 Fix a test suite failure. 2006-08-14 19:05:35 +04:00
cmiller@zippy.cornsilk.net
8a33305959 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/m50-maint-b21224
 2006-08-14 10:02:28 -04:00
cmiller@zippy.cornsilk.net
873a0a4370 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2006-08-14 09:53:18 -04:00
svoj@may.pils.ru
91e94d781f Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
 2006-08-14 18:08:33 +05:00
kostja@bodhi.local
9b05865be4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-14 16:30:57 +04:00
kostja@bodhi.local
d4a7b82be9 Windows build fix: declare _db_set_ before it's used. 2006-08-14 16:15:08 +04:00
svoj@may.pils.ru
d4bdba176f BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 
Fixed by moving update_key_parts() down to be after write_index().
 2006-08-14 17:05:02 +05:00
mats@romeo.(none)
7a1ccf90d4 Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint 
into  romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
 2006-08-14 14:04:30 +02:00
mats@romeo.(none)
2c21e455d4 Fixing unit test execution script to work with AIX 5.2 and OS X machines. 
These are using old version of the Test::Harness modules, so I resort
to a safer way of running executable files.
 2006-08-14 13:52:05 +02:00
brian@zim.(none)
7429c871b9 Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 2006-08-14 03:29:17 -07:00
brian@zim.(none)
b93a5c5f04 Updated row result, and fix for Windows build. 2006-08-14 03:26:53 -07:00
kostja@bodhi.local
5dfdc8bfce Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
brian@zim.(none)
af443c2dd8 Fixed warning message breakage. 
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
 2006-08-13 22:28:41 -07:00
kostja@bodhi.local
04c97488f9 Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-12 21:06:51 +04:00
tsmith/tim@siva.hindu.god
72d55f3878 Bug #20536: md5() with GROUP BY and UCS2 return different results on myisam/innodb 
Make the encryption functions MD5(), SHA1() and ENCRYPT() return binary results.
    
Make MAKE_SET() and EXPORT_SET() use the correct character set for their default separator strings.
 2006-08-11 17:09:19 -06:00
pgalbraith/patg@govinda.patg.net
9da072cb5b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-11 14:06:23 -07:00
baker/brian@zim.(none)
a06a582212 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-11 13:30:55 -07:00
cmiller@zippy.cornsilk.net
d6b00b72eb Bug#21224: mysql_upgrade uses possibly insecure temporary files 
We open for writing a known location, which is exploitable with a symlink
attack.  Now, use the EXCLusive flag, so that the presence of anything at 
that location causes a failure.  Try once to open safely, and if failure 
then remove that location and try again to open safely.  If both fail, then
raise an error.
 2006-08-11 15:31:06 -04:00
jimw@rama.(none)
2e87907e40 Merge rama.(none):/home/jimw/my/mysql-5.0-21284 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-08-11 12:19:41 -07:00
cmiller@zippy.cornsilk.net
6e2c8bac4c Bug#18875: Default value of tmp_table_size is meaningless 
It makes no sense to have a default tmp_table_size larger than the 
max_heap_table_size .  In usage, the tmp is ever limited to the max value, 
so I lowered the default tmp to the default max value.

A great idea would be to emit a warning when the tmp_table_size is set to 
greater than max_heap_table_size .
 2006-08-11 09:49:01 -04:00
cmiller@zippy.cornsilk.net
1257062ef4 German translations. 2006-08-11 09:27:44 -04:00
svoj@may.pils.ru
07a1ed651f Extended a test case for bug#7391. 2006-08-11 14:41:07 +05:00
svoj@may.pils.ru
827164916c Merge may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-5.0
 2006-08-11 14:24:09 +05:00
baker/brian@zim.(none)
5a466cc48c Removed bdb test cases. 2006-08-10 18:29:25 -07:00
Reggie@xgeek.
e26aef9f64 Some small cleanups that will help get mysql_client_test passing on Windows 2006-08-10 17:39:01 -05:00
pgalbraith/patg@govinda.patg.net
b2ce951b81 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 15:31:44 -07:00
patg@govinda.patg.net
4371749996 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge
 2006-08-10 14:28:39 -07:00
brian@zim.(none)
e8289bfbc1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-10 13:44:04 -07:00
rburnett@bk-internal.mysql.com
6b399a498b Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-10 19:24:46 +02:00
cmiller@zippy.cornsilk.net
f6f7eb851e Merge updates. 2006-08-10 12:39:18 -04:00
tnurnberg@salvation.intern.azundris.com
170392850d Bug#19844: time_format in Union truncates values 
time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.
---
Bug#19844: time_format in Union truncates values

time_format() claimed %H and %k would return at most two digits
(hours 0-23), but this coincided neither with actual behaviour
nor with docs.  this is not visible in simple queries; forcing
a temp-table is probably the easiest way to see this.  adjusted
the return-length appropriately; the alternative would be to
adjust the docs to say that behaviour for > 99 hours is undefined.
 2006-08-10 15:37:24 +02:00
kroki/tomash@moonlight.intranet
b341356abd Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-runtine-merge
 2006-08-10 16:16:16 +04:00
kroki/tomash@moonlight.intranet
aca2c3761a Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 16:11:55 +04:00
kroki/tomash@moonlight.intranet
ed42379c72 Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 15:07:27 +04:00
serg@janus.mylan
069131e28a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  janus.mylan:/usr/home/serg/Abk/m51
 2006-08-10 12:39:59 +02:00
andrey@example.com
81efea724e revert part of the code 
how did it get in?!? (it's only in local csets so no other tree is affected)
 2006-08-10 12:26:43 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
50ae5b7989 Fix for bug #20709: Collation not used in group by on 4.1. 
myisam/mi_uniue.c:mi_check_unique() should skip trailing spaces comparing 
TEXT and VARTTEXT key segments.
 2006-08-10 15:06:22 +05:00
andrey@example.com
eba9109225 after merge update 2006-08-10 11:52:34 +02:00
holyfoot/hf@mysql.com/deer.(none)
1ada6ca108 bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS) 
two test results changed after the patch
 2006-08-10 14:50:54 +05:00
serg@janus.mylan
7d77c53038 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into janus.mylan:/usr/home/serg/Abk/m51
 2006-08-10 11:04:09 +02:00
brian@zim.(none)
65e9ae97b0 This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
kroki/tomash@moonlight.intranet
f6dda7f1e1 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
 2006-08-10 12:10:48 +04:00
tnurnberg@salvation.intern.azundris.com
747a86b114 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-maint-17926
 2006-08-10 08:13:14 +02:00