summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-042-13/+13
|\
| * Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-022-13/+13
| |\
| | * MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-282-13/+13
| | |
* | | In test_proxy_header(), use IP address 192.0.2.1 .mariadb-10.3.1Vladislav Vaintroub2017-08-261-2/+2
| | | | | | | | | | | | | | | This address is from reserved range (rfc5737), and this ensures that DNS won't resolve it into a name
* | | mysql_client_test: don't use 192.168.0.1Sergei Golubchik2017-08-261-3/+4
| | | | | | | | | | | | | | | | | | the test expects 192.168.0.1 not to resolve to anything. this is a fragile assumption. use 127.0.0.2 instead (which only marginally better)
* | | fix compile errorsVladislav Vaintroub2017-08-231-1/+1
| | |
* | | MDEV-11159 Server proxy protocol supportVladislav Vaintroub2017-08-221-0/+181
|/ / | | | | | | | | | | accept proxy protocol header from client connections. The new server variable 'proxy_protocol_networks' contains list of networks from which proxy header is accepted.
* | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-06-271-0/+35
|\ \ | |/
| * MDEV-12579: Incorrect arguments to mysqld_stmt_execute when using LOBsOleksandr Byelkin2017-06-221-0/+35
| | | | | | | | Parameters can be MYSQL_TYPE_VARCHAR for long data load.
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-0/+1
|\ \ | |/
| * Merge 10.1 into 10.2Marko Mäkelä2017-05-231-0/+1
| |\
| | * Merge 10.0 into 10.1Marko Mäkelä2017-05-231-0/+1
| | |\
| | | * MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-191-0/+1
| | | | | | | | | | | | | | | | | | | | uploaded 10.0, analyzed everything with the Impact=High (and a couple of Medium)
* | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-11/+25
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-11/+25
| |\ \ \ | | |/ / | | | | | | | | | | | | Revert commit db0917f68f, because the fix for MDEV-12696 is coming from 5.5 and 10.1 in this merge.
| | * | Merge branch '10.0' into 10.1Sergei Golubchik2017-05-081-11/+25
| | |\ \ | | | |/
| | | * Fixed some bugs in fork_big.pl which caused some tests to die earlyMonty2017-05-051-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed to 'strict' - Fixed scope of variables - Made timing smaller for of repair, check, flush and alter to get them to trigger earlier
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-03-311-2/+48
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-2/+48
| |\ \ \ | | |/ /
| | * | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-2/+48
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().
| | | * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-2/+48
| | | |\
| | | | * MDEV-11933 Wrong usage of linked list in mysql_prune_stmt_listSergei Golubchik2017-02-271-2/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_prune_stmt_list() was walking the list following element->next pointers, but inside the loop it was invoking list_add(element) that modified element->next. So, mysql_prune_stmt_list() failed to visit and reset all elements, and some of them were left with pointers to invalid MYSQL.
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-03-181-0/+28
|\ \ \ \ \ | |/ / / /
| * | | | fix test for windows 64Oleksandr Byelkin2017-03-101-5/+13
| | | | |
| * | | | MDEV-11966: Impossible to execute prepared ANALYZE SELECTOleksandr Byelkin2017-03-091-0/+20
| | | | | | | | | | | | | | | | | | | | Prepare os ANALYZE now respond as EXPLAIN.
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2016-12-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+1
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11082 mysql_client_test: test_ps_query_cache fails with ↵Elena Stepanova2016-10-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group-concat-max-len=1M test_bug14169 was setting session group_concat_max_len=1024 and did not clean it up. Because of that test_ps_query_cache, when run with group-concat-max-len != 1024, had different values in connections, and was inserting into query cache when a hit was expected. Fixed by adding a clean-up for the value in test_bug14169
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-09-281-1/+1
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-271-1/+1
| | | |\ \ | | | | |/
| | | | * Fix free() after my_malloc() (should be my_free()).Kristian Nielsen2016-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
* | | | | MDEV-11672 mysql_list_field() returns wrong default values for VIEWAlexander Barkov2016-12-291-0/+71
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem happened because Item_ident_for_show::field_type() always returned MYSQL_TYPE_DOUBLE and ignored the actual data type of the referenced Field. As a result, the execution always used Item_ident_for_show::val_real() to send the default value of the field, so most default values for non-numeric types were displayed as '0'. This patch: 1. Cleanup: a. Removes Send_field::charsetnr, as it's been unused since introduction of Item::charset_for_protocol() in MySQL-5.5. b. Adds the "const" qualifier to Field::char_length(). This is needed for (5.a), see below. 2. Introduces a new virtual method Type_handler::charset_for_protocol(), returning item->collation.collation for string data types, or &my_charset_bin for non-string data types. 3. Changes Item::charset_for_protocol() from virtual to non-virtual. It now calls type_handler()->charset_for_protocol(). As a good side effect, duplicate code in Item::charset_for_protocol() and Item_temporal_hybrid_func::charset_for_protocol() is now gone. 4. Fixes Item_ident_for_show::field_type() to correctly return its data type according to the data type of the referenced field. This actually fixes the problem reported in MDEV-11672. Now the default value is sent using a correct method, e.g. val_str() for VARCHAR/TEXT, or val_int() for INT/BIGINT. This required additional changes: a. in DBUG_ASSERT in Protocol::store(const char *,size_t,CHARSET_INFO), This method is now used by mysqld_list_fields(), which (unlike normal SELECT queries) does not set field_types/field_pos/field_count. b. Item_ident_for_show::Item_ident_for_show() now set standard attributes (collation, decimals, max_length, unsigned_flag) according to the referenced field, to make charset_for_protocol() return the correct value and to make mysqld_list_fields() correctly send default values. 5. In order to share the code between Item_field::set_field() and Item_ident_for_show::Item_ident_for_show(): a. Introduces a new method Type_std_attributes::set(const Field*) b. To make (a) possible, moves Item::fix_char_length() from Item to Type_std_attributes, also moves char_to_byte_length_safe() from item.h to sql_type.h c. Additionally, moves Item::fix_length_and_charset() and Item::max_char_length() from Item to Type_std_attributes. This is not directly needed for the fix and is done just for symmetry with fix_char_length(), as these three methods are directly related to each other.
* | | | MDEV-11082: Fix mysql_client_test.c (by Elena)Nirbhay Choubey2016-12-191-0/+3
| | | |
* | | | store/show vcols as item->print()Sergei Golubchik2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise we'd need to store sql_mode *per vcol* (consider CREATE INDEX...) and how SHOW CREATE TABLE would support that? Additionally, get rid of vcol::expr_str, just to make sure the string is always generated and never leaked in the original form.
* | | | MDEV-7145: Delayed replicationKristian Nielsen2016-10-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge feature into 10.2 from feature branch. Delayed replication adds an option CHANGE MASTER TO master_delay=<seconds> Replication will then delay applying events with that many seconds. This creates a replication slave that reflects the state of the master some time in the past. Feature is ported from MySQL source tree. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
| * | | | MDEV-7145: Delayed replication, fixing test failures.Kristian Nielsen2016-10-141-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Two merge error fixed, and testsuite updated to removed some other test failues. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
* | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-211-1/+2
|\ \ \ \
| * \ \ \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-1/+2
| | |\ \ \ | | | |/ /
| | | * | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | fix for async operations
| | | * | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-151-4/+5
| | | | | | | | | | | | | | | | | | | | Fix tests which possibly fail connects in non_blocking mode.
* | | | | After-review changesSergei Golubchik2016-09-122-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove redundant code * fix tests * move declarations and defines where they belong
* | | | | Add C/C as a submodule in libmariadb/Sergei Golubchik2016-09-121-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also * fix includes * rename cmake macros and targets to avoid name clashes
* | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-254-34/+55
|/ / / /
* | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-194-55/+34
| | | | | | | | | | | | | | | | This reverts commit 7b89b9f5108c80f4f270da922d7e6c182a663719.
* | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-194-34/+55
| | | |
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-7/+9
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-7/+9
| |\ \ \ | | |/ /
| | * | tests -DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ciSergei Golubchik2016-04-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: MDEV-7693 MariaDB - mysql-test - SUITE:funcs_1 - funcs_1.is_tables_mysql is failing on TABLE_COLLATION /DATABASE_COLLATION MDEV-8487 mysql-test - main.information_schema 'xtradb' fails MDEV-8486 mysql-test - main.bootstrap fails
* | | | Cleanups:Monty2016-04-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed some QQ markers - Removed some rows not compatible with valgrind 3.9.0 - Made mysql_install_db.sh more silent by default. --verbose now gives more information - Added assert that auto-increment doesn't generate 0 (safety) - Removed thd->set_time() in some places as it's set in init_for_queries() - Fixed some --big tests in tokudb - Fixed a bug in mysql_client_test.cc where sql_mode was not properly reset
View Lorry Controller Status