Marc Alff
9d5deb076a
Bug#10143 Perror not showing error description
...
Backport to 5.5.99
2010-02-23 17:45:49 -07:00
Alexander Nozdrin
ff68d48279
Manual merge from mysql-next-mr.
...
Conflicts:
- mysql-test/r/mysqld--help-notwin.result
- mysql-test/r/mysqld--help-win.result
2010-02-22 16:22:31 +03:00
Vladislav Vaintroub
d6f8da6e8a
merge
2010-02-20 11:23:12 +01:00
Alexander Nozdrin
77c6baf612
Auto-merge from mysql-next-mr.
2010-02-20 12:40:21 +03: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
Magne Mahre
efaf2ee253
WL#5182 Remove more deprecated 4.1/5.0 features
...
WL#5154 was a task for formally deprecating and removing items that
were mentioned in the manual as having been deprecated since MySQL
4.1 or 5.0, but that had never been removed.
Since WL#5154 was created, examination of mysqld.cc, mysql.cc, and
mysqldump.c reveals additional deprecations not mentioned in the
manual. (In some cases, the items are simply not mentioned in the
5.1+ manuals.)
This is a follow-on task to deprecate and remove these additional
items.
The deprecation happened in MySQL 5.1, and the options/variables
are now removed from the code.
2010-02-17 13:15:07 +01:00
Magne Mahre
1f7f620f30
WL#5154 Remove deprecated 4.1 features
...
A set of program options and variables was deprecated in
MySQL 5.1, and is hereby removed.
2010-02-17 10:18:17 +01:00
Vladislav Vaintroub
d4b10d1fd5
merge
2010-02-16 23:19:47 +01:00
Bjorn Munch
e2a5e14c78
new merge from next-mr
2010-02-16 18:23:21 +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
Bjorn Munch
f21ab81dd5
merge from next-mr
2010-02-07 12:38:18 +01:00
Bjorn Munch
52694b2bb5
merge from mysql-trunk
2010-02-07 12:30:38 +01:00
Bjorn Munch
e814ed95bf
merge from 5.1 main
2010-02-07 12:21:11 +01:00
Vladislav Vaintroub
be65bc9917
merge
2010-02-06 17:13:42 +01:00
Konstantin Osipov
9c030fe508
Merge next-mr -> next-4284.
2010-02-06 13:28:06 +03:00
Konstantin Osipov
ad0f1f8021
Merge next-mr -> next-4284.
2010-02-05 01:08:08 +03: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
Konstantin Osipov
f949e1b80f
Merge next-mr -> next-4284.
2010-02-03 17:10:36 +03:00
Konstantin Osipov
b92ab41c5c
Merge next-mr -> next-4284
2010-02-03 16:43:03 +03:00
Konstantin Osipov
0ce6d93f85
Merge next-mr -> next-4284.
2010-02-03 03:06:42 +03:00
Konstantin Osipov
c2fe19883e
Merge next-mr -> next-4284.
...
Fix Bug#50555 "handler commands crash server in my_hash_first()"
as a post-merge fix (the new handler tests are not passing
otherwise).
- in hash.c, don't call calc_hash if ! my_hash_inited().
- add tests and results for the test case for Bug#50555
2010-02-02 16:58:15 +03:00
Konstantin Osipov
3147bdd0ac
Merge next-mr -> next-4284.
2010-02-02 12:22:17 +03:00
Konstantin Osipov
2c6015e8dc
Merge next-mr -> next-4284.
2010-02-02 02:22:16 +03:00
Alexander Nozdrin
ddc8765a9e
Manual merge from mysql-trunk-merge.
...
Conflicts:
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- sql/sql_parse.cc
- sql/sql_table.cc
- sql/sql_test.cc
2010-01-31 01:06:50 +03:00
Alexander Nozdrin
85c54dddc7
Manual merge from mysql-5.1-bugteam.
...
Conflicts:
- mysql-test/collections/default.experimental
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
2010-01-30 22:13:36 +03:00
Staale Smedseng
7d5bb84a9a
Bug #49223 Change help description for mysqldump
...
--extended-insert
Help message changed to the same as in the 5.1 online
documentation.
2010-01-27 16:13:39 +01:00
Magne Mahre
e17fe14c81
WL#5182 Remove more deprecated 4.1/5.0 features
...
WL#5182 is a follow-up to WL#5154, deprecating a few more options
and system variables.
2010-01-27 13:23:28 +01:00
Alexey Kopytov
7b5f5d5c37
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
2010-01-24 00:09:23 +03:00
Magne Mahre
0482b6ebca
WL#5154 Remove deprecated 4.1 features
...
Several items said to be deprecated in the 4.1 manual
have never been removed. This worklog adds deprecation
warnings when these items are used, and warns the user
that the items will be removed in MySQL 5.6.
A couple of previously deprecation decision have been
reversed (see single file comments)
2010-01-21 09:10:05 +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
Alexander Nozdrin
eacc937d48
Manual merge from mysql-trunk-merge.
...
Conflicts:
- configure.in
- include/m_string.h
- mysql-test/extra/rpl_tests/rpl_row_func003.test
- mysql-test/r/mysqlbinlog.result
- mysql-test/r/union.result
- mysql-test/suite/binlog/r/binlog_killed_simulate.result
- mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
- mysql-test/suite/binlog/r/binlog_unsafe.result
- mysql-test/suite/binlog/t/binlog_unsafe.test
- mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
- mysql-test/suite/rpl/r/rpl_loaddata_map.result
- mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result
- mysql-test/suite/rpl/r/rpl_stm_log.result
- mysql-test/suite/rpl/t/rpl_optimize.test
- mysql-test/t/mysqlbinlog.test
- mysql-test/t/union.test
- sql/rpl_utility.h
- sql/sql_union.cc
- strings/Makefile.am
2010-01-19 19:36:14 +03: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
b030db38af
merge
2010-01-18 23:00:48 +01:00
