database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-19 21:09:40 +03:00
Code Activity
41,673 Commits 3,238 Branches 1,092 Tags
c8bc42ccff63c26bb77d0ed88df9a08b1642f30b
Commit Graph

15774 Commits

Author SHA1 Message Date
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
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
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
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
holyfoot/hf@deer.(none)
4e3530626f Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1.20835
 2006-12-06 12:56:11 +04:00
msvensson@neptunus.(none)
7cb305ca77 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 19:56:49 +01:00
msvensson@neptunus.(none)
be212d3486 Remove hack that removes vardir 2006-12-05 19:13:31 +01:00
msvensson@neptunus.(none)
a507459762 Merge bk-internal:/home/bk/mysql-4.1-build 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-05 19:12:12 +01:00
mskold/marty@mysql.com/linux.site
cade196631 New result 2006-12-05 15:52:31 +01:00
msvensson@neptunus.(none)
04ae69850f Update rsult file after merge, error message number increased 2006-12-05 12:18:33 +01:00
msvensson@neptunus.(none)
ea49384d2e mysql.binlog_index renamed to mysql.ndb_binlog_index 2006-12-05 11:27:51 +01:00
msvensson@neptunus.(none)
58baec3f76 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-05 11:18:00 +01:00
msvensson@neptunus.(none)
23a059b224 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-05 10:54:17 +01:00
df@kahlann.erinye.com
a5fe05f0f8 fix test cases after change to error messages file 2006-12-05 10:51:30 +01:00
df@kahlann.erinye.com
5c6d74c258 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-05 10:07:11 +01:00
df@kahlann.erinye.com
41a2a6080c 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-05 10:05:15 +01:00
df@kahlann.erinye.com
6541302bb2 re-enable multiple test runs in sequence for 4.1 on non-windows 2006-12-05 10:03:24 +01:00
mskold/marty@mysql.com/linux.site
f8bd5d312b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-05 06:38:08 +01:00
andrey@example.com
6fd50a5ff6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug22369-v2/my51
 2006-12-05 00:31:23 +01:00
thek@kpdesk.mysql.com
57f78d4ddc Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/tmp/mysql-5.0-maint
 2006-12-04 23:51:54 +01:00
Kristofer.Pettersson@naruto.
9036b003d6 Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-04 22:55:44 +01:00
Kristofer.Pettersson@naruto.
6c4c315210 Disabled testcase flush2 until pushbild framework can handle test which 
disables binlog.
 2006-12-04 22:51:52 +01:00
thek@kpdesk.mysql.com
05410c7db8 Disabled flush2 until pushbuild framework can handle test which 
disables binlog.
 2006-12-04 22:46:12 +01:00
andrey@example.com
05f61b2493 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  example.com:/work/bug22369-v2/my51
 2006-12-04 22:40:51 +01:00
iggy@rolltop.ignatz42.dyndns.org
e0eed3a34b Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-12-04 15:33:53 -05:00
iggy@rolltop.ignatz42.dyndns.org
f427935804 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-12-04 15:32:16 -05:00
iggy@rolltop.ignatz42.dyndns.org
50222ce9ff Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-12-04 15:30:55 -05:00
istruewing@chilla.local
70e56f06cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-04 20:56:37 +01:00
msvensson@neptunus.(none)
0879aeae0c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 20:02:48 +01:00
tsmith/tim@siva.hindu.god
17a5c4d177 Apply malff@weblab.(none) fix for bug 24736 directly to 
mysql-5.1-build tree, in order to get it into mysql-5.1
faster.  See comments from Marc's original push for
patch details.
 2006-12-04 11:38:40 -07:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
877c037ac6 mysql-test-run.pl: Append .nlm to the binary name on NetWare 2006-12-04 19:15:09 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
msvensson@neptunus.(none)
db3a21e75b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:08:52 +01:00
msvensson@neptunus.(none)
33c248eee5 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-04 19:06:42 +01:00
istruewing@chilla.local
098abfadd0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-04 19:03:01 +01:00