Archive fix by Ingo.
Innodb compile fix by Monty.
configure.in:
Auto merged
innobase/include/univ.i:
Auto merged
BUILD/SETUP.sh:
Auto merged
mysql-test/t/archive.test:
Auto merged
sql/examples/ha_archive.cc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
innobase/fil/fil0fil.c:
Merged Montys fix.
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
mysql-test/t/archive.test:
Test Bug: Memory leaks in the archive handler.
Fixed a typo.
sql/examples/ha_archive.h:
Test Bug: Memory leaks in the archive handler.
Added declarations for the new init/cleanup functions.
sql/handler.cc:
Test Bug: Memory leaks in the archive handler.
Added calls of the new init/cleanup functions.
(After review of cs georg:1.1800 by Monty)
VC++Files/libmysqld/libmysqld.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
enumeration type)
innobase/ut/ut0ut.c:
gettimeofday is not available under Windows. Added conditional define
which uses GetLocalTime for windows
libmysql/libmysql.c:
fixed prototype for setup_one_fetch_function which differed from
function declaration.
Fixed not supported unsigned __int64 to double conversion
sql/field.h:
fixed typecast error (windows)
sql/item_sum.cc:
fixed typecast errors (windows)
sql/key.cc:
fixed typecast errors (windows)
sql/opt_range.cc:
fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
fixed typecast errors (windows)
sql/table.cc:
fixed typecast errors (windows)
mysql-test/r/ndb_index_unique.result:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_ndbcluster.cc:
merge bug#8101 and setBound usage if id instead of name
Test cases using common object (database,user,table,..) names could probably
destroy customer data, when connecting to an already running server.
This Changeset contains an auxiliary routine include/testdb_only.inc" which
should be sourced by tests doing such dangerous things.
The test case will get a "[skipped]" when the environment variable
USE_RUNNING_SERVER is not 0 .
The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when
the "mysql-test-run" starts its own server, aka there was no "--extern"
option.
mysql-test/mysql-test-run.sh:
If mysql-test-run spawns the server by itself, USE_RUNNING_SERVER will be set to 0 instead of "".
If the option "--extern" was detected, USE_RUNNING_SERVER will be set to 1 instead of "1".
Several comparisons have to be changed
[ -z "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 0 ]
[ -n "$USE_RUNNING_SERVER" ] --> [ $USE_RUNNING_SERVER -eq 1 ]
USE_RUNNING_SERVER will be exported.
libmysqld/examples/Makefile.am:
Change to Makefile.pm per serg's request, was to go out with federated push, but this fix is needed asap for Lenz. This has passed 'make test'
Added test case for bug #7672 that existed only in 4.0.
mysql-test/t/order_by.test:
Added test case for bug #7672 that existed only in 4.0.
mysql-test/r/order_by.result:
Added test case for bug #7672 that existed only in 4.0.
Added a test case for bug #7672.
sql_yacc.yy:
Fixed bug #7672.
Made queries of the form (SELECT ...) ORDER BY ... to
be equivalent to SELECT ... ORDER BY ...
sql/sql_yacc.yy:
Fixed bug #7672.
Made queries of the form (SELECT ...) ORDER BY ... to
be equivalent to SELECT ... ORDER BY ...
mysql-test/t/order_by.test:
Added a test case for bug #7672.
mysql-test/r/order_by.result:
Added a test case for bug #7672.
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)
client/mysql.cc:
Quote > and " in XML output, and use <field name="XXX"></field>
instead of <XXX></XXX>, to make the output more like
mysqldump --xml and avoid having to turn XXX into a sensible
element name.
Corrected formatting of comments.
rem0rec.ic:
rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
in the correct order.
Corrected formatting of comments.
innobase/include/rem0rec.ic:
rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
in the correct order.
Corrected formatting of comments.
innobase/include/rem0rec.h:
Corrected formatting of comments.