innobase/include/rem0rec.ic:
Improve formatting of comments
innobase/include/trx0trx.h:
dict_operation: document the effect of setting the flag
innobase/row/row0mysql.c:
Do not set the dict_operation flag. (Bug #8144)
Allow MySQL to have open handles to the table being truncated.
sql/ha_innodb.cc:
store_lock(): Do not weaken TL_WRITE locks taken by TRUNCATE TABLE.
CONVERT_TZ() function does not work well together" and bug #7705
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
mysql-test/r/timezone2.result:
Auto merged
mysql-test/t/timezone2.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/set_var.h:
Auto merged
sql/set_var.cc:
Manual merge.
sql/sql_lex.cc:
Ignoring changes in st_lex::unlink_first_table()/link_first_table_back()
made in 4.1 since they are not applicable to 5.0.
sql/tztime.cc:
Manual merge.
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
sql/item_timefunc.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/tztime.cc:
Auto merged
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
Build-tools/Do-compile:
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
ndb/include/Makefile.am:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/tools/delete_all.cpp:
Auto merged
ndb/tools/desc.cpp:
Auto merged
ndb/tools/drop_index.cpp:
Auto merged
ndb/tools/drop_tab.cpp:
Auto merged
ndb/tools/listTables.cpp:
Auto merged
ndb/tools/restore/restore_main.cpp:
Auto merged
ndb/tools/select_all.cpp:
Auto merged
ndb/tools/select_count.cpp:
Auto merged
ndb/tools/waiter.cpp:
Auto merged
ndb/include/util/ndb_opts.h:
SCCS merged
ndb/src/mgmsrv/main.cpp:
resolved merge conflict
added shared memory config parameter, signum for use in signalling
added global variable for holdign signum to be used for shared memory connection
only fiddle with signals if it is set
simplified common ndb client option handling
ndb/include/Makefile.am:
added common defaults file
ndb/include/mgmapi/mgmapi_config_parameters.h:
added shared memory config parameter, signum for use in signalling
ndb/include/transporter/TransporterDefinitions.hpp:
added shared memory config parameter, signum for use in signalling
ndb/include/util/ndb_opts.h:
simplified common ndb client option handling
ndb/src/common/mgmcommon/IPCConfig.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/common/portlib/NdbThread.c:
added global variable for holdign signum to be used for shared memory connection
only block signals if shared memory is used
ndb/src/common/transporter/SHM_Transporter.cpp:
use signum in new global variable for shared memory signalling
ndb/src/common/transporter/TransporterRegistry.cpp:
use signum in new global variable for shared memory signalling
only fiddle with signals if it is set
ndb/src/cw/cpcd/main.cpp:
ndb_opts not really used
ndb/src/kernel/vm/Configuration.cpp:
simplified common ndb client option handling
ndb/src/mgmclient/main.cpp:
simplified common ndb client option handling
ndb/src/mgmsrv/ConfigInfo.cpp:
added shared memory config parameter, signum for use in signalling
ndb/src/mgmsrv/main.cpp:
simplified common ndb client option handling
ndb/tools/delete_all.cpp:
simplified common ndb client option handling
ndb/tools/desc.cpp:
simplified common ndb client option handling
ndb/tools/drop_index.cpp:
simplified common ndb client option handling
ndb/tools/drop_tab.cpp:
simplified common ndb client option handling
ndb/tools/listTables.cpp:
simplified common ndb client option handling
ndb/tools/restore/restore_main.cpp:
simplified common ndb client option handling
ndb/tools/select_all.cpp:
simplified common ndb client option handling
ndb/tools/select_count.cpp:
simplified common ndb client option handling
ndb/tools/waiter.cpp:
simplified common ndb client option handling
Add includes for the _stat() call to compile on Windows in Hot Backup build
innobase/os/os0file.c:
Add includes for the _stat() call to compile on Windows in Hot Backup build
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
innobase/ut/ut0mem.c:
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
mysql-test/r/ndb_index_ordered.result:
make YEAR and TIMESTAMP into ndb types
mysql-test/t/ndb_index_ordered.test:
make YEAR and TIMESTAMP into ndb types
ndb/include/kernel/signaldata/DictTabInfo.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/ndbapi/NdbDictionary.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/include/util/NdbSqlUtil.hpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/common/util/NdbSqlUtil.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionary.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/src/ndbapi/NdbRecAttr.cpp:
make YEAR and TIMESTAMP into ndb types
ndb/test/include/NdbSchemaOp.hpp:
make YEAR and TIMESTAMP into ndb types
sql/ha_ndbcluster.cc:
make YEAR and TIMESTAMP into ndb types
into mysql.com:/home/mydev/mysql-5.0-5000
BUILD/SETUP.sh:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/t/order_by.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
failed to find the newly introduced extra/mysqld_ername.h header file)
VC++Files/client/mysqltest.dsp:
- added "../extra" to the include path (Windows compile failed to find the
newly introduced extra/mysqld_ername.h header file)
into mysql.com:/home/mydev/mysql-5.0-5000
BUILD/SETUP.sh:
Auto merged
configure.in:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/univ.i:
Auto merged
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back()
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)
Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.
Cleanup of global @@time_zone variable handling.
mysql-test/r/timezone2.result:
Added test for bugs #7705 "CONVERT_TZ() crashes with subquery/WHERE on
index column" and #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ()
function does not work well together".
mysql-test/t/timezone2.test:
Added test for bugs #7705 "CONVERT_TZ() crashes with subquery/WHERE on
index column" and #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ()
function does not work well together".
sql/item_timefunc.cc:
Item_func_convert_tz():
New approach for caching objects for constant time zone arguments.
Now instead of determining whenever these arguments are constants
and performing time zone lookup at fix_fields() stage, we do it
on first get_date() invocation. This works better in cases when
const_item() for these arguments returns true only on get_date()
stage but not on fix_fields() stage (e.g. this happens in quries
with joins or derived tables).
sql/item_timefunc.h:
Item_func_convert_tz():
Added from_tz_cached/to_tz_cached members indicating whenever we
already have Time_zone object representing one of constant time zone
arguments.
sql/set_var.cc:
Cleaned up global @@time_zone variable handling. Now we use proper
locking when we are setting or reading its value.
sql/set_var.h:
Removed declaration of sys_var_thd_time_zone::get_tz_ptr() method, which
no longer used.
sql/sql_lex.cc:
st_lex::unlink_first_table(), st_lex::link_first_table_back():
Simplify implementation according to Monty's suggestion.
Instead doing something special if global and local table lists
are the same, we simply save/restore pointers to first elements
of both global and local lists (which works even when this lists
are the same!). This handles nicely the case when we have separate
global table list becuase time zone tables are implicitly used.
sql/tztime.cc:
Backport of Monty's fixes from 5.0, which give us nicer error messages
if we haven't found time zone with such name or its description.
