Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
BitKeeper/deleted/.del-wait_for_slave_running_off.inc:
Delete: mysql-test/include/wait_for_slave_running_off.inc
mysql-test/suite/rpl/t/rpl_packet.test:
Changed patch to Mats suggestion
into gleb.loc:/home/uchum/work/bk/5.1-opt
sql/field.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/unireg.h:
Auto merged
sql/sql_select.cc:
Merge with main tree.
into mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/rpl_utility.cc:
Auto merged
sql/rpl_utility.h:
Auto merged
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.
It also includes some refactoring for the code from WL#3228.
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Removed commented out portion of test referenced in bug report. This
test supports the original request of the bug report.
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
sql/field.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the additions made by this bug patch and those
made by WL#3228. The effort consolidates the large switches on type()
into functions within the field classes.
sql/field.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the additions made by this bug patch and those
made by WL#3228. The effort consolidates the large switches on type()
into functions within the field classes.
sql/log_event.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors the calc_field_size() method to use the new
methods implemented in the field classes. It also corrects comments
concerning how replication of field metadata works.
sql/log_event.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch refactors out the calc_field_size() method into the method
save_field_metadata().
sql/rpl_utility.cc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch adds a method to check the size of the field on the master
using the field metadata from WL#3228. Each column is checked to ensure
the slave's column is >= to the master's column in size.
sql/rpl_utility.h:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
This patch changes the table_def class so that it records the size of
the metadata. This is a result of refactoring out the calc_field_size()
method into the method save_field_metadata(). Prevents access via
field_metadata(col) to unitialized memory when there is no metadata
transmitted from the master.
mysql-test/suite/rpl/r/rpl_row_colSize.result:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
New result file for additional test.
mysql-test/suite/rpl/t/rpl_row_colSize.test:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Added a test file to test each variable type that relies on field
metadata from the master.
mysql-test/include/test_fieldsize.inc:
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
Sub unit file to test each variable type that relies on field
metadata from the master.
ANSI_QUOTES mode)
This patch contains a test case only, showing that the bug has been fixed.
The issue was related to parsing <"blah">, where the lexical analyser
would not properly delimit the start and end of the token.
Properly making the token boundaries has been fixed in sql_lex.cc
with the patch for bug 25411 : see the Lex_input_stream class.
mysql-test/r/parser.result:
Test case for Bug#25930, which was fixed by Bug#25411
mysql-test/t/parser.test:
Test case for Bug#25930, which was fixed by Bug#25411
Updated test to use new include function
wait_for_slave_running_off.inc:
Created new include to resolve the timing issue recorded by Bug#30209
rpl_events.inc:
The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
mysql-test/suite/rpl/t/rpl_packet.test:
Updated test to use new include function
mysql-test/include/wait_for_slave_running_off.inc:
Created new include to resolve the timing issue recorded by Bug#30209
mysql-test/include/rpl_events.inc:
The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
disable partition processing if we open frm file only
mysql-test/suite/ndb/r/ndb_dd_basic.result:
test result
mysql-test/suite/ndb/t/ndb_dd_basic.test:
test case
sql/table.cc:
disable partition processing if we open frm file only
1. added check to fill_schema_schemata() func.
if we have db lookup value we should check that db exists
2. added check to get_all_tables() func
if we have lookup db name or tables name values we shoud check that
these values are not empty strings
3. fixed typo
mysql-test/r/information_schema.result:
test result
mysql-test/t/information_schema.test:
test case
which is faster than open_table_def() func.
This patch fixes the porblem with information_schema test timeout.
sql/unireg.h:
added description of flags
Fix a typing error in a conditional compiling directive
(reported by Vasil Dimov: Thanks !),
and improve their nesting ("MAIN" independent of platform).
mysys/my_gethwaddr.c:
Fix a typing error, reported by Vasil Dimov (thanks !):
The condition is meant to apply to FreeBSD or Linux.
Improve the nesting of conditional compiling directives,
handle "MAIN" and the platform issues independent of each other.
- Fix warnings
- Export 'check_const_len' from udf_example.dll
sql/udf_example.c:
Fix warnings
sql/udf_example.def:
Add 'check_const_len' function to be exported from udf_example.dll
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322
mysql-test/suite/funcs_1/include/ndb_tb2.inc:
Correction to test file creating an ndb table
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/memory_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/ndb_cursors.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
updated test file - forcing sort order
mysql-test/suite/funcs_2/r/ndb_charset.result:
Updated result file
mysql-test/r/mysqlbinlog2.result:
Change test case to remove server version number.
mysql-test/t/mysqlbinlog2.test:
Change test case to remove server version number.
mysys/mf_iocache2.c:
Correcting bad merge.
Completion patch, since it is possible that Log_event::write_header()
is called with no current thread.
When starting the server, there is no thread available, but
MYSQL_BIN_LOG::open() is called to initialize the binary log. The
function writes a format description log event to the binary log,
which means that Log_event::write_header() can be called with no
current thread object available.
sql/log_event.cc:
Since Log_event::write_header() can be called from inside
init_server_components(), it is possible that thd is NULL. In this
case, we set the time of the event to the current time instead
of the start time of the query.
Completion patch, since it is possible that Log_event::write_header()
is called with no current thread.
When starting the server, there is no thread available, but
MYSQL_BIN_LOG::open() is called to initialize the binary log. The
function writes a format description log event to the binary log,
which means that Log_event::write_header() can be called with no
current thread object available.
sql/log_event.cc:
Since Log_event::write_header() can be called from inside
init_server_components(), it is possible that thd is NULL. In this
case, we set the time of the event to the current time instead
of the start time of the query.
mysql-test/r/log_state.result:
Update results (Bug#28830)
mysql-test/t/log_state.test:
A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due
to loaded system - make the test more deterministic.
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
sql/table.cc:
Apply patch for Bug#27806 table comments not passed in to storage engine
during "CREATE ... LIKE ..."
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/item.cc:
Auto merged
tests/mysql_client_test.c:
Manual merge.
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
client/mysqldump.c:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/item.cc:
Auto merged
into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/t/ctype_recoding.test:
Auto merged
sql/sql_string.cc:
Auto merged
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
Conversion between a latin1 column and an ascii string constant
stopped to work.
mysql-test/r/ctype_recoding.result:
Adding test case.
mysql-test/t/ctype_recoding.test:
Adding test case.
Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated. The first
would cause collisions, and the latter was probably benign.
Now, assign the character mappings exactly to their normal values.
sql/share/charsets/ascii.xml:
Change the character mapping for
"`" to "`" (was "E") and
"[" to "[" (was "\") and
"\" to "\" (was "]") and
"]" to "]" (was "[") and
"~" to "~" (was "Y").
strings/ctype-extra.c:
Generated from charsets directory.
mysql-test/r/ctype_ascii.result:
Add new test file.
Test all combinations of printable letter comparisons for
similarity.
mysql-test/t/ctype_ascii.test:
Add new test file.
Test all combinations of printable letter comparisons for
similarity.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
updated test file
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
