1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Commit Graph

888 Commits

Author SHA1 Message Date
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
78332dcf78 merged 2005-04-06 20:20:37 +02:00
42277bdd2f Per Heikki's request make trans_register_ha tolerant to multiple registrations 2005-04-05 18:42:34 +02:00
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
c796ea598c Merge 2005-04-05 13:23:11 +02:00
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
52770e8682 XID SQL syntax
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
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
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
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
7b81a9fd4c Merging support for blackhole up to 5.0. 2005-03-25 10:36:58 -08:00
d6bedfa8e0 merged 2005-03-23 09:42:24 +01:00
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
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
4c67678f15 Fix Windows compile warnings, declarations of walk functions 2005-03-22 00:00:24 +01:00
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
a1ab786091 Cleanups during review of code
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
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
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
aab19698ab Automerge 2005-03-17 10:06:49 +01:00
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
594ef41b2d Cleanup during reviews
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00
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
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
8986ffebde print xa recovery progress
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
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
2b1c712d53 a fix (bug #7205: "archive" test fails on UnixWare when using prepared statements) 2005-03-09 18:33:01 +04:00
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
02d88c398f bug#8151 - truncate leaves a transaction open
deadlock in MYSQL_LOG::new_file()
style fixes
2005-03-02 10:38:25 +01:00
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
0a6b7aedb2 Remove compiler warnings and remove not used variables
(Found during build process)
2005-02-25 16:53:22 +02:00
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
a4dbb3b061 compatibility fixes, crashing tests 2005-02-22 15:22:37 +01:00
f5acf0be01 Generate warning in ha_delete_table() if files is missing in handler 2005-02-21 20:41:48 +02:00
3b1f0964c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-21 14:48:44 +02:00
cab35adf7e Review of new pushed code (XA & other)
Portability fixes and cleanups
Fixed setting of 'res' in mysql_execute_command()
2005-02-21 14:47:57 +02:00
fcb135560d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-21 11:57:06 +01:00
b75d8ac0f3 xa assert fixes 2005-02-21 11:51:50 +01:00
b6e20e350f ndb - fix problems introduced/discovered by XA 2005-02-21 10:53:19 +01:00
e6352ee568 Merge 2005-02-20 14:20:05 -08:00
e29191e5c5 windows compilation fixes 2005-02-19 12:15:30 +01:00
005deef102 WL# 2094 Federated Storage Handler
This changeset/patch is on top of changesets 1.1814 and 1.1846 
(for bugs 8033 and 8065) and now fixes bug 8535.

These changes have been built and tested successfully on build.mysql.com

handler.cc:
  Added hooks for federated_db_init() and federated_db_end(), 
  as done with ha_archive_db does, per suggestion by Ingo in
  code review of patch 1.1846.
ha_federated.h:
  declaration of federated_db_init() and federated_db_end()
ha_federated.cc:
  - Fixed some indentation problems from indent-ex (mainly to do with
    cases where "variablename += value"
  - Added federated_db_init() and federated_db_end(), as done with
    archive, which also handler more elegantly one of the memory leaks
    from bug 8033 where the federated_mutex was not freed
  - Removed extrenous debug messages in parse_url()
  - Fixed bug 8535, caused by NULL being quoted in write_row. This used to
    work (incorrectly) but a recent change was made in the server that 
    exposed this
2005-02-16 23:07:10 -08:00
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
a67924ecbc WL#1967
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
3c5060981f query_id and my_xid -> ulonglong
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
bbcd542917 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00
5ad151aa21 Test Bug: Memory leaks in the archive handler.
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
2005-01-26 15:27:31 +01:00
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00