mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34048 commits 2781 branches 343 tags 1.6 GiB
Commit graph

9597 commits

Author SHA1 Message Date
istruewing@chilla.local
d37ff7d7bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-01-03 08:52:50 +01:00
tomas@poseidon.mysql.com
4333bcabd7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2006-12-27 19:36:41 +01:00
svoj@mysql.com/april.(none)
2fc0bca6a4 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
 2006-12-27 17:55:33 +04:00
svoj@mysql.com/june.mysql.com
591712f53f BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to 
repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
 2006-12-26 17:47:30 +04:00
istruewing@chilla.local
ea353c72a6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-21 17:13:38 +01:00
svoj@mysql.com/april.(none)
32c7187952 Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
 2006-12-20 20:01:31 +04:00
svoj@mysql.com/april.(none)
5424cf19de Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines
 2006-12-20 19:08:28 +04:00
svoj@mysql.com/april.(none)
5ad9035605 BUG#21310 - Trees in SQL causing a "crashed" table with MyISAM storage engine 
An update that used a join of a table to itself and modified the
table on one side of the join reported the table as crashed or
updated wrong rows.

Fixed by creating temporary table for self-joined multi update statement.
 2006-12-20 19:05:35 +04:00
joerg@trift2.
90fc044fc2 Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415). 2006-12-20 11:13:16 +01:00
joerg@trift2.
f9802fd47d Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trudy Pelzer 2006-12-20 10:54:41 +01:00
tsmith/tim@siva.hindu.god
84a0873d05 Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200 
into  siva.hindu.god:/usr/home/tim/m/bk/50-release
 2006-12-19 17:43:56 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438 Added innodb_rollback_on_timeout option to restore the 4.1 
InnoDB timeout behavior (Bug #24200)
 2006-12-19 16:57:51 -07:00
tsmith/tim@siva.hindu.god
2bc45899c0 Bug #24947: REPEAT function returns NULL when passed a field as the count parameter 
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.
 2006-12-19 15:54:12 -07:00
istruewing@chilla.local
6649a3874f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-19 12:41:39 +01:00
istruewing@chilla.local
f3f5eb5cf6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2006-12-19 10:40:53 +01: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
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
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
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
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)
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
msvensson@neptunus.(none)
8022e9fcce Adjust replace to mask win paths 2006-12-06 16:44:31 +01: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
thek@kpdesk.mysql.com
05410c7db8 Disabled flush2 until pushbuild framework can handle test which 
disables binlog.
 2006-12-04 22:46:12 +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
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
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
msvensson@neptunus.(none)
a9f4f4ed11 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-04 19:01:31 +01:00
gkodinov@dl145s.mysql.com
d253588c69 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0
 2006-12-04 18:05:42 +01:00
mskold/marty@mysql.com/linux.site
6e8f99d29b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-12-04 15:09:47 +01:00
Kristofer.Pettersson@naruto.
f91e48c762 Merge naruto.:C:/cpp/bug17733/my50-bug17733 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-04 14:43:34 +01:00
gkodinov/kgeorge@macbook.gmz
063fe51c69 item_func.cc: 
fixed a valgrind warning
type_varchar.test:
  fixed a valgrind warning
 2006-12-04 14:26:05 +02:00
andrey@example.com
b5e44560f6 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  example.com:/work/bug24395-v2/my50
 2006-12-02 00:30:10 +01:00
andrey@example.com
b275089b66 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  example.com:/work/bug24395-v2/my41
 2006-12-01 23:11:44 +01:00
istruewing@chilla.local
763fdea487 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-01 18:49:20 +01:00
istruewing@chilla.local
341bd06408 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-01 18:38:08 +01:00
thek@kpdesk.mysql.com
94b48caf2e Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
 2006-12-01 18:00:45 +01:00
df@kahlann.erinye.com
da7820c37d Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-01 13:02:54 +01:00