Mikael Ronstrom
072c13d939
Merged WL#3352 into mysql-next-mr
2009-10-28 18:22:36 +01:00
Mikael Ronstrom
10fed1aca0
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
cc43a2089c
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
cd6e159890
Automerge from mysql-next-mr.
2009-10-27 12:57:44 +03:00
Alexander Nozdrin
453eb014f7
Fix default.conf.
2009-10-27 12:44:23 +03:00
He Zhenxing
6c3c984fc4
disable rpl_spec_variables due to it fails constantly on HPUX
2009-10-27 16:42:50 +08:00
Alexander Barkov
381ad2ec6a
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
4723ae6d0c
A postfix for WL#1349: Fixing test failire problems on HP-UX
2009-10-26 16:29:41 +04:00
Luis Soares
7d970f8285
automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge.
2009-10-25 22:58:52 +00:00
Luis Soares
ba0afceb9e
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
ce912c8ccf
Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1
2009-10-23 21:34:07 +08:00
He Zhenxing
a02972d820
Skip semisync test if the plugin-dir is not set to semisync plugin dir
2009-10-23 21:26:17 +08:00
Luis Soares
75aa76072f
Added rpl_heartbeat_2slaves to experimental list.
2009-10-23 10:33:12 +01:00
Luis Soares
178cdeaa79
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
b231187218
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
6be53b81ec
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
fbac636380
Upped size limit on varchar/char from 512 to 2048
2009-10-23 09:36:45 +02:00
He Zhenxing
0e93befd36
Postfix of previews commit, add missing file
...
plugin/semisync/CMakeLists.txt:
Add CMakeLists.txt for semisync
2009-10-23 15:22:20 +08:00
He Zhenxing
e9acb9f021
Add semi-sync support for Windows
...
CMakeLists.txt:
Add plugin/semisync subdirectory
mysql-test/mysql-test-run.pl:
Check for semisync dll for Windows
mysql-test/suite/rpl/r/rpl_semi_sync.result:
Update result file
mysql-test/suite/rpl/t/rpl_semi_sync.test:
Test semi-sync on Windows
plugin/semisync/semisync_master.cc:
Define gettimeofday for Windows
2009-10-23 12:56:30 +08:00
Luis Soares
676832e05d
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
f1bb8c3c55
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
20eac04d7c
Automerge from mysql-next-mr.
2009-10-23 00:20:44 +04:00
Alexander Nozdrin
75116feb4b
Merge from mysql-trunk.
2009-10-23 00:14:05 +04:00
Alexander Nozdrin
2fc2acd7f5
Fix default.conf.
2009-10-23 00:13:18 +04:00
Mikael Ronstrom
cecef1c56e
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
6f27ad15b2
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
c01fcec8f8
null upmerge from trunk-mtr
2009-10-22 09:40:16 +02:00
Bjorn Munch
e26a2f3b61
new merge from next-mr
2009-10-22 09:36:39 +02:00
Bjorn Munch
d5bfcd6abe
null merge from 5.1
2009-10-22 09:28:39 +02:00
Bjorn Munch
3a2434d432
new merge from trunk
2009-10-22 09:13:44 +02:00
Alexander Nozdrin
bcaa7524d9
Merge from mysql-trunk-merge.
2009-10-22 10:07:56 +04:00
Alexander Nozdrin
469ce38b99
Pass --vardir to MTR in mysql-trunk.push.
2009-10-22 10:05:53 +04:00
Alexander Nozdrin
336505395e
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
f3f4e41c37
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
540015aac8
Merge
2009-10-21 20:11:27 +02:00
Mikael Ronstrom
e30ccf7a67
Fixed Information schema for column list partitioned tables
2009-10-21 20:04:34 +02:00
Mikael Ronstrom
3903aada9b
Fixed test cases with regards to error codes
2009-10-21 18:27:34 +02:00
Mikael Ronstrom
93fca66f85
Removed unnecessary call to fix_parser_data
2009-10-21 17:28:10 +02:00
Alexander Nozdrin
ff98b6a2c2
Update errmsg-utf8.txt after automerge.
2009-10-21 17:25:10 +04:00
Alexander Barkov
c15f970dc8
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
10210bfef2
Merge
2009-10-21 13:59:11 +02:00
Mikael Ronstrom
9ef69958c5
Merge
2009-10-21 12:57:33 +02:00
Alexander Barkov
dcb8bb23c2
Merging mysql-next-mr-merge to mysql-next-mr.
2009-10-21 15:48:22 +05:00
Mikael Ronstrom
bbd922b09c
Removed column_list and fixed all issues relating to this change
2009-10-21 12:40:21 +02:00
Bjorn Munch
0632e9a407
merge from next-mr
2009-10-21 12:18:33 +02:00
Alexander Nozdrin
52701ff327
Merge from mysql-trunk-merge.
2009-10-21 00:27:37 +04:00
Alexander Nozdrin
265eee595b
Mark rpl.rpl_innodb_bug28430 experimental unconditionally.
2009-10-21 00:26:56 +04:00
Alexander Nozdrin
e30e0325a2
Merge from mysql-trunk-merge.
2009-10-21 00:24:42 +04:00
Mattias Jonsson
37b6043070
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
Satya B
78dde957e9
Fix the windows Build failure due to the changes to CMakelists by r2910.
...
Remove the extra line which try to use the name INNOBASE again. The IF ELSE
loop above declares the library name based on the version of mysql
2009-10-20 16:11:50 +05:30
