manual merge to account 5.0 specific names of TABLE class
sql/mysql_priv.h:
manual merge: changing to 5.0's TABLE class names
sql/sql_base.cc:
manual merge: whitespaces and 5.0 TABLE's names
fixing names length. Got an issue when merged to 5.0, decided to fix starting from 4.1
mysql-test/t/mysqlbinlog.test:
fixing temp table name to fit to 64 bytes for 5.0
mysql-test/t/rpl_temporary.test:
fixing temp table name to fit to 64 bytes for 5.0
mysqltest program should be really multithreaded to perform this
test with the embedded server. So this test disabled until we
redo mysqltest this way
mysql-test/t/init_connect.test:
test can't work properly with the embedded server yet
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
mysql-test/r/mysqlbinlog.result:
Auto merged
sql/mysql_priv.h:
Auto merged
mysql-test/r/drop_temp_table.result:
manual merge use local
mysql-test/r/mix_innodb_myisam_binlog.result:
manual merge use local
mysql-test/r/rpl_temporary.result:
manual merge use local
mysql-test/t/mysqlbinlog.test:
manual merge
mysql-test/t/rpl_temporary.test:
manual merge. More than the bugs fixes: using disconnect con1 from 4.1's version instead of kill con1.
sql/sql_base.cc:
manual merge, should be in sync with 4.1's version.
over two views when using syntax with curly braces.
Each outer join operation must be placed in a separate
nest. This was not done when the syntax with curly braces
was used. In some cases, in particular, for queries with outer
join operation over views it could cause a crash.
mysql-test/r/join_outer.result:
Added a test case for bug #19396.
mysql-test/t/join_outer.test:
Added a test case for bug #19396.
into mysql.com:/home/psergey/mysql-5.1-merge2
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
sql/opt_range.cc:
Manual merge
fixing a path to find charset by $MYSQL client. I believe the fix is done what should be
by default.
mysql-test/t/mysqlbinlog.test:
--character-sets-dir=../sql/share/charsets is added otherwise client/.libs/lt-mysql
searches in /usr/local/mysql ... A bug?
mysql-test/t/rpl_temporary.test:
--character-sets-dir=../sql/share/charsets/
itself when executing queries referring to a view with GROUP BY
an expression containing non-constant interval.
It happened because Item_date_add_interval::eq neglected the
fact that the method can be applied to an expression of the form
date(col) + interval time_to_sec(col) second
at the time when col could not be evaluated yet.
An attempt to evaluate time_to_sec(col) in this method resulted
in a crash.
mysql-test/r/view.result:
Added a test case for bug #19490.
mysql-test/t/view.test:
Added a test case for bug #19490.
sql/item_timefunc.cc:
Fixed bug #19490. The bug that caused server crash manifested
itself when executing queries referring to a view with GROUP BY
an expression containing non-constant interval.
It happened because Item_date_add_interval::eq neglected the
fact that the method can be applied to an expression of the form
date(col) + interval time_to_sec(col) second
at the time when col could not be evaluated yet.
An attempt to evaluate time_to_sec(col) in this method resulted
in a crash.
The code of Item_date_add_interval::eq was corrected.
into mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
Auto merged
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
Auto merged
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
mysql-test/t/partition.test:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/ndb_partition_key.result:
manual merge
mysql-test/r/partition.result:
manual merge
mysql-test/t/ndb_partition_key.test:
manual merge
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1
mysql-test/r/rpl_temporary.result:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
sql/sql_base.cc:
Auto merged
sql/mysql_priv.h:
manual merge, a comment added
A pattern to generate binlog for DROPped temp table in close_temporary_tables
was buggy: could not deal with a grave-accent-in-name table.
The fix exploits `append_identifier()' for quoting and duplicating accents.
mysql-test/r/rpl_temporary.result:
results changed
mysql-test/t/rpl_temporary.test:
more correct internal table emulation; typo of @@session in bug#17263.
sql/mysql_priv.h:
bool is_user_table(TABLE * table)
is added to answer wheather temporary table was created explicitly.
sql/sql_base.cc:
Utilizing `append_identifier' to quote. `close_temporary_tables' once again recoded
I hope to become much simplier than previously. No-binlog branch is separated completely the
rest that adopts String's methods.
Change mode to -rw-rw-r--
include/decimal.h:
Change mode to -rw-rw-r--
mysql-test/r/archive_gis.result:
Change mode to -rw-rw-r--
mysql-test/r/bdb_gis.result:
Change mode to -rw-rw-r--
mysql-test/r/binlog.result:
Change mode to -rw-rw-r--
mysql-test/r/compress.result:
Change mode to -rw-rw-r--
mysql-test/r/federated_archive.result:
Change mode to -rw-rw-r--
mysql-test/r/federated_bug_13118.result:
Change mode to -rw-rw-r--
mysql-test/r/im_daemon_life_cycle.result:
Change mode to -rw-rw-r--
mysql-test/r/im_life_cycle.result:
Change mode to -rw-rw-r--
mysql-test/r/im_options_set.result:
Change mode to -rw-rw-r--
mysql-test/r/im_options_unset.result:
Change mode to -rw-rw-r--
mysql-test/r/im_utils.result:
Change mode to -rw-rw-r--
mysql-test/r/innodb-big.result:
Change mode to -rw-rw-r--
mysql-test/r/innodb_gis.result:
Change mode to -rw-rw-r--
mysql-test/r/innodb_notembedded.result:
Change mode to -rw-rw-r--
mysql-test/r/mysql.result:
Change mode to -rw-rw-r--
mysql-test/r/mysqldump-max.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_bitfield.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_condition_pushdown.result:
Change mode to -rw-rw-r--
mysql-test/r/ndb_gis.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_ignore_revoke.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_trigger.result:
Change mode to -rw-rw-r--
mysql-test/r/rpl_view.result:
Change mode to -rw-rw-r--
mysql-test/r/sp-code.result:
Change mode to -rw-rw-r--
mysql-test/r/sp-destruct.result:
Change mode to -rw-rw-r--
mysql-test/r/sp-dynamic.result:
Change mode to -rw-rw-r--
mysql-test/r/sp-vars.result:
Change mode to -rw-rw-r--
mysql-test/r/sp_trans.result:
Change mode to -rw-rw-r--
mysql-test/r/sum_distinct-big.result:
Change mode to -rw-rw-r--
mysql-test/r/trigger-compat.result:
Change mode to -rw-rw-r--
mysql-test/r/trigger-grant.result:
Change mode to -rw-rw-r--
mysql-test/r/trigger-trans.result:
Change mode to -rw-rw-r--
mysql-test/r/type_bit_innodb.result:
Change mode to -rw-rw-r--
mysql-test/r/type_newdecimal.result:
Change mode to -rw-rw-r--
mysql-test/r/user_limits.result:
Change mode to -rw-rw-r--
mysql-test/r/view_grant.result:
Change mode to -rw-rw-r--
mysql-test/r/view_query_cache.result:
Change mode to -rw-rw-r--
mysql-test/r/xa.result:
Change mode to -rw-rw-r--
mysql-test/std_data/bug16266.000001:
Change mode to -rw-rw-r--
mysql-test/std_data/vchar.frm:
Change mode to -rw-rw-r--
mysql-test/t/binlog-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/binlog.test:
Change mode to -rw-rw-r--
mysql-test/t/flush_read_lock_kill-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/flush_read_lock_kill.test:
Change mode to -rw-rw-r--
mysql-test/t/sp_trans.test:
Change mode to -rw-rw-r--
mysql-test/t/xa.test:
Change mode to -rw-rw-r--
mysys/my_mmap.c:
Change mode to -rw-rw-r--
sql/sql_array.h:
Change mode to -rw-rw-r--
strings/decimal.c:
Change mode to -rw-rw-r--
configure.in:
Auto merged
mysql-test/include/rpl_stmt_seq.inc:
Auto merged
mysql-test/r/blackhole.result:
Auto merged
mysql-test/r/ctype_cp932_binlog.result:
Auto merged
mysql-test/r/fulltext2.result:
Auto merged
mysql-test/r/ctype_ucs_binlog.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/ndb_update.result:
Auto merged
mysql-test/r/not_embedded_server.result:
Auto merged
mysql-test/r/repair.result:
Auto merged
mysql-test/r/query_cache_notembedded.result:
Auto merged
mysql-test/r/rpl_create_database.result:
Auto merged
mysql-test/r/rpl_multi_update3.result:
Auto merged
mysql-test/r/rpl_slave_status.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/gis-rtree.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
mysql-test/t/rpl_ddl.test:
Auto merged
mysql-test/t/rpl_multi_query.test:
Auto merged
mysql-test/t/rpl_rewrite_db.test:
Auto merged
sql/sql_bitmap.h:
Auto merged
sql/sql_handler.cc:
Auto merged
zlib/Makefile.am:
Auto merged
mysql-test/std_data/trunc_binlog.000001:
SCCS merged
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
mysql-test/r/ndb_dd_basic.result:
Auto merged
mysql-test/r/ndb_partition_key.result:
Auto merged
mysql-test/t/ndb_partition_key.test:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/unireg.cc:
Auto merged
BitKeeper/deleted/.del-master-bin.001~8917149781db8413:
Auto merged
myisammrg/myrg_range.c:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/repair.result:
Auto merged
mysql-test/std_data/trunc_binlog.000001:
Auto merged
mysql-test/t/bulk_replace.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/ctype_tis620.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/repair.test:
Auto merged
mysql-test/t/rpl_commit_after_flush.test:
Auto merged
mysql-test/t/rpl_free_items.test:
Auto merged
sql/sql_handler.cc:
Auto merged
Change mode to -rw-rw-r--
dbug_add_tags.pl:
Change mode to -rwxrwxr--
dbug/dbug_add_tags.pl:
Change mode to -rwxrwxr--
myisammrg/myrg_range.c:
Change mode to -rw-rw-r--
mysql-test/r/innodb_handler.result:
Change mode to -rw-rw-r--
mysql-test/r/repair.result:
Change mode to -rw-rw-r--
mysql-test/std_data/master-bin.001:
Change mode to -rw-rw-r--
mysql-test/std_data/trunc_binlog.001:
Change mode to -rw-rw-r--
mysql-test/t/bulk_replace.test:
Change mode to -rw-rw-r--
mysql-test/t/create_select_tmp.test:
Change mode to -rw-rw-r--
mysql-test/t/ctype_tis620.test:
Change mode to -rw-rw-r--
mysql-test/t/handler.test:
Change mode to -rw-rw-r--
mysql-test/t/innodb_handler.test:
Change mode to -rw-rw-r--
mysql-test/t/mix_innodb_myisam_binlog-master.opt:
Change mode to -rw-rw-r--
mysql-test/t/repair.test:
Change mode to -rw-rw-r--
mysql-test/t/rpl_commit_after_flush.test:
Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items-slave.opt:
Change mode to -rw-rw-r--
mysql-test/t/rpl_free_items.test:
Change mode to -rw-rw-r--
scripts/mysql_secure_installation.sh:
Change mode to -rw-rw-r--
sql/sql_handler.cc:
Change mode to -rw-rw-r--
support-files/mysql-multi.server.sh:
Change mode to -rw-rw-r--
replaced get_field(MEM_ROOT *mem, Field *field) with
get_field(MEM_ROOT *mem, Field *field, String *res).
It allows to avoid strlen().
mysql-test/r/information_schema.result:
Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
test case
mysql-test/t/information_schema.test:
Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
test case
Updated per lars
rpl_row_flsh_tbls.test:
updated per lars
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Updated per lars
mysql-test/t/rpl_row_flsh_tbls.test:
updated per lars
mysql-test/t/rpl_multi_engine.test:
Updated per lars
mysql-test/t/rpl_row_basic_11bugs.test:
Updated per lars
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
Auto merged
client/client_priv.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql-common/client.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
vio/vio.c:
Auto merged
vio/viossl.c:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/Makefile.am:
Manual merge.
