- As the slaves are restarted for each testcase, take the opportunity to restore their databases to a known state with the help of the snapshot(s)
- Count max number of slaves used in testcases
- Use copy_install_db to speed up "Installing db" phase
mysql-test/mysql-test-run.pl:
Count max number of slaves used for a test run and use that when installing slave databases etc.
Use "copy_install_db" for all but the first db to install
After having stopped the slave database, restore it's database files from the snapshot.
A better fix for bug#10025.
Fixed test case plus added new tests.
After fixing Bug#20208 "Blobs greater than 8K are being truncated to 8K"
the fix to bug#10025 "Misleading error with COLLATE mediumtext and UNION"
became more accurate. Earlier mediumtext got converted to longtext,
although mediumtext was enough to contain the results. Now it converts
correctly to mediumtext, if the length does not exceed that and if none
of the original fields were type longtext.
Type longtext still converts correctly to type longtext, as the extra
tests prove.
mysql-test/r/union.result:
Fixed an earlier test case plus added two new tests.
mysql-test/t/union.test:
Fixed an earlier test case plus added two new tests.
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition.result:
Auto merged
mysql-test/r/partition_range.result:
Auto merged
mysql-test/t/partition_range.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/partition.test:
manual merge
sql/item.h:
manual merge
sql/item_cmpfunc.h:
manual merge
mysql-test/r/func_misc.result:
Added test for Bug #21466: INET_ATON() returns signed int, not unsigned
mysql-test/t/func_misc.test:
Added test for Bug #21466: INET_ATON() returns signed int, not unsigned
sql/item_func.h:
Added unsigned_flag=1 value to Item_func_inet_aton.
This fixes bug #21466: INET_ATON() returns signed int, not unsigned
"CHECK fails to identify some corruption"
change to allow it to detect more errors in data format
mysql-test/r/csv.result:
Test for bug
mysql-test/t/csv.test:
Test for bug
when set to DISABLED
It was a silly ordering number error.
sql/events.h:
fix ordinal number, the cause for bug #22662
Inconsistent values displayed for event_scheduler when set to DISABLED
mysql-test/r/events_restart_phase0.result:
New BitKeeper file ``mysql-test/r/events_restart_phase0.result''
mysql-test/t/events_restart_phase0.log:
New BitKeeper file ``mysql-test/t/events_restart_phase0.log''
mysql-test/t/events_restart_phase0.result:
New BitKeeper file ``mysql-test/t/events_restart_phase0.result''
ALTER EVENT in stored procedure body led to a crash during the
procedure call. Affected was only ALTER EVENT which changed the
interval of the event. No problems with AT, STARTS, ENDS and so on.
mysql-test/r/events_bugs.result:
fix result
mysql-test/t/events_bugs.test:
add test case for bug 22397 : Events, crash with procedure which alters body
sql/event_data_objects.cc:
fix copy&paste error in code, which resulted in bug#22397
Events: crash with procedure which alters body
- Add test case which runs the same tests as ssl.test but with a different DES encrypted key
mysql-test/std_data/server-key-des.pem:
BitKeeper file /home/msvensson/mysql/bug21868/my50-bug21868/mysql-test/std_data/server-key-des.pem
mysql-test/std_data/server-cert-des.pem:
BitKeeper file /home/msvensson/mysql/bug21868/my50-bug21868/mysql-test/std_data/server-cert-des.pem
mysql-test/r/ssl_des.result:
New BitKeeper file ``mysql-test/r/ssl_des.result''
mysql-test/t/ssl_des-master.opt:
New BitKeeper file ``mysql-test/t/ssl_des-master.opt''
mysql-test/t/ssl_des.test:
New BitKeeper file ``mysql-test/t/ssl_des.test''
Presence of a subquery in the ON expression of a join
should not block merging the view that contains this join.
Before this patch the such views were converted into
into temporary table views.
mysql-test/r/view.result:
Added a test case for bug #21646.
mysql-test/t/view.test:
Added a test case for bug #21646.
sql/mysql_priv.h:
Fixed bug #21646.
Added a new parsing state 'IN_ON', true when
the parser is in an ON expression of a join.
sql/sql_lex.cc:
Fixed bug #21646.
Presence of a subquery in the ON expression of a join
should not block merging the view that contains this join.
sql/sql_yacc.yy:
Fixed bug #21646.
Added a new parsing state 'IN_ON', true when
the parser is in an ON expression of a join.
an ALL/ANY quantified subquery in HAVING.
The Item::split_sum_func2 method should not create Item_ref
for objects of any class derived from Item_subselect.
mysql-test/r/subselect.result:
Added a test case for bug #21853.
mysql-test/t/subselect.test:
Added a test case for bug #21853.
into production.mysql.com:/usersnfs/jamppa/mysql-5.1-bug-20208
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/Makefile.am:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
ChangeSet@1.2309.1.12, 2006-09-12 15:42:13+02:00, guilhem@gbichot3.local +14 -0
Fixing problems I identified in my auto_increment work pushed in July
(as part of the auto_increment cleanup of WL #3146; ...
The problem is in that show binlog events in indeterministic, row events can be compressed,
so that 2 seconds original delay does not guard from inconsistency.
We syncronize test's current inserted rows counter with system insert delayed thread
per each query.
From another side there is no requirement for binlog to be event per row and then
to verify if binlog has recorded what was recently inserted is better
via reading from it instead of 'show binlog events'.
mysql-test/extra/binlog_tests/binlog_insert_delayed.test:
removing sleeps, syncronizing with system delayed thread per each statement,
note that an insert statement is performed atomically including writing to binlog,
so that concurrent selects are waiting. That's why the wait macro is safe.
mysql-test/r/binlog_row_binlog.result:
new result
mysql-test/include/wait_until_rows_count.inc:
macro implements waiting until a targeted table has a prescribed rows number.
into mysql.com:/users/lthalmann/bkroot/mysql-5.1
client/mysqldump.c:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
mysql-test/t/ndb_multi.test:
Manual merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/t/disabled.def:
Auto merged
sql/CMakeLists.txt:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
mysql-test/t/disabled.def:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/ha_ndbcluster_binlog.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/lib/mtr_cases.pl:
immediately skip tests that need innodb if mysqld does not support it
mysql-test/mysql-test-run.pl:
Check if innodb is supported
