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

1017 commits

Author SHA1 Message Date
Matthias Leich
81e7bd8679 Upmerge 5.0 -> 5.1 2008-06-25 19:01:17 +02:00
Matthias Leich
69a1c78eba Fix for 
Bug#37492 timing bug in subselect.test
+ similar weaknesses found during testing
+ replace error numbers by error names
 2008-06-25 16:59:38 +02:00
Davi Arnaut
c20188e011 Bug#33873: Fast ALTER TABLE doesn't work with multibyte character sets 
The problem was that when comparing tables for a possible
fast alter table, the comparison was being performed using
the parsed information and not the final definition.
      
The solution is to use the possible final table layout to
compare if a fast alter is possible or not.
 2008-06-17 11:12:21 -03:00
Magnus Svensson
3d34d34c88 Merge 5.1->5.1-rpl 
Fix paths and name of a few files to make it work with new mtr.pl
 2008-05-30 11:12:07 +02:00
gkodinov/kgeorge@magare.gmz
b98922b7cc Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteam 
into  magare.gmz:/home/kgeorge/mysql/work/B36011-5.1-bugteam
 2008-05-16 19:03:50 +03:00
hhunger@hh-nb.hungers
3b19417649 Merge hh-nb.hungers:/work/merge/mysql-5.1-bugteam 
into  hh-nb.hungers:/work/merge/mysql-5.1-36522
 2008-05-09 13:06:02 +02:00
thek@adventure.(none)
92724ecb3d Bug#35997 Event scheduler seems to let the server crash, if it is embedded. 
Missing file: include/is_embedded.inc

This file was left out of the initial changeset by misstake.
 2008-05-09 10:26:06 +02:00
hhunger@hh-nb.hungers
313e6c7757 Fixes for bug#36522. 2008-05-08 20:13:39 +02:00
aelkin/andrei@mysql1000.dsl.inet.fi
e1d1248d60 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/BARE/mysql-5.1-bugteam
 2008-05-05 13:28:07 +03:00
gkodinov/kgeorge@magare.gmz
3c469aaaa7 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
 2008-05-01 13:25:38 +03:00
aelkin/andrei@mysql1000.dsl.inet.fi
9afdba04d6 Bug #36435 rpl_events uses non-deterministic check 
Select of the test could not perform deterministically, because the table remains to be 
updatable by the running event handler.

Fixed with changing verification to use a logical values instead of comparison 
with a pre-recorded results.
 2008-04-30 21:41:50 +03:00
davi@endora.local
9045798dea Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
 2008-04-30 10:15:32 -03:00
davi@mysql.com/endora.local
a454190f0d Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly". 
Enable back the disabled test case.
 2008-04-29 00:03:19 -03:00
skozlov/ksm@mysql.com/virtop.(none)
9ac996e16e WL#3754, circular replication tests 2008-04-25 20:54:42 +04:00
skozlov/ksm@virtop.(none)
b3a5ca2649 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/mysql/WL3754/commit-mysql-5.1-new-rpl
 2008-04-25 00:47:36 +04:00
skozlov/ksm@mysql.com/virtop.(none)
001d68a2e0 WL#3754, testing circular replication 2008-04-25 00:41:04 +04:00
msvensson@pilot.mysql.com
c6aca99321 Allow 2002 as a valid error for connect fails. It's common on windows where 
we don't use Unix domin sockets for connection to server
 2008-04-24 14:16:32 +02:00
msvensson@pilot.mysql.com
0c3165feb3 Add warning supressions for bug#31590 and bug#26402 that gort lost when 
moving the supressions from perl to SQL
 2008-04-24 13:26:28 +02:00
msvensson@pilot.mysql.com
206e1dc63e Rename "shutdown" -> "send_shutdown" and "kill_server" to "shutdown_server" 
Fix warnings
 2008-04-21 17:39:13 +02:00
msvensson@pilot.mysql.com
2ba565cde7 Add "kill_server", call shutdown on current conneciton and then make sure 
the server dissapears
Check return code of 'mysql_ping'
Add "shutdown", call 'mysql_shutdown' on the current connection
 2008-04-21 14:16:54 +02:00
