mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37204 commits 2788 branches 343 tags 1.7 GiB
Commit graph

37204 commits

This branch
This branch
All branches
Author SHA1 Message Date
mskold/marty@linux.site
604f3f8a69 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-08-15 14:39:48 +02:00
mskold/marty@mysql.com/linux.site
c8b93da355 Fix for bug #21059 Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range 2006-08-15 14:31:21 +02:00
mskold/marty@mysql.com/linux.site
66e8255491 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 13:37:39 +02:00
mskold/marty@mysql.com/linux.site
6a3143e2a0 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 13:12:27 +02:00
mskold/marty@linux.site
ed6deb3d88 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-08-15 11:49:04 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
4c57a94b78 fix windows build 2006-08-15 01:54:14 -07:00
brian@zim.(none)
deb37d146e Period removal for warning message. 2006-08-15 01:20:34 -07:00
mskold/marty@mysql.com/linux.site
b0510b2c6c Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-08-15 09:40:37 +02:00
mskold/marty@mysql.com/linux.site
2d16aa5796 ndb_lock.test, ndb_lock.result: 
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
 2006-08-15 09:38:21 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
9f6c76eb20 Merge mysql.com:/usr/home/bar/mysql-4.1.b19741 
into  mysql.com:/usr/home/bar/mysql-5.0.b19741merge
 2006-08-15 12:04:51 +05:00
tsmith/tim@siva.hindu.god
c2f4e56940 Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 
into  siva.hindu.god:/usr/home/tim/m/bk/b20536-51
 2006-08-14 22:42:07 -06:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
e2d4aa2ca4 Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 
into  xiphis.org:/home/antony/work2/mysql-5.0-merge
 2006-08-14 21:27:36 -07:00
brian@zim.(none)
41f920b013 Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-14 21:26:33 -07:00
tsmith/tim@siva.hindu.god
9228972cd4 Manual merge, and add --echo End of 5.0 tests to ctype_ucs 2006-08-14 18:59:43 -06:00
brian@zim.(none)
16a5d97a5d Merge fixes 2006-08-14 16:50:52 -07:00
tsmith@production.mysql.com
df5e20e75d Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots. 
All but ss677 are against the mysql-5.1 tree only.

Fixes the following bugs:
- Bug #19834: Using cursors when running in READ-COMMITTED can cause InnoDB to crash
- Bug #20213: DBT2 testing cause mysqld to core using Innodb
- Bug #20493: on partition tables, select and show command casue server crash
- Bug #21113: Duplicate printout in SHOW INNODB STATUS
- Bug #21313: rsql_..._recover_innodb_tmp_table is redundant and broken
- Bug #21467: Manual URL wrong in InnoDB "page corrupted" error report
 2006-08-15 01:42:57 +02:00
brian@zim.(none)
8deb5beb9c Merge zim.(none):/home/brian/mysql/dep-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-08-14 15:24:29 -07:00
brian@zim.(none)
545029df36 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-14 14:47:50 -07:00
brian@zim.(none)
4d7f7fb878 Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
rburnett@production.mysql.com
0199dda5a6 My previous change of replacing the call to sprintf with some memcpy type routines was not correct. This patch reverts that. 
mysql_client_test.c:
  reverting my previous change
 2006-08-14 20:48:37 +02:00
kostja@bodhi.local
1f80fb0453 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-14 22:38:22 +04:00
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
c189be6849 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-14 17:15:36 +02: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