summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 4 small items in this:unknown2003-10-3110-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - when we don't have in_addr_t, use uint32. - a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was "we needn't init it there", but there was one case where we needed...). - made slave_proxy_id always meaningful in THD and Log_event, so we can rely more on it (no need to test if it's meaningful). THD::slave_proxy_id is equal to THD::thread_id except for the slave SQL thread. - clean up the slave's temporary table (i.e. free their memory) when slave server shuts down. extra/resolveip.c: removed #define as it is simpler to put it in my_net.h (because we need the #define elsewhere) include/my_net.h: When in_addr_t is not defined, use uint32. libmysql/libmysql.c: using in_addr_t is more generic. libmysql/manager.c: using in_addr_t is more generic. mysql-test/t/rpl_chain_temp_table.test: comments sql/log_event.cc: * Had forgot to initialize slave_proxy_id in the event constructor (char* buf...). Initializing is in fact only needed for Create_file_log_event, because it uses slave_proxy_id even if it does not write an event to the binlog (it uses slave_proxy_id to write it to SQL-LOAD.info). * When we write events we now always write slave_proxy_id, which is now always meaningful (as thd->slave_proxy_id is now always meaningful, see change in sql_class.cc). sql/mini_client.cc: in_addr_t is more generic. sql/slave.cc: A RELAY_LOG_INFO method to free the slave's temporary tables from memory at slave's server shutdown. It is called by end_slave(), which is called by close_connections(), which is called when the server terminates (close_connections() is just before clean_up(); putting the call in clean_up() was buggy, as active_mi is already deleted by close_connections(). sql/slave.h: new method sql/sql_class.cc: By default we set THD::slave_proxy_id to THD::thread_id, so THD::slave_proxy_id is always meaningful (not 0). It's always the same as the thread id except for the slave SQL thread.
* minor fix in rmunknown2003-10-311-2/+2
| | | | | libmysqld/Makefile.am: minor fix for rm
* thd->query assignment moved outunknown2003-10-311-1/+1
| | | | | | | of lock scope
* Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-301-1/+10
|\ | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.0-root
| * comments about designation of thd->where and unknown2003-10-301-1/+10
| | | | | | | | | | | | | | | | | | thd->proc_info added sql/sql_class.h: comments about thd->where and thd->proc_info added
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-308-18/+204
|\ \ | |/ |/| | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * Fix to be able to rununknown2003-10-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * Fix for BUG#1686unknown2003-10-298-17/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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.
* | Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-302-2/+3
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/kostja/mysql/mysql-4.0-root
| * | fix for bug #1634 '"operator new" in my_new wastes memory'unknown2003-10-302-2/+3
| | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Safety fix for adding service name to search config groupsunknown2003-10-301-1/+2
| | |
* | | Change back service name to MySQLunknown2003-10-304-10/+22
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-293-9/+17
|\ \ | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-282-7/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into narttu.mysql.fi:/my/mysql-4.0
| | * | Fix for problem of installing MySQL as a service withunknown2003-10-282-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | row0sel.c:unknown2003-10-281-2/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | followup to max_user_connections fix, keep the count more accurateunknown2003-10-291-3/+4
| | |
* | | fixes for max_user_connections (connections are now counted even ifunknown2003-10-271-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | correct casting in ulonglong2doubleunknown2003-10-272-4/+4
| | |
* | | cleanupunknown2003-10-251-2/+1
|/ /
* | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-251-1/+4
|\ \ | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
| * \ Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-251-1/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1348/mysql-4.0
| | * | added quotas for database namesunknown2003-10-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixed bug #1348) client/mysqldump.c: added quotas for database names
* | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0unknown2003-10-251-3/+7
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1228/mysql-4.0
| * | | added to mysql_secure_installation unknown2003-10-241-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changing root password on all hosts (bug 1228) scripts/mysql_secure_installation.sh: added changing root password on all hosts
* | | | Move the pid file testing after arguments are parsed (previous patch was not ↵unknown2003-10-241-13/+13
| | | | | | | | | | | | | | | | correct)
* | | | Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-231-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/pem/work/mysql-4.0
| * | | | Put username in the Subject line as well (with the changeset number).unknown2003-10-231-1/+2
| |/ / /
* | | | Fix results after mergeunknown2003-10-231-1/+0
| | | |
* | | | Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree)unknown2003-10-231-1/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/mini_client.cc: Auto merged client/mysqlbinlog.cc: use local file mysql-test/t/myisam.test: Remove uncessesary drop table sql/sql_parse.cc: Use local sql/sql_repl.cc: use local
| * | | | Fix for Bug #1595 "mysqlbinlog can't read a password from the console".unknown2003-10-201-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients, which is the reason why we fix this in 3.23. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password). client/mysqlbinlog.cc: Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients, which is the reason why we fix this in 3.23. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password).
| * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-10-181-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-3.23
| | * | | | backport of a fix made in 4.0 to make replication work in 64-bit binaries.unknown2003-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 4.0 changeset was: ChangeSet@1.1579.3.1, 2003-09-26 23:43:22+02:00, guilhem@mysql.com Fix for 64-bit machines. I am almost sure this is the cause for BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries? BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris) The reason why I think it's wrong is that the normal client code has uint32 ip_addr. (of course on 32-bit machines it does not matter, but on 64-bit it does). sql/mini_client.cc: backport of a fix made in 4.0 to make replication work in 64-bit binaries.
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-3.23unknown2003-10-083-10/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.mysql.fi:/home/my/mysql-3.23 sql/sql_repl.cc: Auto merged
| | * | | | | Fixed memory leak in send_fileunknown2003-10-083-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/myisam.test: Cleanup test BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | | Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23unknown2003-10-071-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_1378/mysql-3.23
| * | | | | | | fixed processing of COM_BINLOG_DUMP to use in mysqlbinlogunknown2003-09-292-2/+9
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_repl.cc: fixed mysql_binlog_send to use COM_BINLOG_DUMP in mysqlbinlog
* | | | | | | Reverted a wrong patch from mysqlhotcopy. This is a real bugunknown2003-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in MySQL server...
* | | | | | | Fixed a bug in mysqlhotcopy, which made special table namesunknown2003-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to cause program to abort. Such table name could have been one with a semicolon (:) in the middle.
* | | | | | | Fixed bug #954 mysqlhotcopy permission problem. The databaseunknown2003-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory owner ship was not honored.
* | | | | | | Applied a patch from Travis Wheeler to mysqlhotcopy that allowsunknown2003-10-221-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using regexp with tablenames together with databasenames.
* | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-223-1/+20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
| * | | | | | | Fix for bug #1271: Undefined variable in PASSWORD() function is not unknown2003-10-213-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handled correctly
* | | | | | | | Merge bk-internal:/home/bk/mysql-4.0/unknown2003-10-211-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| * | | | | | | | Bug#1271 - RAND_TABLE_BIT in expression and only const_tables in joinunknown2003-10-211-0/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | - bumped up version number in configure.in to to 4.0.17 now thatunknown2003-10-211-1/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.0.16 has been tagged and released - tagged ChangeSet 1.1576.1.5 as "mysql-4.0.16" configure.in: - bumped up version number to 4.0.17 now that 4.0.16 has been tagged and released
* | | | | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2003-10-211-3/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0 mysql-test/r/rpl_trunc_binlog.result: Auto merged
| * | | | | | Fix for Bug #1595 "mysqlbinlog can't read a password from the console".unknown2003-10-211-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ** I already fixed it in 3.23; I fix it in 4.0 separately because the code is a bit different (so the changeset 1.1422 of 3.23 should not be merged here) ** Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password). client/mysqlbinlog.cc: Make mysqlbinlog prompt for the password if mysqlbinlog -p instead of printing the usage(). This makes mysqlbinlog behave like other clients. This new code was almost copied from mysqldump. Note that before, one could use mysqlbinlog -p pass and now one must use mysqlbinlog -ppass (putting a space will ask for the password).
| * | | | | | cancelling a previous change I made in rpl_trunc_binlog.test (which I did ↵unknown2003-10-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not push), to enable SHOW SLAVE STATUS again. mysql-test/r/rpl_trunc_binlog.result: enabling SHOW SLAVE STATUS again. mysql-test/t/rpl_trunc_binlog.test: enabling SHOW SLAVE STATUS again
| * | | | | | test update: what we want to detect in this test is if the slave stopped.unknown2003-10-172-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/rpl_trunc_binlog.result: result update mysql-test/t/rpl_trunc_binlog.test: what we want to detect in this test is if the slave stopped.
View Lorry Controller Status