database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-31 15:50:51 +03:00
Code Activity
71,796 Commits 3,251 Branches 1,092 Tags
d18f67bbab25cb15b0ca2b91693a7e134ac0cbb4
Commit Graph

299 Commits

Author SHA1 Message Date
Bjorn Munch
f10dec68ee upmerge 43588 2010-03-18 22:29:53 +01:00
Bjorn Munch
2fb8854aa0 Bug #43588 mysqltest command disable_abort_on_error logs connect commands 
Only log connects after --error
A few small test adjustments needed/possible
 2010-03-17 15:25:55 +01:00
Alexey Kopytov
4db97ede5b Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqlbinlog.cc
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/subselect.result
Text conflict in mysql-test/r/subselect3.result
Text conflict in mysql-test/r/type_datetime.result
Text conflict in sql/share/Makefile.am
 2010-03-12 12:51:53 +03:00
Davi Arnaut
096cb4c6de Bug#37316: Anonymous error messages noticed sometimes, while running tests in MTR 
The problem was that mysqltest could attempt to execute a
SHOW WARNINGS statement through a connection that was not
properly reaped, thus violating its own rules.

The solution is to skip SHOW WARNINGS if a connection has
not been properly repeaed.
 2010-03-08 11:30:20 -03:00
Bjorn Munch
40ac936df2 merge from trunk 2010-03-08 12:05:57 +01:00
Bjorn Munch
87ddc0186b merge from trunk 2010-03-04 12:18:53 +01:00
Bjorn Munch
7c468d5bfb merge from 5.1 2010-03-04 12:10:36 +01:00
Bjorn Munch
aa29549050 upmerge 51590 2010-03-03 11:19:06 +01:00
Bjorn Munch
3facbf180b Bug #51590 mysqltest: --disable_abort_on_error does not work inside while/if 
abort_on_error flag for stmt was set at initial parse
(Re)-set flag before execution instead, also added to test
 2010-03-02 12:39:32 +01:00
Alexander Nozdrin
04b8cb1882 Manual merge from mysql-trunk-merge. 
Conflicts:
  - client/mysql.cc
  - client/mysqldump.c
  - configure.in
  - mysql-test/r/csv.result
  - mysql-test/r/func_time.result
  - mysql-test/r/show_check.result
  - mysql-test/r/sp-error.result
  - mysql-test/r/sp.result
  - mysql-test/r/sp_trans.result
  - mysql-test/r/type_blob.result
  - mysql-test/r/type_timestamp.result
  - mysql-test/r/warnings.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - sql/mysql_priv.h
  - sql/mysqld.cc
  - sql/sp.cc
  - sql/sql_base.cc
  - sql/sql_table.cc
  - sql/sql_trigger.cc
  - sql/sql_view.cc
  - sql/table.h
  - sql/share/errmsg.txt
  - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
 2010-02-24 16:52:27 +03:00
Marc Alff
9d5deb076a Bug#10143 Perror not showing error description 
Backport to 5.5.99
 2010-02-23 17:45:49 -07:00
Alexey Kopytov
92a5dd0323 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
 2010-02-23 16:26:45 +03:00
Bjorn Munch
38e811b839 merge from 5.1-mtr 2010-02-22 14:52:11 +01:00
Vladislav Vaintroub
d6f8da6e8a merge 2010-02-20 11:23:12 +01:00
Bjorn Munch
3687803e11 upmerge 51135 2010-02-18 09:09:08 +01:00
Bjorn Munch
a9af3b51a9 upmerge 51135 2010-02-18 09:02:38 +01:00
Bjorn Munch
4d5c86fb27 Bug #51135 Please increase the maximum number of connections allowed in mysqltest 
Added --max-connections= argument to mysqltest and mtr
Small fix to first patch: forgot to check before free'ing connections array
 2010-02-17 16:28:02 +01:00
Bjorn Munch
a748b2bf21 upmerge 31602,47389,50618 2010-02-11 14:35:54 +01:00
Bjorn Munch
7c34cd2ea2 upmerge 31602,47389,50618 2010-02-11 14:33:21 +01:00
Bjorn Munch
1f97527aaa Bug #50618 Please allow 'sleep $variable' in mtr 
Made mtr's sleep function understand $variables
A few fixes since previous patch, added tests
 2010-02-09 18:13:57 +01:00
Alexey Kopytov
017c969896 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_slow_query_log.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Conflict adding files to server-tools.  Created directory.
Conflict because server-tools is not versioned, but has versioned children.  Versioned directory.
Conflict adding files to server-tools/instance-manager.  Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children.  Versioned directory.
Contents conflict in server-tools/instance-manager/options.cc
Text conflict in sql/mysqld.cc
 2010-02-09 12:59:38 +05:00
Bjorn Munch
ad89fa1bcd Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be documented 
Added remove_files_wildcard that allows to remove multiple files at once.
This is a port of original patch to Windows.
 2010-02-04 13:15:42 +01:00
Bjorn Munch
2cf9aaa886 upmerge 39774 2010-02-04 12:57:45 +01:00
Bjorn Munch
75047c6147 upmerge 39774 2010-02-04 12:53:08 +01:00
Bjorn Munch
7b6e73d247 Bug #39774 mysql-test-run's remove_file can't use wildcards, this should be documented 
Added remove_files_wildcard that allows to remove multiple files at once.
This is a port of original patch to Windows.
 2010-02-04 10:55:17 +01:00
