mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34321 commits 2774 branches 343 tags 1.6 GiB
Commit graph

9902 commits

Author SHA1 Message Date
tsmith/tim@siva.hindu.god
17fb4c5cbd Post-merge fix to symlink.result 2006-12-14 17:47:55 -07:00
tsmith/tim@siva.hindu.god
9cbe0621b8 Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 16:51:12 -07:00
tsmith/tim@siva.hindu.god
8e5be1ad97 myisam.result: a test was moved from the .test file, but the results were not updated. 2006-12-14 16:23:54 -07:00
tsmith/tim@siva.hindu.god
8fbfaeb51f Merge siva.hindu.god:/usr/home/tim/m/bk/41 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-12-14 13:01:08 -07:00
kaa@polly.local
feb0e3a0f2 Merge polly.local:/tmp/maint/bug24117/my50-bug24117 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-14 21:24:52 +03:00
kaa@polly.local
4162e009cb Fix for bug #24117 "server crash on a FETCH with a cursor on a table which is not in the table cache" 
Problem:
When creating a temporary field for a temporary table in create_tmp_field_from_field(), a resulting field is created as an exact copy of an original one (in Field::new_field()). However, Field_enum and Field_set contain a pointer (typelib) to memory allocated in the parent table's MEM_ROOT, which under some circumstances may be deallocated later by the time a temporary table is used.

Solution:
Override the new_field() method for Field_enum and Field_set and create a separate copy of the typelib structure in there.
 2006-12-14 20:58:07 +03:00
thek@kpdesk.mysql.com
165ae199ab Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 16:09:15 +01:00
thek@kpdesk.mysql.com
b19b9333f0 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 16:04:07 +01:00
Kristofer.Pettersson@naruto.
e09e2694d6 Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-12-14 16:02:43 +01:00
Kristofer.Pettersson@naruto.
aa2c208899 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-14 15:52:06 +01:00
thek@kpdesk.mysql.com
1d14b89871 Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
 2006-12-14 15:30:00 +01:00
thek@kpdesk.mysql.com
b7fcaadacf Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-14 14:50:08 +01:00
thek@kpdesk.mysql.com
7e60087441 Bug#17498 failed to put data file in custom directory use "data directory" option 
Merged 4.1->5.0. Updated myisam.test
 2006-12-14 13:45:17 +01:00
thek@kpdesk.mysql.com
c9622dfb0a Merge kpdesk.mysql.com:/home/thek/dev/bug17489/my41-bug17498 
into  kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498
 2006-12-14 13:38:09 +01:00
thek@kpdesk.mysql.com
29f72a0ba1 Bug#17498 failed to put data file in custom directory use "data directory" option 
- When this bug was corrected it changed the behavior 
  for data/index directory in the myisam test case.
- This patch moves the OS depending tests to a non-windows
  test file.
 2006-12-14 13:23:31 +01:00
igor@olga.mysql.com
8642d23b6a Fixed bug #25027. 
Blocked evaluation of constant objects of the classes
Item_func_is_null and Item_is_not_null_test at the
prepare phase in the cases when the objects used subqueries.
 2006-12-13 21:08:25 -08:00
svoj@mysql.com/april.(none)
db88cf3df7 Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines
 2006-12-13 16:29:33 +04:00
svoj@mysql.com/april.(none)
f92ae8d6c1 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines
 2006-12-13 15:53:37 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
46e07cc9d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
 2006-12-13 14:05:29 +04:00
igor@olga.mysql.com
026196c4ef Fixed bug #25027. 
Removed an assertion that was not valid for the cases where the query
in a prepared statement contained a single-row non-correlated
subquery that was used as an argument of the IS NULL predicate.
 2006-12-13 00:39:13 -08:00
igor@olga.mysql.com
11cdca9a2f Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2006-12-12 11:53:09 -08:00
gluh@mysql.com/gluh.(none)
118a0c7fe2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2006-12-12 14:01:06 +04:00
igor@olga.mysql.com
53d97a7d72 Fixed bug #24670: optimizations that are legal only for subqueries without tables 
and no WHERE condition were applied for any subquery without tables.
 2006-12-11 18:57:23 -08:00
malff/marcsql@weblab.(none)
996fa0dfbb Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-19194
 2006-12-11 17:15:08 -07:00
malff/marcsql@weblab.(none)
506c2a722f Bug#19194 (Right recursion in parser for CASE causes excessive stack usage, 
limitation)
Bug#24854 (Mixing Searched Case with Simple Case inside Stored Procedure
  crashes Mysqld)

Implemented code review (19194) comments
 2006-12-11 16:59:02 -07:00
msvensson@neptunus.(none)
eb1c280142 Wait for INSERT DELAYED to finish i.e sleep in while loop until 
"select count" is one more.
 2006-12-11 16:43:21 +01:00
Kristofer.Pettersson@naruto.
0d7f94da7b Merge naruto.:C:/cpp/bug17489/my50-bug17489 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-11 13:13:05 +01:00
Kristofer.Pettersson@naruto.
119afb19c3 Merge naruto.:C:/cpp/bug17489/my41-bug17489 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-12-11 13:06:59 +01:00
gluh@mysql.com/gluh.(none)
f0f4d3c0bd Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2006-12-11 15:32:07 +04:00
Kristofer.Pettersson@naruto.
57abd1dc1e Merge naruto.:C:/cpp/bug17489/my41-bug17489 
into  naruto.:C:/cpp/bug17489/my50-bug17489
 2006-12-10 16:40:15 +01:00
kaa@polly.local
6d1e7bcf7b Merge polly.local:/tmp/maint/bug24261/my50-bug24261 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-08 22:38:03 +03: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
Kristofer.Pettersson@naruto.
ecbb4eb987 Bug#17498 failed to put data file in custom directory use "data directory" option 
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().
 2006-12-07 17:01:00 +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
holyfoot/hf@mysql.com/deer.(none)
4f0c9c431c merging fix 2006-12-07 15:22:43 +04:00
holyfoot/hf@mysql.com/deer.(none)
9203d43427 merging 2006-12-07 09:11:56 +04: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)
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
ramil/ram@mysql.com/myoffice.izhnet.ru
0b5696b82b Fix for bug #22533: Traditional: Too-long bit value not rejected. 
Problem: storing >=8 byte hexadecimal values we don't check data.
Fix: check if the data fits the {u}longlong range.
 2006-12-06 16:32:12 +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)
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
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
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
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
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)
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