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

9578 commits

Author SHA1 Message Date
joerg@trift2.
c9572a10c4 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release 
into  trift2.:/MySQL/M50/clone-5.0
 2006-12-20 10:58: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
df@kahlann.erinye.com
e55331b4ed Merge dev:my/build-200612151202-5.0.32/mysql-5.0-release 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
 2006-12-20 09:44:47 +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
df@kahlann.erinye.com
cf1fd5427c 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-19 15:31:10 +01:00
df@kahlann.erinye.com
6b27694ac8 remove hard-coded socket paths from some tests 2006-12-19 15:10:15 +01: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
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
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
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
thek@kpdesk.mysql.com
b201d4ef93 Bug#22043 MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS" 
- Refactoring of duplicate code
- Modified bad test cases
- Changed expected error when operating on information_schema.
 2006-12-01 12:50:57 +01:00
Kristofer.Pettersson@naruto.
6c8d7ea894 Bug#17733 Flushing logs causes daily server crash 
Server crashes if a flush commmand is issued and binlog is closed.
- added check to prevent binlog access when binlog file isn't opened.
 2006-12-01 09:49:19 +01:00
iggy@rolltop.ignatz42.dyndns.org
3add79dd11 Bug#20836 Selecting into variables results in wrong results being returned 
- Post-merge cleanup.
- Disabled this bug's test for 5.x until 16861 is resolved.
 2006-11-30 13:09:48 -05:00
andrey@example.com
dec1ebf6e3 Merge example.com:/work/bug24395-v2/my41 
into  example.com:/work/bug24395-v2/my50

fix for bug#24395 merged into 5.0
 2006-11-30 18:36:15 +01:00
gkodinov/kgeorge@macbook.gmz
8b8e820224 Merge bk-internal:/home/bk/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B11927-5.0-opt
 2006-11-30 18:49:50 +02:00
gkodinov/kgeorge@macbook.gmz
36e7fbc033 func_group.test, func_group.result, func_gconcat.result, func_gconcat.test: 
merge fix : removed undeterministic warnings
 2006-11-30 18:47:59 +02:00
mskold/marty@mysql.com/linux.site
a172df24a9 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 16:04:12 +01:00
mskold/marty@mysql.com/linux.site
638c294b7f Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-30 15:57:43 +01:00
mskold/marty@mysql.com/linux.site
af324d9cf0 #18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: call peek_index_rows 2006-11-30 15:02:33 +01:00
gkodinov@dl145s.mysql.com
03431eb78a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
 2006-11-30 12:22:32 +01:00
msvensson@neptunus.(none)
e36384fdce Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 12:14:28 +01:00
msvensson@neptunus.(none)
fb2ffbf203 Merge neptunus.(none):/home/msvensson/mysql/bug10608/my41-bug10608 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-30 11:58:23 +01:00
gkodinov/kgeorge@macbook.gmz
7464a20bc8 func_gconcat.result, func_gconcat.test: 
disabled warnings because their order is undeterministic
 2006-11-30 12:58:05 +02:00
msvensson@neptunus.(none)
af5882a175 Merge neptunus.(none):/home/msvensson/mysql/bug20589/my50-bug20589 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 11:40:13 +01:00
msvensson@neptunus.(none)
f883d68ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c Add "chmod" command to mysqltest 2006-11-30 10:54:50 +01:00
msvensson@neptunus.(none)
d3090cc3fe Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 23:08:35 +01:00