Bjorn Munch
8bce94ae3e upmerge 43005,48888,49837,49878,50471 2010-01-20 16:43:14 +01:00
Vladislav Vaintroub
4a9c5f7988 Correctly cast the result of malloc. 2010-01-20 16:39:28 +01:00
Bjorn Munch
8b046e600a upmerge 43005,48888,49837,49878,50471 2010-01-20 14:37:48 +01:00
Bjorn Munch
acc2b1ba6f merge 49837 2010-01-20 14:23:57 +01:00
Bjorn Munch
21f728d94c merge 48888 2010-01-20 14:22:34 +01:00
Bjorn Munch
37dc5f082a Bug #49878 delimiter under false 'if' makes mysqltest test fail with 'Missing end of block' 
delimiter not executed so does not recognize end of block
Always execute delimiter command, revert after false if() block.
 2010-01-20 14:18:27 +01:00
Bernd Ocklin
bdf5ace1a2 exporting server version and other as env var (bug#50471) 2010-01-20 12:54:55 +01:00
Bjorn Munch
35d0d10ac2 Bug #48888 mysqltest crashes on --replace_result if 'from' is longer than ~1024 symbols 
valgrind pointed to a buffer allocated by my_realloc which looked fishy
Replaced size with what was probably intended, added test case.
Now also fixed line after review comment
 2010-01-20 12:52:35 +01:00
Bjorn Munch
128216d35b Bug #49837 mysqltest exec cannot handle multi-line command correctly 
Since the exec command line is passed on externally, it cannot take newlines
Simply replace \n with space
Now also added test case
 2010-01-20 12:51:18 +01:00
Vladislav Vaintroub
83bb5da586 Fix compatibility problem with older HPUX 2010-01-19 20:44:01 +01:00
Vladislav Vaintroub
df4b65b533 Fix various compiler/OS compatibility errors 2010-01-19 16:31:21 +01:00
Bjorn Munch
da1aab425b merge from next-mr 2010-01-19 13:35:23 +01:00
Vladislav Vaintroub
17dd1b248a merge 2010-01-13 21:14:42 +01:00
Alexander Nozdrin
ba3b5a7eb6 Backporting revision from mysql-6.0-codebase-bugfixing. 
Original revision:
------------------------------------------------------------
revno: 3817
revision-id: guilhem@mysql.com-20100108092756-k0zzf4kvx9b7bh38
parent: guilhem@mysql.com-20100107101133-hrrgcdqg508runuf
committer: Guilhem Bichot <guilhem@mysql.com>
branch nick: mysql-6.0-codebase-bugfixing
timestamp: Fri 2010-01-08 10:27:56 +0100
message:
  fix for BUG#50120 "Valgrind errors in any test, inside mysqltest"
  Problem was that as v->name[v->name_len] may be uninitialized (which is ok per se),
  it shouldn't be used in an if(). We remove this zero_the_char/restore_it logic by
  rather zero-terminating the v->name string when we create it in var_init().
------------------------------------------------------------
 2010-01-11 19:43:55 +03:00
Alexander Nozdrin
c06a305001 Backporting revision from mysql-6.0-codebase-bugfixing. 
Original revision:

------------------------------------------------------------
revno: 3789.1.9
revision-id: serg@mysql.com-20091229134448-phe834ukzmi0k2e3
parent: serg@mysql.com-20091227081418-bgfg952gzumn1k3h
committer: Sergei Golubchik <serg@mysql.com>
branch nick: 6.0-codebase
timestamp: Tue 2009-12-29 14:44:48 +0100
message:
  better fix for Bug#48758 mysqltest crashes on sys_vars.collation_server_basic in gcov builds
  
  use setenv instead of putenv
------------------------------------------------------------
 2010-01-11 19:42:35 +03:00
Bjorn Munch
6ead8efbe6 upmerge 49269 amendment 2010-01-07 11:28:35 +01:00
Bjorn Munch
4eb3d76533 upmerge 49269 amendment 2010-01-07 11:27:00 +01:00
Bjorn Munch
9ab9c73a87 Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' 
Undid amendment allowing pending reap after switching connections
Moved check for pending reap earlier; failed if running with ps-protocol
 2010-01-07 11:22:45 +01:00
Bjorn Munch
ee54d62d7a upmerge 49269 amendment 2010-01-06 13:01:16 +01:00
Bjorn Munch
8495313452 upmerge 49269 amendment 2010-01-06 12:59:41 +01:00
Bjorn Munch
570ee4c5e8 Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' 
Small amendment: ignore pending reap when switching connection, add test
 2010-01-06 12:56:22 +01:00
Bjorn Munch
e9313022c2 merge 48863,49269,49345,49672,49761 2010-01-06 10:01:11 +01:00
Bjorn Munch
afdaf6d9df merge 48863,49269,49345,49672,49761 2010-01-06 09:57:44 +01:00
Bjorn Munch
583f77011b Bug #49269 mysqltest crashes on 'reap' if query executed after 'send' 
Set a flag after send to trap the case
 2010-01-06 09:45:28 +01:00
Bjorn Munch
2ec01d90d8 Bug #48863 mysql test: enable and disable case insensitive compare mode 
Implemented --lowercase_result which lower cases next result
 2010-01-06 09:42:21 +01:00