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
840d7eb4f8
BUG#48397, set key_part->length to key_part->store_length isn't correct, store_length is a bit longer
2009-10-29 13:08:35 +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
2d1c1f8280
Merge
2009-10-28 18:32:48 +01:00
Mikael Ronstrom
d9e05040f4
Merged WL#3352 into mysql-next-mr
2009-10-28 18:22:36 +01:00
Mikael Ronstrom
136ce37141
Merge
2009-10-28 17:52:55 +01:00
Mattias Jonsson
07f9da5d5d
merge
2009-10-28 17:30:58 +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
Alexander Nozdrin
7c9f6e6f3b
Fix default.conf.
2009-10-27 12:44:23 +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
46f554e5b4
Postfix for WL#1349.
...
Don't do character set autodetection when running
mysql from mysql_fix_privilege_tables.
2009-10-23 13:31:14 +05: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
Mikael Ronstrom
7f446fc76b
Upped size limit on varchar/char from 512 to 2048
2009-10-23 09:36:45 +02:00
He Zhenxing
240dbc28f7
Postfix of previews commit, add missing file
2009-10-23 15:22:20 +08: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
Alexander Nozdrin
2f5413ebc5
Merge from mysql-trunk.
2009-10-23 00:14:05 +04:00
Alexander Nozdrin
4b8eb9891c
Fix default.conf.
2009-10-23 00:13:18 +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
2f0c4678e5
null upmerge from trunk-mtr
2009-10-22 09:40:16 +02:00
Bjorn Munch
23e557d48a
new merge from next-mr
2009-10-22 09:36:39 +02:00
Bjorn Munch
8aee8bd2c7
null merge from 5.1
2009-10-22 09:28:39 +02:00
Bjorn Munch
6756d64b81
new merge from trunk
2009-10-22 09:13:44 +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
Mattias Jonsson
d89e60c343
WL#3352, minor code formatting fixes after code review
2009-10-21 17:45:34 +02:00
Mikael Ronstrom
e541ab3b53
Removed unnecessary call to fix_parser_data
2009-10-21 17:28:10 +02:00
Alexander Nozdrin
1ea4a9f371
Update errmsg-utf8.txt after automerge.
2009-10-21 17:25:10 +04: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
Mikael Ronstrom
bf3f630f9a
Merge
2009-10-21 12:57:33 +02:00
