database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Code Activity
46,939 Commits 3,266 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
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
malff/marcsql@weblab.(none)
a1b260df75 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-11733_topdown
 2006-11-30 18:48:16 -07:00
malff/marcsql@weblab.(none)
e1bdc140d1 WL#3602 
Post review changes
the --read-only option is not enforced for the slave thread in replication, or for the SUPER user.
 2006-11-30 18:43:33 -07:00
df@kahlann.erinye.com
f1ccd9cb30 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-11-30 22:47:50 +01:00
df@kahlann.erinye.com
9a6f9c8c44 late after-merge fix 2006-11-30 22:45:55 +01:00
monty@narttu.mysql.fi
693b906f6e Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 23:27:16 +02:00
monty@mysql.com/narttu.mysql.fi
0a673596a2 Don't abort if we call my_thread_end() multiple times 
Fixed new introduced bug in my_time.c
 2006-11-30 22:00:05 +02: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@dl145s.mysql.com
af74fd07b4 Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 17:59:14 +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
e576bf7fa3 bug#18487 UPDATE IGNORE not supported for unique constraint violation of non-primary key: updated test result 2006-11-30 16:19:55 +01: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@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
2a4de6fc84 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 15:05:09 +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
mskold/marty@linux.site
6db1610c21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-11-30 14:45:54 +01:00
df@kahlann.erinye.com
c75d099a0b 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-11-30 13:32:16 +01:00
df@kahlann.erinye.com
d92eea8687 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-11-30 13:27:26 +01:00
df@kahlann.erinye.com
31d0b4e985 minor fix to mtr_process.pl 2006-11-30 13:16:12 +01:00
msvensson@neptunus.(none)
dc88e57744 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 13:04:24 +01:00
gkodinov@dl145s.mysql.com
7c94b8012c Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 12:29:11 +01:00
gkodinov@dl145s.mysql.com
498791908a Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-30 12:27:04 +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)
e753d615c5 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 11:38:24 +01:00
msvensson@neptunus.(none)
19def6ebe7 Include *.MY* files from std_data in dist 2006-11-30 11:33:26 +01:00
msvensson@neptunus.(none)
1daff38fd8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 11:31:51 +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
bar@mysql.com/bar.intranet.mysql.r18.ru
dcde1be17d Bug#24158 SET PASSWORD in binary log fails under ANSI_QUOTES 
Problem: ``SET PASSWORD FOR foo@localhost'' was written into
binary log using double quites: ``SET PASSWORD FOR "foo"@"localhost"...''.
If sql_mode was set to ANSI_QUOTES, parser on slave considered
"foo" and "localhost" as identifiers instead of strigns constants,
so it failed to parse, generated syntax error and slave then stopped.
Fix: changing binary log entries to use single quotes:
``SET PASSWORD FOR 'foo'@'localhost'...'' not to depend on ANSI_QUOTES.
 2006-11-30 11:08:23 +04:00
baker@bk-internal.mysql.com
082de8dfce Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-30 01:45:16 +01:00
kostja@bodhi.local
bdf6d15f4b A post-merge fix. 2006-11-30 02:51:41 +03:00
kostja@bodhi.local
1cee31a6fd A post-merge fix. 2006-11-30 02:42:01 +03:00
kostja@bodhi.local
9fa2b75804 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-30 02:36:18 +03:00
kostja@bodhi.local
605404ec68 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:00:39 +03:00
kostja@bodhi.local
c6c172e40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-30 01:58:57 +03:00
msvensson@neptunus.(none)
b5603af7d5 Merge 192.168.0.5:mysql/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:53:07 +01:00
msvensson@neptunus.(none)
741eb0179a Update result to 5.1 version format 2006-11-29 23:48:39 +01:00
msvensson@neptunus.(none)
298edec4c1 Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:09:57 +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
msvensson@neptunus.(none)
a50f80636c Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
 2006-11-29 23:05:33 +01:00
msvensson@neptunus.(none)
68724b3a8d Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 
- chmod the saved files from 4.1 to make sure they are writable
 2006-11-29 23:03:45 +01:00
msvensson@neptunus.(none)
db863d826c Add command "chmod" to mysqltest 2006-11-29 23:02:06 +01:00
msvensson@shellback.(none)
7146466eef Merge 192.168.0.10:mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 22:52:32 +01:00