include/my_base.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
isam/test2.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test2.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/func_group.result:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
SCCS merged
sql/set_var.cc:
SCCS merged
mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).
mysql-test/mysql-test-run.sh:
When running with --manager: the MySQL manager wants the complete path of the
executable (it uses execv(), not execvp(), so does not search in the $PATH,
so telling him to start 'valgrind' is not enough, it wants '/usr/bin/valgrind'
or so).
So this is a fix to be able to
mysql-test-run --manager --valgrind
Plus a warning (previously, if valgrind was not installed, tests silently
hanged when run with --valgrind).
sql/sp.cc:
Added more error handling for abnormal cases (like a broken mysql.proc table),
and made the field indexing clearer, using defines instead of explicit numbers.
Don't add service name to read config file segments if it's "MySQL"
Fixed possible memory leak when CHANGE USER failed.
include/mysql_com.h:
Change back service name to MySQL (With new, better spelling)
myisam/myisamchk.c:
Improved --help
sql/mysqld.cc:
Don't add service name to read config file segments if it's "MySQL"
sql/sql_parse.cc:
Fixed possible memory leak when CHANGE USER failed.
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".
Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.
New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.
Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
mysql-test/mysql-test-run.sh:
One new test which needs more than one slave so must be hardcoded in mysql-test-run.sh.
sql/log_event.cc:
The event needs to carry a slave_proxy_id (which is set at event's creation
and used at event's logging).
This is used for events created by ::exec_event() in the slave SQL thread:
now we want to log these events with the thread id they had on the master.
This is so that several same-name temp tables simultaneously created on
the master end up with not the same thread id in the slave's binlog.
sql/log_event.h:
Query and Load need to carry a slave_proxy_id, like they carried a thread_id
(to replicate temp tables well).
sql/slave.cc:
Do not free temp tables in the slave SQL thread. Or they will be lost when
one does STOP SLAVE / START SLAVE.
We even save them in rli->save_temporary_tables and set thd->temporary_tables=0
to prevent them to be freed.
sql/sql_base.cc:
Put the server id in the table cache key name for temp tables
(we already put the slave_proxy_id, but we also need the server id
in case normal clients (not slave threads) are using temp tables
on the slave).
sql/unireg.h:
4 more bytes, to store the server id.
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/wl1280-part1
BitKeeper/etc/logging_ok:
auto-union
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
This is a starting work to remove handler name dependencies
from the Lex/Parser.
sql/handler.h:
WorkLog #1280, Stage 1
sql/lex.h:
WorkLog #1280, Stage 1
sql/sql_yacc.yy:
WorkLog #1280, Stage 1
sql/handler.cc:
Use latin1 for string comparison
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
mysql --install mysql --defualts-file=path-to-file
(Bug #1643)
include/mysql_com.h:
MySQL should install as default service "mysqld"
sql/mysqld.cc:
Fix for problem of installing MySQL as a service with
mysql --install mysql --defualts-file=path-to-file
If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database
innobase/row/row0sel.c:
If innodb_force_recovery >= 5, do not try to fetch an old version of a clustered index record: this reduces crashes when dumping tables from a corrupt database
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
Fixed. Enabled test case in client_test.c.
sql/sql_prepare.cc:
BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Added missing parentheses in IS_PARAM_NULL to get the right bit.
tests/client_test.c:
BUG#1644: Insertion of more than 3 NULL columns with parameter binding fails
Fixed. Enabled test case.
code cleanup
mysql-test/r/subselect.result:
test for BUG#1668
mysql-test/t/subselect.test:
test for BUG#1668
sql/item_subselect.cc:
removed unused class field
fixed min_max subquery used_tables()/const()
fixed ALL/ANY optimisation for unions
sql/item_subselect.h:
removed unused class field
fixed min_max subquery used_tables()/const()
sql/sql_union.cc:
fixed result object assignment
Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections
sql/sql_parse.cc:
Fix yet another race condition in sql_parse.cc: thd->user_connect object could get deleted too soon, before the call of check_for_max_user_connections
Add diagnostic printf to chack that number of connections for a user never drops below zero
sql/sql_parse.cc:
Add diagnostic printf to chack that number of connections for a user never drops below zero
And added new test for BUG#1644. (Disabled for now, not fixed yet.)
tests/client_test.c:
A few more fixes:
- Avoid buffer overruns in printf().
- Corrected index for comment field in show table status output.
And added new test for BUG#1644. (Disabled for now, not fixed yet.)
Note:
- All test results haven't been inspected in detail to see if they are correct.
- Some result set printing seems to have the wrong field width; most notably
date/time fields and type fields (e.g. "int(4)").
- There are still some valgrind complaints, but they seem to be in assert() or
in libmysql.
tests/client_test.c:
A major overhaul to adopt to recent changes:
- SHOW TABLE result has changed (more columns)
- EXPLAIN result has VAR_STRING types now
- Added missing mysql_bind_result() calls
- Adopted to mysql_fetch_column() semantics: Don't use same pointers in MYSQL_BIND
structs for fetch_column as for binding.
- Removed a number of duplicated calls to tests
- Added missing initialization of MYSQL_BIND structs fields (lenght fields),
to shutup valgrind.
