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

41532 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
5c062b2b84 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-08 15:57:18 +01:00
istruewing@chilla.local
05dde1f311 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-08 15:55:56 +01:00
holyfoot/hf@deer.(none)
edfbcc12cb Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/embt/my51-embt
 2006-12-08 15:49:43 +04:00
istruewing@chilla.local
c583a7ba76 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-08 12:29:13 +01:00
istruewing@chilla.local
df2b93439f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-08 12:28:21 +01:00
holyfoot/hf@mysql.com/deer.(none)
4091806268 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/embt/my50-embt
 2006-12-08 15:22:46 +04:00
istruewing@chilla.local
ca62c94230 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2006-12-08 12:20:48 +01:00
holyfoot/hf@mysql.com/deer.(none)
f83bedabed Merge bk@192.168.21.1:mysql-4.1-opt 
into  mysql.com:/home/hf/work/embt/my41-embt
 2006-12-08 15:15:33 +04:00
jonas@perch.ndb.mysql.com
835c7207e4 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
 2006-12-08 10:43:48 +01:00
jonas@perch.ndb.mysql.com
a460d5f288 ndb - bug#21948 
Fix bug in previous changeset...causing SR problems with disk
 2006-12-08 10:24:48 +01:00
df@kahlann.erinye.com
8375e6684d BUG#24896 mysql_upgrade -p fix 2006-12-08 10:23:03 +01:00
mskold/marty@linux.site
9a86b3cc5d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-07 16:39:13 +01:00
mskold/marty@mysql.com/linux.site
79542f0584 ps_7ndb problem now fixed 2006-12-07 16:30:30 +01:00
mskold/marty@mysql.com/linux.site
6b4b402977 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Re-generated test result 2006-12-07 16:27:38 +01:00
df@kahlann.erinye.com
8fffa20a5a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-07 16:08:55 +01:00
mskold/marty@linux.site
c39c7b6f2b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-07 16:08:14 +01:00
df@kahlann.erinye.com
75c7114124 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 16:07:14 +01:00
df@kahlann.erinye.com
19ec379b15 do not autorelease build ids when a child of mysql-test-run.pl dies 2006-12-07 16:06:29 +01:00
mskold/marty@linux.site
8ca573857f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-12-07 16:03:31 +01:00
mskold/marty@mysql.com/linux.site
84a8d1759b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-07 15:54:43 +01:00
mskold/marty@mysql.com/linux.site
8fa5f366f7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-12-07 15:51:16 +01:00
mskold/marty@mysql.com/linux.site
93fda180d1 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Added test case 2006-12-07 15:49:59 +01:00
svoj@mysql.com/april.(none)
e17d7bce00 BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to the 
table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.
 2006-12-07 18:32:40 +04:00
jonas@perch.ndb.mysql.com
ca3d0cf5b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-07 15:25:40 +01:00
jonas@perch.ndb.mysql.com
3ab75d971d ndb - bug#21948 & bug#17605 
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)
 2006-12-07 15:25:02 +01:00
df@kahlann.erinye.com
01395b1dc0 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-07 15:21:05 +01:00
df@kahlann.erinye.com
bb1297cdc3 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 15:13:12 +01:00
df@kahlann.erinye.com
77965c013c BUG#24780 use --sysconfdir in scripts 2006-12-07 15:02:32 +01:00
andrey@example.com
c24381bdaa Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/mysql-5.1-maint
 2006-12-07 13:58:56 +01:00
andrey@example.com
12a68db3d3 Additional fix for bug#22369 2006-12-07 13:57:39 +01:00
holyfoot/hf@deer.(none)
883aa8d980 Merge mysql.com:/home/hf/work/pfix/my50-pfix 
into  mysql.com:/home/hf/work/pfix/my51-pfix
 2006-12-07 15:23:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c merging fix 2006-12-07 15:22:43 +04:00
mskold/marty@linux.site
3d96ab94f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-07 11:42:42 +01:00
holyfoot/hf@mysql.com/deer.(none)
41bd03c370 merging 2006-12-07 13:38:16 +04:00
holyfoot/hf@deer.(none)
dfff2c27bc Merge mysql.com:/home/hf/work/22372/my50-22372 
into  mysql.com:/home/hf/work/22372/my51-22372
 2006-12-07 09:27:47 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427 merging 2006-12-07 09:11:56 +04:00
msvensson@neptunus.(none)
961275a356 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-06 23:45:09 +01:00
msvensson@neptunus.(none)
94eb027f6b Only call mysql_server_end if mysql_server_init has been called. 
Remove DBUG_ENTER in my_end
 2006-12-06 23:43:36 +01:00
msvensson@neptunus.(none)
eb1ba91d14 Flush stderr after print of error message to get predictable output 2006-12-06 22:03:56 +01:00
baker@bk-internal.mysql.com
37f7e29db2 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-06 20:26:10 +01:00
holyfoot/hf@mysql.com/deer.(none)
9e52ef1f9d Merge mysql.com:/home/hf/work/22372/my41-22372 
into  mysql.com:/home/hf/work/22372/my50-22372
 2006-12-06 22:02:39 +04:00
holyfoot/hf@mysql.com/deer.(none)
f404488d29 bug #22372 
datafile added to be used in gis.test
 2006-12-06 21:47:29 +04:00
holyfoot/hf@mysql.com/deer.(none)
e83c682fb7 bug #22372 (LOAD DATA crashes the table with the geometry field) 
The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()
 2006-12-06 21:45:57 +04:00
msvensson@neptunus.(none)
8022e9fcce Adjust replace to mask win paths 2006-12-06 16:44:31 +01:00
jonas@perch.ndb.mysql.com
4456144c58 ndb - add support for periodic mem-reporting 2006-12-06 14:38:32 +01:00
jonas@perch.ndb.mysql.com
174d561489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-12-06 13:28:13 +01:00
jonas@perch.ndb.mysql.com
a0974ea8c8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-12-06 13:26:44 +01:00
jonas@perch.ndb.mysql.com
b7deb4dcec Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2006-12-06 13:10:00 +01:00
jonas@perch.ndb.mysql.com
6d6fd5f7da ndb - bug#22773 
Fix correct log event on db-node disconnect
 2006-12-06 13:09:30 +01:00
holyfoot/hf@deer.(none)
9079dd2aa8 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1.20835
 2006-12-06 15:26:22 +04:00