mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
0eda48463c
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/r/show_check.result
Text conflict in mysql-test/r/sp-code.result
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/t/show_check.test
Text conflict in mysys/my_delete.c
Text conflict in sql/item.h
Text conflict in sql/item_cmpfunc.h
Text conflict in sql/log.cc
Text conflict in sql/mysqld.cc
Text conflict in sql/repl_failsafe.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_parse.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_yacc.yy
Text conflict in storage/myisam/ha_myisam.cc
Corrected results for
stm_auto_increment_bug33029.reject 2009-12-01
20:01:49.000000000 +0300
<andrei> @@ -42,9 +42,6 @@
<andrei> RETURN i;
<andrei> END//
<andrei> CALL p1();
<andrei> -Warnings:
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
<andrei> -Note 1592 Statement may not be safe to log in statement
format.
There should be indeed no Note present because there is in fact autoincrement
top-level query in sp() that triggers inserting in yet another auto-inc table.
(todo: alert DaoGang to improve the test).
|
||
|---|---|---|
| .. | ||
| default.daily | ||
| default.experimental | ||
| default.push | ||
| default.weekly | ||
| mysql-next-mr.push | ||
| mysql-trunk.push | ||
| README | ||
| README.experimental | ||
This directory contains collections of test runs that we run during our integration and release testing. Each file contains zero or more lines, with one invocation of mysql-test-run.pl on each. These invocations are written so that, with the assumption that perl is in your search path, any collection can run as a shell script or a batch file, with the parent mysql-test directory being the current working directory. During integration testing, we choose the collection to run by following these steps: 1) We choose the extension to look for, based on these rules: - If we're running a per-push test, we choose ".push" as the extension. - If we're running a daily test, we choose ".daily" as the extension. - If we're running a weekly test, we choose ".weekly" as the extension. 2) If there is a collection that has the same name as the branch we're testing plus the extension as determined in step 1, we choose that collection. 3) If the branch is unknown or we have removed all characters from it and still not found a matching collection, we choose the name "default" plus the extension determined in step 1. If there is no such file, we give up and don't test anything at all. 4) If we haven't found a collection yet, we remove the last character from the branch name and go back to step 2. 5) The commands from the collection are run line by line via execv() or similar system calls. They are not run as a shell script. Shell expansions are not guaranteed to work and most likely won't.