Bjorn Munch
87ddc0186b
merge from trunk
2010-03-04 12:18:53 +01:00
Bjorn Munch
15d7161a03
merge from 5.1
2010-03-04 12:10:36 +01:00
Bjorn Munch
7c468d5bfb
merge from 5.1
2010-03-04 12:10:36 +01:00
Bjorn Munch
ae676e85e6
upmerge 51590
2010-03-03 11:19:06 +01:00
Bjorn Munch
aa29549050
upmerge 51590
2010-03-03 11:19:06 +01:00
Bjorn Munch
4760adbf3f
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
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
b3018e8613
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
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
c7fa0c1b34
Bug#10143 Perror not showing error description
...
Backport to 5.5.99
2010-02-23 17:45:49 -07: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
f0d2fe34f2
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
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
ac0d9be196
merge from 5.1-mtr
2010-02-22 14:52:11 +01:00
Bjorn Munch
38e811b839
merge from 5.1-mtr
2010-02-22 14:52:11 +01:00
Vladislav Vaintroub
0fd18913d9
merge
2010-02-20 11:23:12 +01:00
Vladislav Vaintroub
d6f8da6e8a
merge
2010-02-20 11:23:12 +01:00
Sergei Golubchik
eb30bb8579
bugfix: change_user should only take the password
...
of the previous user if it takes the username too.
otherwise it can never change to a passwordless account
2010-02-19 09:08:05 +01:00
Bjorn Munch
b64d50ae83
upmerge 51135
2010-02-18 09:09:08 +01:00
Bjorn Munch
3687803e11
upmerge 51135
2010-02-18 09:09:08 +01:00
Bjorn Munch
65d6444999
upmerge 51135
2010-02-18 09:02:38 +01:00
Bjorn Munch
a9af3b51a9
upmerge 51135
2010-02-18 09:02:38 +01:00
Bjorn Munch
90c3ace052
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
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
67baad9b4c
upmerge 31602,47389,50618
2010-02-11 14:35:54 +01:00
Bjorn Munch
a748b2bf21
upmerge 31602,47389,50618
2010-02-11 14:35:54 +01:00
Bjorn Munch
e6c93a4ef1
upmerge 31602,47389,50618
2010-02-11 14:33:21 +01:00
Bjorn Munch
7c34cd2ea2
upmerge 31602,47389,50618
2010-02-11 14:33:21 +01:00
Bjorn Munch
0ad9a5992d
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
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
0888e40fa3
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
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
01c0d46af8
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
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
bf5bb2942f
upmerge 39774
2010-02-04 12:57:45 +01:00
Bjorn Munch
2cf9aaa886
upmerge 39774
2010-02-04 12:57:45 +01:00
Bjorn Munch
8bcb4cc74d
upmerge 39774
2010-02-04 12:53:08 +01:00
Bjorn Munch
75047c6147
upmerge 39774
2010-02-04 12:53:08 +01:00
Bjorn Munch
25a4b33340
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
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
Michael Widenius
a041747567
Fixed compiler warnings & failing test cases
...
When compiling with debug, don't clear buffer in 'net_clear()'
- This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap
client/mysqltest.cc:
Fixed compiler warning
mysql-test/t/partition_innodb_semi_consistent.test:
Added missing --reap (fixes random failure)
sql/net_serv.cc:
When compiling with debug, don't clear buffer in 'net_clear()'
- This allows us to easier find bugs in the protocol and also get repeatable test failures in test cases where someone forgot to do --reap
storage/myisam/ft_boolean_search.c:
Fixed compiler warnings
storage/myisam/ft_parser.c:
Fixed compiler warnings
storage/myisam/ft_stopwords.c:
Fixed compiler warnings
support-files/compiler_warnings.supp:
Added a lot of new suppression of not relevant warnings and warnings in systems we are not in charge of
unittest/mysys/waiting_threads-t.c:
Fixed compiler warnings
2010-01-28 16:49:14 +02:00
Bjorn Munch
a1b7959a22
upmerge 43005,48888,49837,49878,50471
2010-01-20 16:43:14 +01:00
Bjorn Munch
8bce94ae3e
upmerge 43005,48888,49837,49878,50471
2010-01-20 16:43:14 +01:00
Vladislav Vaintroub
411788d5de
Correctly cast the result of malloc.
2010-01-20 16:39:28 +01:00
Vladislav Vaintroub
4a9c5f7988
Correctly cast the result of malloc.
2010-01-20 16:39:28 +01:00
Bjorn Munch
33fde0c025
upmerge 43005,48888,49837,49878,50471
2010-01-20 14:37:48 +01:00
Bjorn Munch
8b046e600a
upmerge 43005,48888,49837,49878,50471
2010-01-20 14:37:48 +01:00
Bjorn Munch
84616df3ff
merge 49837
2010-01-20 14:23:57 +01:00
Bjorn Munch
acc2b1ba6f
merge 49837
2010-01-20 14:23:57 +01:00
Bjorn Munch
87ff57cb7e
merge 48888
2010-01-20 14:22:34 +01:00
