summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Extra safety fixes (probably not needed, but can't hurt)monty@mysql.com2004-05-153-9/+6
|
* Many files:heikki@hundin.mysql.fi2004-05-147-5/+33
| | | | Fix remaining cases of Bug #3596: fix possible races caused by an obsolete value of thd->query_length in SHOW PROCESSLIST and SHOW INNODB STATUS; this fix depends on the fact that thd->query is always set to NULL before setting it to point to a new query
* ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c:heikki@hundin.mysql.fi2004-05-131-14/+34
| | | | | | | | | Reserve the MySQL LOCK_thread_count mutex when printing thd->query of an arbitrary transaction; if we are printing thd->query of a transaction that we know is currently executing inside InnoDB, then we know that MySQL cannot meanwhile change thd->query, and no need to reserve the MySQL mutex; note that this patch still leaves open the possibility of races in MySQL's thd->query_len
* ha_innodb.cc:heikki@hundin.mysql.fi2004-05-131-4/+26
| | | | A flawed fix of the thd->query race in SHOW INNODB STATUS; see the comments in code about how to fix this properly; we cannot use LOCK_thread_count to protect thd->query, because that will cause a deadlock of threads
* ha_innodb.cc:marko@hundin.mysql.fi2004-05-131-2/+9
| | | | innobase_mysql_print_thd(): protect thd with LOCK_thread_count (Bug #3596)
* InnoDB: avoid some data races in innobase_mysql_print_thd() (Bug #3596)marko@hundin.mysql.fi2004-05-121-6/+7
|
* bug#3612 - Item_func_div set decimals incorrectlyserg@serg.mylan2004-05-111-0/+1
|
* Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0monty@mysql.com2004-05-061-2/+2
|\
| * fixed db name and layout (can cause very rare race condition bug)bell@sanja.is.com.ua2004-05-041-2/+2
| |
* | Remove not used variablemonty@mysql.com2004-05-061-2/+2
| |
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-051-3/+3
|\ \ | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | very minor changes: a STOP SLAVE in a replication test to get rid of a non ↵guilhem@mysql.com2004-05-051-3/+3
| | | | | | | | | | | | | | | | | | critical message in slave.err, and a comment update
* | | InnoDB portability fix: new function os_file_set_eof()marko@hundin.mysql.fi2004-05-051-1/+1
| | |
* | | Portability fixmonty@mysql.com2004-05-051-5/+1
| | |
* | | InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual sizemarko@hundin.mysql.fi2004-05-051-0/+5
| | | | | | | | | | | | (Bug #3596)
* | | Merge marko@build.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-05-056-18/+26
|\ \ \ | |/ / | | | | | | into hundin.mysql.fi:/home/marko/l/mysql-4.0
| * | useless fixes for --report-password and --show-slave-auth-info (almost ↵guilhem@mysql.com2004-05-042-2/+2
| | | | | | | | | | | | | | | | | | undocumented options), just for beauty of truth.
| * | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-05-041-10/+7
| |\ \ | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | * | Fix for Bug#3357 "If the statement is long, the error message is trunc and ↵guilhem@mysql.com2004-05-041-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | important info is lost"; in hard-coded replication messages, always put small-length info (error codes, explanation of the error) at the beginning, so that it is not cut by truncation if the query is very long (which happens if the query goes first).
| * | | don't rely on readdir() returning . and .. firstserg@serg.mylan2004-05-042-2/+13
| | | |
| * | | compatibility fix. warning removedserg@serg.mylan2004-05-031-4/+4
| |/ /
* | | InnoDB: implement LOCK TABLE (Bug #3299)marko@hundin.mysql.fi2004-04-291-4/+16
|/ /
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-283-10/+45
|\ \ | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | A new option --replicate-same-server-id to force a slave to execute queries ↵guilhem@mysql.com2004-04-283-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | originating from itself (WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is (some sort of trigger). Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
* | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-04-289-152/+188
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| * | | Fixed http address in some scripts (Bug #3460)monty@mysql.com2004-04-285-147/+163
| | | | | | | | | | | | | | | | | | | | | | | | Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix) Fixed that INTERVAL can handle big integers. (Bug #3498) Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
| * | | Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265)monty@mysql.com2004-04-284-5/+25
| |/ / | | | | | | | | | Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182)
* | | Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0antony@ltantony.dsl-verizon.net2004-04-281-4/+15
|\ \ \ | | | | | | | | | | | | into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
| * | | Fix for Bug 3481antony@ltantony.dsl-verizon.net2004-04-281-4/+15
| | | | | | | | | | | | | | | | CREATE statement allowed extra unnecessary commas
* | | | bug#3556 - soundexserg@serg.mylan2004-04-281-1/+1
| |/ / |/| |
* | | Fixed compiler error in slave.cc on some platforms.greg@mysql.com2004-04-211-1/+1
|/ /
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-131-2/+16
|\ \ | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | Fix for BUG#3461 "multi-table DELETE replicated despite ↵guilhem@mysql.com2004-04-131-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replicate-wild-ignore-table": In tables_ok(), when there is no table having "updating==TRUE" in the list, return that we don't replicate this statement (the slave is supposed to replicate *changes* only). In practice, the case can only happen for this statement: DELETE t FROM t,u WHERE ... ; tables_ok(t,u) will now return 0, which (check all_tables_not_ok()) will give a chance to tables_ok(t) to run.
* | | ha_innodb.cc, sync0sync.h, sync0sync.c:heikki@hundin.mysql.fi2004-04-091-3/+6
| | | | | | | | | | | | Use only noninlined InnoDB functions in ha_innodb.cc
* | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0ram@gw.mysql.r18.ru2004-04-091-0/+1
|\ \ \ | |/ / |/| | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3376
| * | A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set)ram@gw.mysql.r18.ru2004-04-091-0/+1
| | |
* | | Fix for BUG#3422 "In 3.23 -> 4.0 replication, slave segfault when ↵guilhem@mysql.com2004-04-081-2/+14
|/ / | | | | | | | | | | | | | | | | | | | | | | | | replicating LOAD DATA INFILE": as we transform the 3.23 Load_log_event into a 4.0 Create_file_log_event which is one byte longer, we need to increment event_len. The bug was that we did not increment it, so later in code the end 0 was not seen so there was for example a segfault in strlen(fname) because fname was not 0-terminated. Other problems remain in 3.23->4.0 replication of LOAD DATA INFILE but they are less serious: Exec_master_log_pos and Relay_log_space are incorrect. I'll document them. They are not fixable without significant code changes (if you fix those problems in 4.0, you get assertion failures somewhere else etc), * which are already done in 5.0.0 *.
* | sql_select.cc:heikki@hundin.mysql.fi2004-04-081-1/+2
| | | | | | | | Fix a glitch reported by Philippe Lewicki on the general mailing list: do not print a warning to the .err log if read_key fails with a lock wait timeout error 146
* | Fix for BUG#3415 "mysqlbinlog loses a USE command when LOAD DATA INFILE is ↵guilhem@mysql.com2004-04-071-6/+13
| | | | | | | | | | | | | | involved": if you are printing LOAD DATA INFILE and its USE as comments, don't update 'last_db' (because you have not actually changed the db in the server).
* | Fix for BUG#3401 "Rare replication bug which leads to "Binlog has bad magic ↵guilhem@mysql.com2004-04-071-0/+11
| | | | | | | | | | | | | | | | number" from slave": Backport of a part of this changeset of 4.1: ChangeSet@1.1753.1.1, 2004-04-05 13:56:05+03:00, monty@mysql.com which fixes the bug.
* | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-04-073-34/+75
|\ \ | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| * | This is a fix for a bug in 3.23 -> 4.0 replication: Exec_master_log_pos is ↵guilhem@mysql.com2004-04-073-34/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always too big by 6 bytes. So I add code to substract 6 bytes if the master is 3.23. This is not perfect (because it won't work if the slave I/O thread has not noticed yet that the master is 3.23), but as long as the slave I/O thread starts Exec_master_log_pos will be ok. It must be merged to 4.1 but not to 5.0 (or it can be, because of #if MYSQL_VERSION_ID), because 5.0 already works if the master is 3.23 (and in a more natural way: in 5.0 we store the end_log_pos in the binlog and relay log). I had to move functions from slave.h to slave.cc to satisfy gcc.
* | | InnoDB: send diagnostic output to stderr or filesmarko@hundin.mysql.fi2004-04-061-133/+159
| | | | | | | | | | | | instead of stdout or fixed-size memory buffers
* | | InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.xmarko@hundin.mysql.fi2004-04-051-0/+1
| | |
* | | InnoDB: ignore intra-database foreign key references between tablesmarko@hundin.mysql.fi2004-04-021-2/+5
| | | | | | | | | | | | when dropping database (Bug #3058)
* | | InnoDB cleanup: fixing buffer overflows and quoting of quotesmarko@hundin.mysql.fi2004-04-011-5/+2
| | |
* | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0Sinisa@sinisa.nasamreza.org2004-03-301-1/+6
|\ \ \ | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| * | | A fix for the error message when database can not be dropped due toSinisa@sinisa.nasamreza.org2004-03-301-1/+6
| | | | | | | | | | | | | | | | the extra files being present.
* | | | some cleanup of last patch for BUG #2342vva@eagle.mysql.r18.ru2004-03-271-0/+9
| | | |
* | | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0vva@eagle.mysql.r18.ru2004-03-273-0/+45
|\ \ \ \ | |/ / / |/| | | | | | | into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
View Lorry Controller Status