summaryrefslogtreecommitdiff
path: root/innobase
Commit message (Collapse)AuthorAgeFilesLines
* mergedserg@serg.mylan2005-05-281-0/+5
|\
| * Merge hundin.mysql.fi:/home/marko/k/mysql-4.0marko@hundin.mysql.fi2005-05-261-0/+5
| |\ | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1
| | * InnoDB: Check all referencing tables in DROP DATABASE (Bug #10335).marko@hundin.mysql.fi2005-05-261-0/+5
| | |
* | | srv0start.c:marko@hundin.mysql.fi2005-05-251-3/+4
| | | | | | | | | | | | | | | | | | innobase_shutdown_for_mysql(): Do very fast shutdown only if srv_fast_shutdown==2, not if srv_fast_shutdown!=0 (Bug #9673)
* | | Print information about XA recovery only if there are prepared XA transactionsjan@hundin.mysql.fi2005-05-241-7/+11
| | | | | | | | | | | | after recovery.
* | | Manual merge (again)konstantin@mysql.com2005-05-141-2/+10
|\ \ \ | |/ /
| * | row0mysql.c:heikki@hundin.mysql.fi2005-05-131-2/+10
| | | | | | | | | | | | InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607)
* | | After merge fixmarko@hundin.mysql.fi2005-05-061-0/+3
| | |
* | | Mergemarko@hundin.mysql.fi2005-05-064-22/+61
|\ \ \ | |/ /
| * | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2005-05-064-20/+61
| |\ \ | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/mysql-4.1
| | * | InnoDB: Truncate SHOW INNODB STATUS output at the start of the listmarko@hundin.mysql.fi2005-04-194-20/+61
| | | | | | | | | | | | | | | | of active transactions, if necessary and possible. (Bug #5436)
* | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-04-273-1/+27
|\ \ \ \ | |/ / / | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-5.0
| * | | dict0dict.c, dict0dict.h, fil0fil.c:heikki@hundin.mysql.fi2005-04-273-1/+27
| |/ / | | | | | | | | | Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names
| * | Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).jan@hundin.mysql.fi2005-04-181-18/+23
| | | | | | | | | | | | Backported from 5.0.3.
* | | Adding --innodb_fast_shutdown=2 which shuts down InnoDB faster than the ↵gbichot@quadita2.mysql.com2005-04-154-20/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-04-141-19/+51
|\ \ \ | |/ / | | | | | | into hundin.mysql.fi:/home/heikki/mysql-5.0
| * | fil0fil.c:heikki@hundin.mysql.fi2005-04-141-19/+51
| | | | | | | | | | | | Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
* | | Merge from 4.1jimw@mysql.com2005-04-132-13/+14
|\ \ \ | |/ /
| * | fil0fil.c:heikki@hundin.mysql.fi2005-04-131-1/+2
| | | | | | | | | | | | At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes
| * | row0sel.c:heikki@hundin.mysql.fi2005-04-131-12/+12
| | | | | | | | | | | | Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-04-135-18/+30
|\ \ \ | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| * \ \ Mergemskold@mysql.com2005-04-135-18/+30
| |\ \ \ | | |/ /
| | * | InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLEmarko@hundin.mysql.fi2005-04-125-18/+30
| | | | | | | | | | | | | | | | if foreign_key_checks=0. (Bug #9802)
* | | | row0sel.c:heikki@hundin.mysql.fi2005-04-131-10/+17
| | | | | | | | | | | | | | | | Fix the patch of Jan to optimize next-key locking in searches of type 'primary key >= some value'
* | | | Fixed a bug where next-key locking doesn't allow the insert which does jan@hundin.mysql.fi2005-04-131-0/+14
|/ / / | | | | | | | | | not produce phantom (bug #9354).
* | | manually mergedserg@serg.mylan2005-04-067-5/+57
|\ \ \ | |/ / | | | | | | | | | | | | Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and Bar's well_formed_len() changes in ndb code did not make it and should be re-applied manually
| * | InnoDB: Avoid test suite failures caused by a locking conflictmarko@hundin.mysql.fi2005-04-063-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | between two server instances at server shutdown/startup. This conflict on advisory locks appears to be the result of a bug in the operating system; these locks should be released when the files are closed, but somehow that does not always happen immediately in Linux. (Bug #9381)
| * | row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:heikki@hundin.mysql.fi2005-04-064-1/+27
| | | | | | | | | | | | Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context
* | | Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0joerg@mysql.com2005-04-061-0/+3
|\ \ \ | |/ /
| * | dict0dict.c:heikki@hundin.mysql.fi2005-04-051-0/+3
| | | | | | | | | | | | Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints
* | | InnoDB: Disable an assertion that fails on old data due to Bug #9526marko@hundin.mysql.fi2005-04-051-1/+3
| | |
* | | ha_innodb.cc, row0sel.c:heikki@hundin.mysql.fi2005-04-041-2/+6
| | | | | | | | | | | | Fix Bug #9526 in 5.0: MySQL ENUM and SET columns are internally actually unsigned integer types; we must take care that old tables still treat ENUM and SET (incorrectly) as a character string, while new created tables treat it correctly as an unsigned integer
* | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-222-1/+15
|\ \ \ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ Merge hundin.mysql.fi:/home/heikki/mysql-4.1heikki@hundin.mysql.fi2005-03-212-1/+15
| |\ \ \ | | |/ / | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-5.0
| | * | trx0trx.c:heikki@hundin.mysql.fi2005-03-211-1/+9
| | | | | | | | | | | | | | | | If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
| | * | Mergeheikki@hundin.mysql.fi2005-03-211-0/+6
| | |\ \ | | | |/
| | | * trx0trx.c, trx0trx.h:heikki@hundin.mysql.fi2005-03-212-1/+15
| | | | | | | | | | | | | | | | If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
* | | | Merge bk-internal:/home/bk/mysql-5.0serg@serg.mylan2005-03-181-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0
| * | | Automergeserg@serg.mylan2005-03-171-2/+3
| |\ \ \
| | * \ \ mergedserg@serg.mylan2005-03-161-2/+3
| | |\ \ \
| | | * | | sql/ha_innodb.ccserg@serg.mylan2005-03-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | data0type.h:heikki@hundin.mysql.fi2005-03-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The missing DATA_BINARY_TYPE in BLOBs created with < 4.0.14 does not cause any harm, because there were no indexes on such BLOBs
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change the sorting order of TEXT columns in InnoDB: pad with spaces at the end in comparisons; we MUST UPDATE the MySQL MANUAL to warn about the need to rebuild tables (also MyISAM) in certain cases in an upgrade to 5.0.3; TODO: study what complications the missing DATA_BINARY_TYPE flag in InnoDB < 4.0.14 causes: we would compare then also BLOBs with space padding, not just TEXT
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Revert the change to the space padding of BLOB and TEXT in comparisons; we cannot change the sorting order, because that would make old tables to appear corrupt; better to change LIKE 'a%' processing in MySQL, so that the lower end of the search interval would be 'a', not 'a '
* | | | | | data0type.ic:heikki@hundin.mysql.fi2005-03-171-1/+2
|/ / / / / | | | | | | | | | | | | | | | Fix that 'a' LIKE 'a%' was not true for an InnoDB BLOB or TEXT type column prefix index search: InnoDB assumed that the BLOB and TEXT should not be padded with space in comparisons; this bug is also in 4.1; it may have worked in 4.1 because MySQL may have asked there for strings >= 'a', while in 5.0 it asks for strings >= 'a '
* | | | | data0data.c:heikki@hundin.mysql.fi2005-03-161-3/+1
|/ / / / | | | | | | | | | | | | Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
* | | | data0type.h, row0sel.c:heikki@hundin.mysql.fi2005-03-162-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a crash in a simple search with a key: the dtype->len of a true VARCHAR is the payload maximum len in bytes: it does not include the 2 bytes MySQL uses to store the string length ha_innodb.cc: Fix a crash in true VARCHARs in test-innodb: we passed a wrong pointer to the column conversion in an UPDATE rowid_order_innodb.result, ps_3innodb.result, innodb.result, endspace.result: Edit InnoDB test results to reflect the arrival of true VARCHARs
* | | | DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or jan@hundin.mysql.fi2005-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | DATA_VARMYSQL so remove unnecessary condition.
* | | | Fixed a core dump bug after VARCHAR push in InnoDB.jan@hundin.mysql.fi2005-03-161-4/+10
| | | |
* | | | Many files:heikki@hundin.mysql.fi2005-03-169-271/+403
|/ / / | | | | | | | | | InnoDB true VARCHAR
View Lorry Controller Status