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
monty@mysql.com
c0e8a8d625
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
msvensson@neptunus.(none)
f78e1d1c44
Merge
2005-04-28 10:58:24 +02:00
msvensson@neptunus.(none)
9969e1c5ea
BUG#9911 After review fixes
...
- Remove ha_archive::rename_table and move the fix to handler::rename_table
2005-04-28 10:49:18 +02:00
monty@mysql.com
215be0264b
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-04-27 17:19:32 +03:00
monty@mysql.com
69b813a901
mysqladmin extended-status now displays global status
...
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
2005-04-27 17:16:08 +03:00
heikki@hundin.mysql.fi
ce2c8126a2
handler.cc:
...
Fix compilation error if HAVE_REPLICATION is not defined
2005-04-27 15:09:41 +03:00
heikki@hundin.mysql.fi
f12cd8c708
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-26 17:57:15 +03:00
gbichot@quadita2.mysql.com
b75789e3d8
Fixes for BUG#10039 "MEMORY engine is reported as HEAP",
...
BUG#9738 "SHOW VARIABLES still displays the deprecated 'log_update' in 5.0",
BUG#9542 "MySQL dies with signal 11 when it is using non-existent location of binary logs"
2005-04-23 00:05:05 +02: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
monty@mishka.local
c8170b349f
Merge with 4.1
2005-04-16 04:35:54 +03:00
monty@mishka.local
8d919770c7
Fixed core dump with long timezone names
...
Don't abort on bootstrap if a wrong --default-storage-engine is specified
2005-04-16 03:40:33 +03:00
jimw@mysql.com
6632ed5ce7
Check that the default storage engine is really available, and
...
refuse to start up if it is not. (Bug #9815 )
2005-04-13 18:25:31 -07:00
serg@serg.mylan
3ab03ccbb0
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-12 17:22:14 +02:00
serg@serg.mylan
d4a0becc8a
FLUSH TABLES WITH READ LOCK should block writes to binlog too
2005-04-12 17:15:54 +02:00
msvensson@neptunus.(none)
7a0e28feb5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145
BUG#6762 ALTER TABLE gives weird results and error message
...
- Removed hardcoded error message from 4.1
2005-04-07 20:17:37 +02:00
serg@serg.mylan
78332dcf78
merged
2005-04-06 20:20:37 +02:00
serg@serg.mylan
42277bdd2f
Per Heikki's request make trans_register_ha tolerant to multiple registrations
2005-04-05 18:42:34 +02: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
serg@serg.mylan
c796ea598c
Merge
2005-04-05 13:23:11 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
serg@serg.mylan
52770e8682
XID SQL syntax
...
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
dlenev@brandersnatch.localdomain
fc1e7b07d6
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-trg3
2005-04-03 17:02:13 +04:00
monty@mysql.com
332b7ed4a1
Give warnings if wrong date/time/datetime argument for STR_TO_DATE
...
Small fixes while doing review of new pushed code
More test cases for decimal
2005-03-30 16:00:31 +03:00
dlenev@brandersnatch.localdomain
d4b20f4a86
Fix for bugs #5859 "DROP TABLE does not drop triggers" and
...
#6559 "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are
dropping table and delete it too.
2005-03-27 16:15:21 +04:00
brian@zim.(none)
7b81a9fd4c
Merging support for blackhole up to 5.0.
2005-03-25 10:36:58 -08:00
serg@serg.mylan
d6bedfa8e0
merged
2005-03-23 09:42:24 +01:00
brian@zim.(none)
cfcedd85cd
Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
2005-03-22 16:10:39 -08:00
serg@serg.mylan
e029e3eb61
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-22 16:11:43 +01:00
jimw@mysql.com
4c67678f15
Fix Windows compile warnings, declarations of walk functions
2005-03-22 00:00:24 +01:00
monty@mysql.com
d8b078e423
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
serg@serg.mylan
f4d4df2ca4
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-21 13:43:25 +01:00
jimw@mysql.com
ee2b4ec959
Eliminate warnings noticed by VC7. This includes fixing my_mmap() on
...
Windows to call CreateFileMapping() with correct arguments, and
propogating the introduction of query_id_t to everywhere query ids are
passed around. (Bug #8826 )
2005-03-18 16:12:25 -08:00
serg@serg.mylan
aab19698ab
Automerge
2005-03-17 10:06:49 +01:00
serg@serg.mylan
41997cf263
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 08:46:48 +01:00
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
serg@serg.mylan
99e581ecc1
sql/ha_innodb.cc
...
protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order
store binlog position with the commit
2005-03-16 12:45:08 +01:00
serg@serg.mylan
4afb736576
sql/handler.cc
...
smarter xid-to-str routiine
fixed assert crash in XA RECOVER
sql/sql_parse.cc
XA COMMIT/ROLLBACK did not send_ok in some cases
2005-03-16 08:42:06 +01:00
serg@serg.mylan
8986ffebde
print xa recovery progress
...
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
serg@serg.mylan
32700d1430
if no xa recovery (or after it):
...
warning on startup if prepared foreign xids
error on startup if prepared our xids
temporarily: always rollback prepared our xids instead of an error
2005-03-12 20:09:54 +01:00
ramil@mysql.com
2b1c712d53
a fix (bug #7205 : "archive" test fails on UnixWare when using prepared statements)
2005-03-09 18:33:01 +04:00
patg@krsna.patg.net
0aec332ba3
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-02 08:04:26 -08: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
patg@krsna.patg.net
9e3c670b02
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-03-01 23:23:11 -08: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
patg@krsna.patg.net
e3579fa672
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into krsna.patg.net:/home/patg/mysql-5.0
2005-02-22 11:02:21 -08:00
serg@serg.mylan
a4dbb3b061
compatibility fixes, crashing tests
2005-02-22 15:22:37 +01:00
monty@mysql.com
f5acf0be01
Generate warning in ha_delete_table() if files is missing in handler
2005-02-21 20:41:48 +02:00