skozlov/ksm@mysql.com/virtop.(none)
9198608e8a Fix for main.events_restart 2008-04-20 22:24:00 +04:00
hhunger@hh-nb.hungers
f6aa788f26 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-15 15:56:11 +02:00
hhunger@hh-nb.hungers
679b907964 Third set of fixes for bug#35988. 2008-04-15 15:44:11 +02:00
msvensson@pilot.mysql.com
596aca33f5 Set mysqladmin shutdown timeout to 60 seconds 2008-04-14 14:25:57 +02:00
hhunger@hh-nb.hungers
88451eacfd Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-10 18:32:37 +02:00
hhunger@hh-nb.hungers
afd90d6166 System variable tests delivered by Folio3 (see WL4288). 2008-04-10 15:14:28 +02:00
msvensson@pilot.mysql.com
0ceb3244e5 Improve readability of check testcase data and add order by 2008-04-09 22:06:02 +02:00
msvensson@shellback.(none)
f4661f34a6 Fix return code from check-warnings to indicate if test failed or not. 
No more string matching
 2008-04-09 14:38:42 +02:00
msvensson@shellback.(none)
d348362d24 Turn on --check-testcase by default 
Don't log check_warnings to binlog
 2008-04-09 12:27:39 +02:00
msvensson@shellback.(none)
98ab99f9ec Merge pilot:mysql/mysql-5.1-rpl 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-rpl
 2008-04-09 09:55:30 +02:00
msvensson@shellback.(none)
3253a936da Update comment to reflect reality 2008-04-09 09:44:08 +02:00
msvensson@shellback.(none)
7fcbf9f21e Mereg events_restart_phase* to events_restart 2008-04-09 09:43:20 +02:00
msvensson@pilot.mysql.com
456b16d834 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr-warnings2 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-04-08 16:52:15 +02:00
msvensson@pilot.mysql.com
433c1c3d7b Check warnings in servers error log as part of test case 2008-04-08 16:51:26 +02:00
msvensson@pilot.mysql.com
17a5ef3984 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
 2008-04-03 21:51:26 +02:00
msvensson@pilot.mysql.com
a011d27cf9 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
 2008-04-03 11:50:43 +02:00
skozlov/ksm@virtop.(none)
8f95b8d230 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/mysql/bugs/commit-mysql-5.1-new-rpl-bug30128
 2008-04-03 13:08:03 +04:00
skozlov/ksm@mysql.com/virtop.(none)
fd8d82aed7 Bug#30128, The reason that sometimes events were executed because without STARTS clause server fires immediately after creating event and 
time between create and delete event sometimes is enough for firing. So adding STARTS clause moves first execution in future after drop of event.
 2008-04-02 19:41:49 +04:00
mats@mats-laptop.(none)
984ea1a3cb Fixes to eliminate some race conditions in tests. 2008-04-01 14:40:23 +02:00
gkodinov/kgeorge@magare.gmz
69b7c5fee9 Merge bk-internal:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/work/merge-build-5.1-bugteam
 2008-03-31 12:38:01 +03:00
mats@mats-laptop.(none)
540247f3e9 Updating commit.inc since the number of commits done for non-transactional 
tables is not zero any more. For row-based logging, there is an extra commit
for sending rows changed by the statement to the binary log.
 2008-03-31 11:29:03 +02:00
mkindahl@dl145h.mysql.com
a7fe4abc55 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
 2008-03-31 09:57:29 +02:00
aelkin/andrei@mysql1000.(none)
22536fc53e Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl
 2008-03-29 14:19:53 +02:00
istruewing@stella.local
1ce57e889d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 17:36:12 +01:00
hezx@mail.hezx.com
905659a2a0 Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.1-new-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.1
 2008-03-26 21:40:44 +08:00
hezx@mail.hezx.com
d0ebb657ee Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rpl 
into  mail.hezx.com:/media/sda3/work/mysql/bkwork/b33029_5.0_to_5.1_fails_on_dup_key/5.0
 2008-03-26 21:37:34 +08:00
istruewing@stella.local
44fbe74e1e Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2008-03-26 10:27:00 +01:00
istruewing@stella.local
fde9b55d61 Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2008-03-26 09:33:55 +01:00
msvensson@pilot.mysql.com
201ce48d5d After merge fixes 2008-03-26 07:22:42 +01:00
msvensson@pilot.mysql.com
bc4874b79c Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
 2008-03-25 18:40:49 +01:00