mronstrom@mysql.com
c33a0673a6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-12 12:01:01 +02:00
lars@mysql.com
e76c641190
Merge mysql.com:/home/bk/mysql-5.0 into mysql.com:/home/bk/mysql-5.1
2005-05-09 11:45:59 +02:00
mronstrom@mysql.com
c18a302577
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/Users/mikron/wl1682
2005-05-07 11:23:09 +02:00
lars@mysql.com
05cbb3962c
Manual merge 5.0->5.1
2005-05-06 15:04:07 +02:00
monty@mishka.local
015cd1cd21
merge
2005-05-06 13:51:58 +03:00
marko@hundin.mysql.fi
2f0424cd62
Merge
2005-05-06 11:45:59 +03:00
monty@mishka.local
a9f6aab4c9
Fixes while reviewing new code
...
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03:00
marko@hundin.mysql.fi
f9e7e2ee90
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-05-06 10:15:58 +03:00
konstantin@mysql.com
753959cd88
Manual merge
2005-05-05 13:47:09 +04:00
jan@hundin.mysql.fi
71f620890c
Fig compiler error.
2005-05-05 08:08:39 +03:00
jan@hundin.mysql.fi
91640e9d60
Initial value for a auto_increment can now be set using ALTER TABLE
...
AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
change is backported from 5.0 (Bug #7061 ).
2005-05-04 12:24:56 +03:00
marko@hundin.mysql.fi
64bf449bf7
InnoDB: Disable throttling against thread thrashing by default.
2005-05-03 15:55:53 +03:00
tomas@poseidon.ndb.mysql.com
01082e26f1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 11:17:49 +02:00
heikki@hundin.mysql.fi
e8233c3afc
ha_innodb.cc:
...
Return a value from innobase_repl_report_sent_binlog()
2005-05-03 08:40:35 +03:00
tomas@poseidon.ndb.mysql.com
4f1e27ed00
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-03 00:10:52 +02:00
mronstrom@mysql.com
f7cd6b8aa1
WL 1682: After review fixes + update bitvector class + bitvector test
...
cases + bug fixes
2005-05-02 15:45:33 +02:00
tomas@poseidon.ndb.mysql.com
145ae3c6f5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
2005-05-02 13:18:26 +02:00
serg@serg.mylan
9c332d8d2a
yassl changeset 2:
...
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
don't set -DUSE_MYSYS_NEW for gcc 2.95
set $USE_MYSYS_NEW even if CXX is g++
yassl bugfixes
instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
heikki@hundin.mysql.fi
1e6dba4d88
ha_innodb.cc:
...
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
2005-04-29 12:11:04 +03:00
mronstrom@mysql.com
21347433cf
WL 1682: Use bitvector instead of query_id to tell handler which fields
...
to read and write
Changed Server code, added new interface to handler and changed the
NDB handler, InnoDB handler and Federated handler that previously used
query_id
Bug#10202 fix (one-liner fix for memory leak)
2005-04-28 14:45:27 +02:00
msvensson@neptunus.(none)
c76c23fcbc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 18:28:57 +02:00
heikki@hundin.mysql.fi
af00b989df
ha_innodb.cc:
...
Correct an assertion
2005-04-27 13:43:02 +03:00
heikki@hundin.mysql.fi
ab0dbb1fc6
ha_innodb.cc, mysqld.cc:
...
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 13:36:58 +03:00
msvensson@neptunus.(none)
2627475a86
Merge neptunus.(none):/home/msvensson/mysql/bug9714
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 12:30:11 +02:00
heikki@hundin.mysql.fi
e93f8ec420
ha_innodb.cc:
...
Fix linking and compilation errors
2005-04-27 13:19:40 +03:00
jan@hundin.mysql.fi
138a1a9b1d
Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200 ).
2005-04-27 12:28:25 +03:00
msvensson@neptunus.(none)
c12ee8dc16
BUG#9714 libsupc++ problem
...
- Remove linking of libsupc++
- Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
brian@zim.(none)
3e4607a3b8
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/mysql-5.1
2005-04-26 19:07:13 -07:00
brian@zim.(none)
2193fd8666
All changes for change to all storage engines being under storage directory.
2005-04-26 19:04:36 -07:00
marko@hundin.mysql.fi
ba4f386765
row0upd.c:
...
Add UNIV_UNLIKELY hint.
lock0lock.c:
Correct the prototypes of lock_deadlock_recursive() and
lock_deadlock_occurs().
data0data.c:
dtuple_convert_big_rec(): Add UNIV_UNLIKELY hint.
ha_innodb.cc:
ha_innobase::write_row(): Correct the type of 'mode'.
2005-04-22 15:15:18 +03:00
marko@hundin.mysql.fi
c6e329d42c
ha_innodb.cc:
...
trx_is_interrupted(): Remove debug output.
2005-04-21 15:16:16 +03:00
marko@hundin.mysql.fi
ab713b4b22
InnoDB: Speed up comparison functions by making
...
DATA_MYSQL_LATIN1_SWEDISH_CHARSET_COLL a constant.
2005-04-21 15:09:10 +03:00
marko@hundin.mysql.fi
ffeee9cee3
InnoDB: Reduce memcpy() load in row_sel_pop_cached_row_for_mysql()
...
by copying only a prefix of the row that covers the requested
columns.
2005-04-21 15:02:54 +03:00
heikki@hundin.mysql.fi
8974ce0836
Many files:
...
Semi-synchronous replication for InnoDB type tables; before telling the client that a commit has been processed, wait that the replication thread has returned from my_net_send() where it sends the binlog to the slave; note that TCP/IP, even with the TCP_NODELAY option does not guarantee that the slave has RECEIVED the data - this is just heuristic at the moment; this is useful in failover: in almost all cases, every transaction that has returned from the commit has been sent and processed in the slave, which makes failover to the slave simpler if the master crashes; the code does not work yet as is, because MySQL should call innobase_report_binlog_offset_and_commit() in a commit; we will most probably return that call to 5.0.x, to make InnoDB Hot Backup and group commit to work again; XA code broke them temporarily in 5.0.3
2005-04-20 19:27:46 +03:00
marko@hundin.mysql.fi
df780de614
InnoDB: Make CHECK TABLE killable. (Bug #9730 )
2005-04-20 17:39:05 +03:00
marko@hundin.mysql.fi
f9d145ef04
InnoDB: Truncate SHOW INNODB STATUS output at the start of the list
...
of active transactions, if necessary and possible. (Bug #5436 )
2005-04-19 14:35:47 +03:00
jan@hundin.mysql.fi
1f994ec920
Style change. Use 1 and 0 instead of true and false.
2005-04-19 08:23:03 +03:00
heikki@hundin.mysql.fi
69d4d438d2
ha_innodb.cc:
...
Style fix
2005-04-18 14:59:25 +03:00
jan@hundin.mysql.fi
384efc4493
Fixed a bug: deadlock without any locking, simple select and update (Bug #7975 ).
...
Backported from 5.0.3.
2005-04-18 12:17:32 +03:00
gbichot@quadita2.mysql.com
bc48cda57d
Adding --innodb_fast_shutdown=2 which shuts down InnoDB faster than the default "1":
...
most InnoDB threads are not terminated properly and the buffer pool is not flushed
to disk. Still no committed transaction is lost as we flush the logs to disk.
InnoDB does crash recovery at startup after this shutdown.
Using this shutdown in testsuite (mysql-test-run --mysqld=--innodb_fast_shutdown=2) saved 3 minutes (13% of total time).
2005-04-15 18:00:38 +02:00
heikki@hundin.mysql.fi
7731e5f4cf
ha_innodb.cc:
...
Add a big fat warning for future programmers that MySQL may call ::store_lock() also with lock 'type' TL_IGNORE; my ignorance of this caused bug 9670
2005-04-14 11:12:12 +03:00
petr@mysql.com
da9a6aecad
Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-14 01:57:52 +04:00
heikki@hundin.mysql.fi
b698b8620e
ha_innodb.cc:
...
Fix part of bug #9670 : if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
2005-04-13 20:21:28 +03:00
mskold@mysql.com
add3fd3cca
Merge
2005-04-13 16:24:17 +02:00
marko@hundin.mysql.fi
d5646eb6c5
InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE
...
if foreign_key_checks=0. (Bug #9802 )
2005-04-12 16:12:34 +03:00
ramil@mysql.com
3b1c3d8c68
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.bit_class
2005-04-12 12:30:09 +05:00
ramil@mysql.com
c4376b2bc6
Bit type support for non-MyISAM tables.
2005-04-12 12:27:43 +05:00
bar@mysql.com
71f530c4ea
merge
2005-04-11 15:11:52 +05:00
marko@hundin.mysql.fi
b5328a7dbc
InnoDB: Prevent ALTER TABLE ... ENGINE=...
...
if there are foreign key constraints on the table. (Bug #5574 )
2005-04-07 12:16:41 +03:00
heikki@hundin.mysql.fi
a3e6b30a89
handler.cc, ha_innodb.cc:
...
Fix Bug #8650 : InnoDB does not rollback SQL statement at an error
2005-04-05 17:56:40 +03:00