monty@mysql.com
eb304bd49f
Fixes while reviewing code
...
(Cleanups and better bug fixes)
2004-11-26 02:31:22 +02:00
timour@mysql.com
f1e86036ee
Merge mysql.com:/home/timka/mysql/src/4.0-virgin
...
into mysql.com:/home/timka/mysql/src/4.0-master
2004-11-25 13:25:35 +02:00
timour@mysql.com
38ab93c6be
Merge for BUG#3759 which was missing from the main tree for some reason.
2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e
Merge mysql.com:/space/bkroot/mysql-4.0
...
into mysql.com:/space/bk/b6148-mysql-4.0
2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55
Fix for Bug#6148. Only rewind read position in binary log when the
...
slave SQL thread is started.
2004-11-25 09:26:45 +01:00
dlenev@mysql.com
40083741ee
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
guilhem@mysql.com
7743dbbb56
When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
...
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
2004-11-18 22:59:17 +01:00
heikki@hundin.mysql.fi
dd64377dc2
ha_innodb.cc:
...
Fix InnoDB bug #6287 : if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
dlenev@mysql.com
5ddc564d89
Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime
...
values for too big argument".
Added range checking for from_unixtime() argument, cleaned up code
a bit.
2004-11-15 16:11:13 +03:00
ram@gw.mysql.r18.ru
77fe1baf1d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662
Bug#6123 - GRANT USAGE creates useless mysql.db row
...
Prevent creation of a row which grants no rights
Test included
2004-11-11 20:59:03 +00:00
ram@gw.mysql.r18.ru
98df9313c0
A fix (bug #6564 : QUOTE(NULL) returns NULL, not the string 'NULL')
2004-11-11 18:20:40 +04:00
guilhem@mysql.com
0c4363b6d0
Fix for BUG#6522 "Replication fails due to a rolled back transaction in the binlog"
...
When we are writing a transaction to the binlog, we log BEGIN/COMMIT with zero error code.
Example: all statements of trans succeeded, connection lost and so implicit rollback:
we don't want ER_NET* errors to be logged in the BEGIN/ROLLBACK events, while statement
events have 0. If there was really a serious error code, it's already in the statement events.
2004-11-10 15:07:55 +01:00
guilhem@mysql.com
76f51406ce
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83
Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":
...
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
2004-11-04 19:19:23 +01:00
dlenev@mysql.com
f78990e28f
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/dlenev/src/mysql-4.0-bg6387
2004-11-04 14:25:08 +03:00
dlenev@mysql.com
fa21feda93
Fix for bug #6387 "Queried timestamp values do not match the inserted
...
value if server runs in time zone with leap seconds".
Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
2004-11-03 17:59:03 +00:00
marko@hundin.mysql.fi
73bb6b9c33
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-11-03 11:09:41 +02:00
heikki@hundin.mysql.fi
22269d451a
ha_innodb.cc:
...
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835 ) to 4.0
2004-11-02 13:21:11 +02:00
marko@hundin.mysql.fi
a3294186ec
mysqld.cc:
...
Describe innodb_max_purge_lag
Improve description of innodb_table_locks
2004-11-01 12:08:44 +02:00
bell@sanja.is.com.ua
8894a6bb73
close table before next iteration of table proccesing in mysql_admin_table (to allow open next table)
2004-10-28 21:14:00 +03:00
lenz@mysql.com
6b720d93be
- Applied some Windows portability fixes for myisampack.c and sql_handler.cc
...
(backports from fixes made in 4.1)
2004-10-27 21:51:27 +02:00
marko@hundin.mysql.fi
b5f49a3abd
Backport innodb_max_purge_lag from 4.1
2004-10-27 13:33:11 +03:00
bell@sanja.is.com.ua
3abe558fa8
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-24 11:32:08 +03:00
bell@sanja.is.com.ua
ce93a3c202
postreview fixes
2004-10-22 22:51:04 +03:00
bell@sanja.is.com.ua
bc68cd7d32
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-10-22 22:10:52 +03:00
bell@sanja.is.com.ua
23ba4c325c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-22 22:08:46 +03:00
dlenev@mysql.com
6b6692dc4d
Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
...
crashes server"
(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).
2004-10-22 19:27:43 +04:00
bell@sanja.is.com.ua
ded12c828d
Check of temporary tables hiding for query fetched from QC (BUG#6084)
2004-10-21 23:56:12 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00
monty@mysql.com
1f8b3d0f22
Code cleanups (done during review of new code)
...
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
2004-10-20 11:24:08 +03:00
bell@sanja.is.com.ua
72fca68a1d
fixed retsult code
2004-10-19 11:54:33 +03:00
dellis@goetia.(none)
34e5df0d36
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5
mysqld.cc:
...
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
2004-10-17 18:44:51 -05:00
marko@hundin.mysql.fi
90528cbaaa
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-15 14:38:59 +03:00
ingo@mysql.com
4082bea2a4
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug5625
2004-10-14 20:04:47 +02:00
ingo@mysql.com
150ab94e0a
BUG#5625 - MyISAM Index corruption on ALTER TABLE x ENABLE KEYS due to full tmpdir.
...
Added a try to a normal repair() if repair_by_sort() failed.
This was not done with ENABLE KEYS and OPTIMIZE TABLE.
Fixed error code handling in mysql_alter_table().
2004-10-14 20:02:56 +02:00
marko@hundin.mysql.fi
edb93ca441
Added startup option and settable session variable
...
innodb_table_locks_old_behavior: do not acquire an
InnoDB table lock for LOCK TABLES, as in mysql-4.0.18
and earlier.
2004-10-13 22:54:21 +03:00
heikki@hundin.mysql.fi
41ab008a36
ha_innodb.cc:
...
Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table referenced by a FOREIGN KEY constraint; this error number is less misleading than the previous value HA_ERR_CANNOT_ADD_FOREIGN, but misleading still; we should introduce to 5.0 a proper MySQL error code
2004-10-12 18:12:00 +03:00
guilhem@mysql.com
c84737d6e8
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6
Fix for BUG#5949 "error code 1223 in binlog when using innobackup":
...
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
2004-10-11 11:01:38 +02:00
monty@mysql.com
d2a5548431
Using MySQL 4.0 with privilege tables from 5.0 caused a crash.
...
(Fixed this by backporting some logic from 4.1)
2004-10-08 16:32:56 +03:00
monty@mysql.com
97febc4dc4
Code cleanups while doing review of pushed code
2004-10-06 17:20:39 +03:00
ram@gw.mysql.r18.ru
0944bed7fc
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5733
2004-10-06 12:49:56 +05:00
monty@mysql.com
992b04d3d8
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-10-06 01:25:55 +03:00
monty@mysql.com
c27d22b44e
Reverted patch for new usage of open_count as it caused more problems than it solved
...
Cleaned up patch for checking locks for multi-table updates
2004-10-06 01:24:21 +03:00
hf@deer.(none)
7ce60487d9
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into deer.(none):/home/hf/work/mysql-4.0
2004-10-05 21:21:27 +05:00
hf@deer.(none)
ee3b6340b0
Fix for #5730 (Query cache crashes server)
...
Recusive part leads to stack overflow
2004-10-05 21:19:40 +05:00
marko@hundin.mysql.fi
8ade0f9a14
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 17:12:16 +03:00
marko@hundin.mysql.fi
42f3c0eb5b
Merge marko@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-10-05 15:15:45 +03:00