Mikael Ronstrom
e4549b4d99
Added test case for UTF8 strings in partition constants
2009-11-02 11:03:40 +01:00
Mikael Ronstrom
889e0a519f
Fixed a test error
2009-10-31 10:54:28 +01:00
Mikael Ronstrom
8ec940646d
Fixed a test error
2009-10-31 10:48:18 +01:00
Mikael Ronstrom
9498a53953
Fixed such that we fail if using integer constants for character set fields, now need to have correct constant types
2009-10-30 21:44:41 +01:00
Mikael Ronstrom
c897c59ceb
Fixed so that character set constants are encoded as hex strings in frm file, but as utf8 strings in the same manner as default values in show create table and information schema tables
2009-10-30 21:08:34 +01:00
Mikael Ronstrom
66b37d318b
Ensuring character set constants are safe, first step fix
2009-10-30 17:34:11 +01:00
Mikael Ronstrom
40496deb70
Changed COLUMN_LIST to COLUMNS after arch review
2009-10-29 18:04:23 +01:00
Mikael Ronstrom
8e31ec1deb
Fixed code review change to ensure that VALUES constants are of the same result type as the field they are constants for
2009-10-28 19:20:32 +01:00
Mikael Ronstrom
d9e05040f4
Merged WL#3352 into mysql-next-mr
2009-10-28 18:22:36 +01:00
Mikael Ronstrom
b572e51c30
BUG#48165, needed to introduce length restrictions on partitioning fields to ensure that no stack overruns occur
2009-10-28 01:11:17 +01:00
Mikael Ronstrom
59cc518990
Fixed sql_mode issue in BUG#48164, will ignore sql_mode when generating constants, also warnings will not be tolerated
2009-10-28 00:06:11 +01:00
Alexander Nozdrin
273a0a4f97
Automerge from mysql-next-mr.
2009-10-27 12:57:44 +03:00
He Zhenxing
c841979de4
disable rpl_spec_variables due to it fails constantly on HPUX
2009-10-27 16:42:50 +08:00
Alexander Barkov
02fff878cc
A postfix for WL#1349
...
Fixing locale name: en_US.UTF-8 -> en_US.utf8
2009-10-27 08:38:32 +04:00
Alexander Barkov
7a22056abb
A postfix for WL#1349: Fixing test failire problems on HP-UX
2009-10-26 16:29:41 +04:00
Luis Soares
78172f9e21
automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge.
2009-10-25 22:58:52 +00:00
Luis Soares
ec9aa90ad9
post-push fixes
...
Disabled rpl_cross_version (instead of setting it experimental).
Fixed outstanding warning fix in main.debug_sync.
2009-10-23 17:07:45 +01:00
He Zhenxing
42743de67d
Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1
2009-10-23 21:34:07 +08:00
He Zhenxing
f09129c6be
Skip semisync test if the plugin-dir is not set to semisync plugin dir
2009-10-23 21:26:17 +08:00
Luis Soares
9ef305232f
Added rpl_heartbeat_2slaves to experimental list.
2009-10-23 10:33:12 +01:00
Luis Soares
aa12c04656
post-push fix: Preserving warning codes from mysql-next-mr. Updated
...
result files.
Warnings affected:
- WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
- ER_TOO_LONG_FIELD_COMMENT
2009-10-23 10:29:59 +01:00
Alexander Barkov
e17d05cdc7
A postfix for WL#1349.
...
Fixed problems:
- "mtr --mem mysql_locale_posix" could fail because of wrong temporary
directory name: var/tmp/ -> $MYSQLTEST_VARDIR/tmp/
- "mtr federated_debug" could fail because of not compiled-in
locale character set. Always run mysqladmin with latin1.
2009-10-23 13:02:17 +05:00
He Zhenxing
b6529a140b
Add semi-sync support for Windows
2009-10-23 12:56:30 +08:00
Luis Soares
ea858f1857
post-merge fixes: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
rpl.rpl_heartbeat_basic and rpl.rpl_cross_version set as experimental.
2009-10-22 23:46:04 +01:00
Luis Soares
58e2fde011
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
Conflicts
=========
Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.
NOTE
====
mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
- "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"
This is the first cset (merge/...) committed after pulling
from mysql-next-mr.
2009-10-22 23:30:28 +01:00
Alexander Nozdrin
08ecfb9a8b
Automerge from mysql-next-mr.
2009-10-23 00:20:44 +04:00
Mikael Ronstrom
b980d229ff
BUG#46183, added character set identifier on character constants in VALUES part for column list partitioned tables to ensure constants are handled properly according to character sets
2009-10-22 18:17:59 +02:00
Mikael Ronstrom
66f056a64c
A lot of fixes to make character set work ok, first step to fixing BUG#48163
2009-10-22 16:15:06 +02:00
Bjorn Munch
23e557d48a
new merge from next-mr
2009-10-22 09:36:39 +02:00
Alexander Nozdrin
7e30baaa71
Merge from mysql-trunk-merge.
2009-10-22 10:07:56 +04:00
Alexander Nozdrin
8d953ecef1
Pass --vardir to MTR in mysql-trunk.push.
2009-10-22 10:05:53 +04:00
Alexander Nozdrin
c0718f032b
Disable the test in mysql-trunk because of Bug#46931
...
instead of making it experimental.
2009-10-22 10:01:23 +04:00
Mikael Ronstrom
57d455460d
Added checks for no NULL values in VALUES LESS THAN, added tests for no MAXVALUE in VALUES IN
2009-10-21 20:53:44 +02:00
Mikael Ronstrom
cb4bf11965
Merge
2009-10-21 20:11:27 +02:00
Mikael Ronstrom
b2c26b8220
Fixed Information schema for column list partitioned tables
2009-10-21 20:04:34 +02:00
Mikael Ronstrom
3c8c881601
Fixed test cases with regards to error codes
2009-10-21 18:27:34 +02:00
Alexander Barkov
99eae48a97
WL#1349 Use operating system localization to send it as a default client character set
2009-10-21 17:59:47 +05:00
Mikael Ronstrom
d46abd8b84
Merge
2009-10-21 13:59:11 +02:00
Alexander Barkov
344ddc85fa
Merging mysql-next-mr-merge to mysql-next-mr.
2009-10-21 15:48:22 +05:00
Mikael Ronstrom
8ac7705722
Removed column_list and fixed all issues relating to this change
2009-10-21 12:40:21 +02:00
Bjorn Munch
b738a5e57e
merge from next-mr
2009-10-21 12:18:33 +02:00
Alexander Nozdrin
479b602fd6
Merge from mysql-trunk-merge.
2009-10-21 00:27:37 +04:00
Alexander Nozdrin
9787943c5e
Mark rpl.rpl_innodb_bug28430 experimental unconditionally.
2009-10-21 00:26:56 +04:00
Mattias Jonsson
06e871b44d
WL#3352: Extending Partitioning Types and new partition function
...
Moved the new errors back to the end of errmsg.txt
Updated two tests with new error message
2009-10-20 14:59:42 +02:00
Bjorn Munch
d25a26268c
merge 48149
2009-10-20 12:06:33 +02:00
Alexander Nozdrin
356efddad6
A fix for innodb_bug44369.test due to Bug#47233 (Innodb calls
...
push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)).
The Signal/Resignal patch changes the push_warning() API: now
it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN.
This patch should be rolled back when Bug#47233 is fixed.
2009-10-20 13:37:07 +04:00
Bjorn Munch
23ef842e03
Bug #48149 MTR should automatically skip SSL tests if SSL not supported
...
Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc,
will add this when merging to 6.0-codebase
2009-10-19 15:51:47 +02:00
Alexander Nozdrin
3fd2f50b6c
Merge from mysql-trunk-merge.
2009-10-19 17:36:19 +04:00
Alexander Nozdrin
b930b18ec3
Merge from mysql-5.1.
2009-10-19 17:28:31 +04:00
Alexander Nozdrin
f3457a73d6
Merge from mysql-5.1.
2009-10-19 17:17:08 +04:00
