bar@mysql.com
d50d213162
Merge
2005-03-05 18:20:35 +04:00
marko@hundin.mysql.fi
a8aced1e64
ha_innodb.cc:
...
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
will commit at every 10,000 copied rows.
2005-03-04 15:53:05 +02:00
serg@serg.mylan
998c540fa9
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-02 15:31:03 +01:00
serg@serg.mylan
60e1c869f5
workaround for a bug removed
2005-03-02 15:29:46 +01:00
ingo@mysql.com
306bd2fc69
Merge
2005-03-02 10:56:13 +01:00
serg@serg.mylan
7535886f1c
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-02 10:41:23 +01:00
serg@serg.mylan
02d88c398f
bug#8151 - truncate leaves a transaction open
...
deadlock in MYSQL_LOG::new_file()
style fixes
2005-03-02 10:38:25 +01:00
jan@hundin.mysql.fi
b9ae89a1e6
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-03-02 07:48:00 +02:00
heikki@hundin.mysql.fi
4953070187
ha_innodb.cc:
...
Correct indentation + some small style corrections
2005-03-02 01:25:17 +02:00
marko@hundin.mysql.fi
95243ec114
ha_innodb.cc:
...
delete_all_rows(): Revert previous change.
The transaction has been marked started already
in external_lock().
2005-03-01 20:56:39 +02:00
heikki@hundin.mysql.fi
28cbed10e0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-01 19:46:40 +02:00
heikki@hundin.mysql.fi
cd25fe2fc4
ha_innodb.cc:
...
In TRUNCATE TABLE, MySQL may call innobase_xa_prepare() even though there is no active transaction because it was committed in ha_innobase::delete_all_rows(); in innobase_xa_prepare() InnoDB starts then a new transaction; let us adjust the trx->active_trans flag accordingly
2005-03-01 19:44:53 +02:00
marko@hundin.mysql.fi
7252e44bf5
After review fixes. Fix bugs in TRUNCATE.
2005-03-01 19:42:59 +02:00
marko@hundin.mysql.fi
af2999b753
InnoDB: Commit inserts to the temporary tables created by
...
CREATE INDEX and DROP INDEX every 10,000 rows,
similar to ALTER TABLE.
2005-03-01 16:09:22 +02:00
jan@hundin.mysql.fi
40d89eea68
Fixed XA recovery for InnoDB. Note that XA recovery is still disabled
...
until it has been comprehensive tested.
2005-03-01 08:17:03 +02:00
monty@mysql.com
0a6b7aedb2
Remove compiler warnings and remove not used variables
...
(Found during build process)
2005-02-25 16:53:22 +02:00
serg@serg.mylan
bfe628dc92
copy-paste fixed
2005-02-22 18:45:19 +01:00
serg@serg.mylan
0969942d27
64-bit safe address->string conversion
2005-02-22 18:08:33 +01:00
serg@serg.mylan
8cb554b3c7
merged
2005-02-22 15:31:38 +01:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
monty@mysql.com
f55e200248
Fixed compiler warnings
...
Fixed failing myisam.test and rpl_rotate_logs.test on some configurations
2005-02-22 14:15:50 +02:00
heikki@hundin.mysql.fi
592ad32c74
ha_innodb.cc:
...
Fix crash reported by Pekka Nousiainen if skip-innodb: do not try to release InnoDB's temporary latches if InnoDB has not been inited
2005-02-21 18:54:06 +02:00
serg@serg.mylan
e29191e5c5
windows compilation fixes
2005-02-19 12:15:30 +01:00
serg@serg.mylan
530eecbd99
Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
25ff6a0938
Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.1
...
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug4445.2
2005-02-16 16:47:29 +00:00
serg@serg.mylan
5ddb6354a5
after merge fixes
2005-02-16 17:34:02 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
b119963f13
Merge
2005-02-16 16:29:56 +00:00
marko@hundin.mysql.fi
df0aee432a
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-02-15 16:12:51 +02:00
marko@hundin.mysql.fi
a1a78bbc4a
InnoDB: Create temporary files in the MySQL tmpdir instead of $TMPDIR.
...
(Bug #5822 )
2005-02-15 11:16:17 +02:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
marko@hundin.mysql.fi
e0e87d0c92
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/k/mysql-5.0
2005-02-14 17:23:12 +02:00
heikki@hundin.mysql.fi
01872c239d
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-14 17:23:11 +02:00
gluh@gluh.mysql.r18.ru
29510ce029
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
...
Can't repeat information_schema test failure
Fix for lowercase_table3 only
2005-02-14 18:23:10 +03:00
heikki@hundin.mysql.fi
67392525e8
ha_innodb.cc:
...
Fix a glitch reported by Guilhem: release the memory allocated for innodb_internal_... if innobase_init() fails; cleanups: in ha_innodb, you should use the InnoDB formatting style for the source code
2005-02-14 16:00:15 +02:00
marko@hundin.mysql.fi
e868711319
InnoDB: Small improvements to earlier patch (fix Bug #7350 better),
...
suggested in review by Heikki.
2005-02-14 15:54:08 +02:00
marko@hundin.mysql.fi
9d785cd513
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-11 20:59:19 +02:00
hf@deer.(none)
b94a482ee9
Precision Math implementation
2005-02-09 02:50:45 +04:00
marko@hundin.mysql.fi
e7c10dd2d8
InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers.
2005-02-08 16:41:34 +02:00
marko@hundin.mysql.fi
7dbb93d9fc
InnoDB: Make SHOW TABLE STATUS report Row_format=Compact and
...
Row_format=Redundant
2005-02-08 13:35:10 +02:00
jan@hundin.mysql.fi
fcfc1d8f29
Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and
...
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable.
InnoDB uses consistent read in these cases for a selected table.
Backported from 5.0.x.
2005-02-08 09:36:36 +02:00
jan@hundin.mysql.fi
ac9a456a5e
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-07 11:23:19 +02:00
jan@hundin.mysql.fi
a5b193511c
Relaxed locking in INSERT...SELECT, single table UPDATE...SELECT and
...
single table DELETE...SELECT clauses when innobase_locks_unsafe_for_binlog
is used and isolation level of the transaction is not serializable.
InnoDB uses consistent read in these cases for a selected table.
2005-02-07 10:12:40 +02:00
msvensson@neptunus.homeip.net
c9d7cd043b
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
jan@hundin.mysql.fi
8fc13ecc97
Fixed a bug: deadlock without any locking, simple select and update (Bug #7975 ).
2005-02-03 10:54:38 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6
Merged "query cache for ndb" to 5.0
2005-02-03 09:33:48 +01:00
marko@hundin.mysql.fi
459fa7f1f9
After merge fixes
2005-02-02 11:50:27 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc
WL#1967
...
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
marko@hundin.mysql.fi
dabb56a7cb
After merge fixes
2005-02-01 10:24:09 +02:00
marko@hundin.mysql.fi
2693b5ffa3
InnoDB: Cleanups of TRUNCATE TABLE code
2005-01-31 10:35:56 +02:00
marko@hundin.mysql.fi
8342958665
InnoDB: Allow concurrent TRUNCATE and INSERT on a table. (Bug #8144 )
2005-01-28 12:18:33 +02:00