2. changed key_* to el_ley_* in the libedit key.h
(because it's in the conflict with the aix definitions)
3. use libedit_term.h instead of term.h in the cmd-line-utils/libedit/el.h
4. added definition of MIN in the cmd-line-utils/libedit/read.c
(if it wasn't defined yet)
5. discarded definition of SUNOS macro from configure.in
(now we don't include term.h in the el.h at all)
BitKeeper/deleted/.del-term.h~23716a5310508e0:
Delete: cmd-line-utils/libedit/term.h
cmd-line-utils/libedit/Makefile.am:
discarded term.h from the distribution
cmd-line-utils/libedit/el.c:
changed
key_init -> el_key_init
key_end -> el_key_end
cmd-line-utils/libedit/el.h:
change
#include "term.h"
to
#include "libedit_term.h"
cmd-line-utils/libedit/key.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/key.h:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/map.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
cmd-line-utils/libedit/read.c:
1. added definition of MIN
2. fixed problems with undefined uint
3. changed key_get to el_key_get
cmd-line-utils/libedit/term.c:
1. discarded #include "term.h" at all
2. changed functions key_* to el_key_*
3. add declaration of el_key__decode_str
cmd-line-utils/libedit/tty.c:
changed functions key_... to el_key_...
because it's in conflict with the aix definitions
configure.in:
discarded definition of SUNOS macro
(libedit doesn't require it anymore)
Use order by
mysql-test/r/ndb_index_ordered.result:
Use order by
mysql-test/t/ndb_index_ordered.test:
Use order by
sql/ha_ndbcluster.cc:
Remove usage of row count (as it trashes _all_ explain & table status)
Added a test case for bug #5333.
null_key.result, key_primary.result:
Made covering index usable for const tables.
sql_select.cc:
Made covering index usable for const tables:
downported the corresponding code from 4.1.
Simultaneously fixed bug #5333 reported for 4.1.
The bug was due to the fact that field index in join
structures was always set to 0 for const tables.
sql/sql_select.cc:
Made covering index usable for const tables:
downported the corresponding code from 4.1.
Simultaneously fixed bug #5333 reported for 4.1.
The bug was due to the fact that field index in join
structures was always set to 0 for const tables.
mysql-test/t/select.test:
Added a test case for bug #5333.
mysql-test/r/key_primary.result:
Made covering index usable for const tables.
mysql-test/r/null_key.result:
Made covering index usable for const tables.
mysql-test/r/select.result:
Added a test case for bug #5333.
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
mysql-test/mysql-test-run.sh:
Ensure that clients used the supplied --socket argument
mysql-test/r/lowercase_table.result:
Remove tables used in other tests that may affect this one
mysql-test/r/rename.result:
Remove tables used in other tests that may affect this one
mysql-test/t/lowercase_table.test:
Remove tables used in other tests that may affect this one
mysql-test/t/rename.test:
Remove tables used in other tests that may affect this one
sql/item_cmpfunc.cc:
Remove not relevant comment
sql/sql_class.cc:
Add missing parameter to strxnmov() that caused some INTO OUTFILE commands to core dump
sql/sql_load.cc:
Remove extra '/' after mysql_real_data_home
sql/sql_table.cc:
Remove extra '/' after mysql_real_data_home
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
innobase/srv/srv0start.c:
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
parameters": when unpacking binary time recieved from client, handle
the case when length is 0: it means all MYSQL_TIME members are zero.
include/my_time.h:
Declaration for set_zero_time: a tiny piece of code, which I
see no reason to not reuse.
libmysql/libmysql.c:
set_zero_time implementation is now shared between client and
server.
sql-common/my_time.c:
set_zero_time implementation added.
sql/sql_prepare.cc:
A fix for Bug#4231 "Wrong result with MYSQL_TIME parameters":
when unpacking binary time recieved from client, handle the
case when length is 0: it means all MYSQL_TIME members are zero.
tests/client_test.c:
Test case for bug#4231 "Wrong result with MYSQL_TIME parameters"
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbReceiver.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
SCCS merged
some other small fixes
ndb/include/mgmcommon/ConfigRetriever.hpp:
added options to do_connect to contol how connects failures should be treated
ndb/include/mgmcommon/NdbConfig.h:
method to retrieve datadir path (to user for chdir)
ndb/include/ndbapi/ndb_cluster_connection.hpp:
Added connect thread
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
added options to do_connect to contol how connects failures should be treated
ndb/src/common/mgmcommon/NdbConfig.c:
method to retrieve datadir path (to user for chdir)
ndb/src/kernel/main.cpp:
ndbd to do chdir
ndb/src/kernel/vm/WatchDog.cpp:
added my_thread_init for debug
ndb/src/ndbapi/ClusterMgr.cpp:
added my_thread_init for debug
ndb/src/ndbapi/TransporterFacade.cpp:
removed call to atexit
ndb/src/ndbapi/ndb_cluster_connection.cpp:
added connect thread
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
sql/ha_innodb.cc:
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
