Commit graph

1132 commits

Author SHA1 Message Date
brian@avenger.(none)
2204098b4a Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-30 13:42:19 -08:00
marko@hundin.mysql.fi
2cb2461229 lock0lock.h:
Rename lock_table_exclusive to lock_is_table_exclusive
  (somehow this change was omitted from last changeset)
2004-11-30 23:10:17 +02:00
brian@avenger.(none)
5e71b5b266 Merge avenger.(none):/export/brian/mysql/merge/4.1
into avenger.(none):/export/brian/mysql/merge/5.0
2004-11-30 12:51:59 -08:00
serg@serg.mylan
8551a482e2 typo fixed 2004-11-30 21:17:03 +01:00
brian@avenger.(none)
b85f4677d5 Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
heikki@hundin.mysql.fi
ad8d9314e2 row0mysql.h, ha_innodb.cc:
Sergey Petrunia's ROR code fails to tell handlers that they should retrieve the primary key columns; let InnoDB ALWAYS retrieve them, to fix many bugs and potential bugs
2004-11-30 19:56:25 +02:00
marko@hundin.mysql.fi
d365446f62 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:52:30 +02:00
heikki@hundin.mysql.fi
12738cd23a lock0lock.c:
If UNIV_DEBUG is defined, lock_get_type() was called before function definition: fix this
2004-11-30 17:51:10 +02:00
marko@hundin.mysql.fi
b8028e6a0d Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:50:56 +02:00
heikki@hundin.mysql.fi
c7ed52456d row0sel.c:
Remove compiler warning as I had forgotten an include file
2004-11-30 17:48:30 +02:00
marko@hundin.mysql.fi
97406b377c Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-11-30 17:48:30 +02:00
marko@hundin.mysql.fi
a35a93aa3c InnoDB: Allow ALTER TABLE to do intermediate COMMIT also when the table
contains auto_increment columns.  (Bug #6633)
2004-11-30 17:34:37 +02:00
jan@hundin.mysql.fi
fb50b9e63c Auto merged. 2004-11-30 12:11:02 +02:00
jan@hundin.mysql.fi
97f59719b6 Added support for X/Open XA prepare, recover, commit and rollback. 2004-11-30 11:45:02 +02:00
serg@serg.mylan
b460059988 merged 2004-11-28 20:42:04 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
marko@hundin.mysql.fi
2e7cb4d011 InnoDB: Make intermediate COMMITs in ALTER TABLE more robust (Bug #6633) 2004-11-27 00:45:01 +02:00
tomas@poseidon.ndb.mysql.com
97c8234b46 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2004-11-26 13:44:49 +00:00
marko@hundin.mysql.fi
d58c186759 srv0srv.c:
srv_lock_timeout_and_monitor_thread(): write to srv_monitor_file
  only if --innodb_status_file=1
2004-11-26 13:16:37 +02:00
heikki@hundin.mysql.fi
ccec75f9af Many files:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
2004-11-26 00:12:50 +02:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
heikki@hundin.mysql.fi
bd6ccd46fc configure.in:
Fix linking error in 5.0: the build system for Linux/S390 does not have inlining working in the compiler; remove inlining on that system
2004-11-24 19:41:38 +02:00
serg@serg.mylan
a5ce45fc3d Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-11-22 22:58:34 +01:00
serg@serg.mylan
ee933cd198 merged 2004-11-22 21:33:15 +01:00
petr@mysql.com
47e6a7580f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final
2004-11-22 17:51:33 +03:00
petr@mysql.com
7c046c3c98 Fixed a problem with Innodb_buffer_pool_pages_latched status variable. 2004-11-22 17:50:42 +03:00
jan@hundin.mysql.fi
d12c354053 Fixed BUG #6747: innodb_locks_unsafe_for_binlog still uses next-key locking. 2004-11-22 10:34:29 +02:00
heikki@hundin.mysql.fi
7f5661ae44 trx0undo.c, trx0purge.c:
Print a warning to the .err log if the InnoDB history list length is > 20 000 even though purge reaches the list head; this is to track corruption reported on the MySQL mailing list Nov 9, 2004
lock0lock.c:
  Let SHOW INNODB STATUS print the history list length
2004-11-21 17:38:15 +02:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
heikki@hundin.mysql.fi
acc0317bb7 fil0fil.h, fil0fil.c:
Fix bug introduced in 4.1.1: InnoDB no longer respected the data file max size given in :autoextend:max:
2004-11-18 22:28:37 +02:00
marko@hundin.mysql.fi
766adf172b row0ins.c:
row_ins_scan_sec_index_for_duplicate(),
  row_ins_duplicate_error_in_clust():
  remove unused variables "ptr"
2004-11-18 17:01:33 +02:00
petr@mysql.com
890211a7c4 WL 2059 Engine-specific status variables framework and WL 1922
InnoDB status variables
2004-11-18 13:00:42 +03:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
brian@avenger.(none)
1d8a6a06a5 Merge avenger.(none):/export/brian/mysql/test/4.1
into avenger.(none):/export/brian/mysql/test/5.0
2004-11-11 22:12:01 -08:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
heikki@hundin.mysql.fi
38cae36c87 trx0purge.c:
Remove duplicated innodb max purge lag code
2004-11-11 21:17:44 +02:00
heikki@hundin.mysql.fi
d7eecc803d dict0dict.ic:
Fix a bug in InnoDB code that fortunately was never used: row id is stored in a record always as a 6-byte unsigned integer, in a 'non-compressed' form
2004-11-09 15:59:45 +02:00
monty@mysql.com
87af3d9113 merge on pull 2004-11-09 04:06:44 +02:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
jan@hundin.mysql.fi
a3f4bd28ac Fixed a bug in UPDATE statement with no index column in where condition
locks all rows (BUG #3300). When using innobase_locks_unsafe_for_binlog
option InnoDB does not take locks for those rows which do not
belong to the result set or werent changed by the query. This fix removes
unnecessary locks also from SELECT and DELETE queries.
2004-11-08 14:52:15 +02:00
marko@hundin.mysql.fi
21b9be3a19 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-11-04 18:25:48 +02:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
heikki@hundin.mysql.fi
13a60a7631 ibuf0ibuf.c:
Do not print to .err log about discarding ibuf entries in DISCARD TABLESPACE; removed compiler warning about unused variable
2004-11-04 00:10:00 +02:00
marko@hundin.mysql.fi
fd069e2bb3 InnoDB: commit after every 10000 rows in ALTER TABLE 2004-11-03 21:32:48 +02:00
marko@hundin.mysql.fi
b58cb6b50f InnoDB: fix bugs in the FOREIGN KEY parser (Bug #6340) 2004-11-03 14:56:48 +02:00
monty@mysql.com
f5c77f6a06 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-02 18:54:16 +02:00
heikki@hundin.mysql.fi
c0061627d8 dict0load.c:
Raise fatal semaphore wait timeout to 2 hours when we are printing the InnoDB table monitor output
2004-11-02 09:46:23 +02:00
monty@mysql.com
9972d68078 merge with 4.0 2004-11-02 08:58:45 +02:00
heikki@hundin.mysql.fi
d22a24d871 row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c:
Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
dict0dict.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name
2004-10-31 15:43:29 +02:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
monty@mysql.com
5b29f59aa8 Fixed access to freed memory 2004-10-27 21:56:17 +03:00
monty@mysql.com
3493f54a5e Merge with 4.0 2004-10-27 19:52:41 +03:00
heikki@hundin.mysql.fi
67456bb970 btr0sea.c, buf0lru.c, buf0buf.c, ha0ha.c, hash0hash.h, ha0ha.h, buf0buf.h:
Link adaptive hash index entries to the buffer page, so that we can remove them quickly without knowing the record structure on that page; this was requested by Marko for the compact InnoDB table format; note that the adaptive hash index memory overhead grows by 67 %, maybe we have to tune this later somehow
2004-10-27 15:45:10 +03:00
marko@hundin.mysql.fi
b5f49a3abd Backport innodb_max_purge_lag from 4.1 2004-10-27 13:33:11 +03:00
heikki@hundin.mysql.fi
a761a901b4 fil0fil.c:
Print to the .err log a more detailed error message if in IMPORT TABLESPACE the .ibd file does not exist
2004-10-26 20:47:23 +03:00
heikki@hundin.mysql.fi
3729ba7706 row0mysql.c:
Print more warnings to the .err log if ALTER TABLE ... IMPORT TABLESPACE fails for some reason
os0file.c:
  Do not call exit(1) if os_file_delete() fails; remove unused parameter from
handle_error_no_exit()

fil0fil.c:
  Allow DROP TABLE even if the .ibd file for the table does not exist
2004-10-26 20:29:11 +03:00
lenz@mysql.com
50ad015f26 - fixed typo in innobase/os/os0file.c that caused the Windows build to fail 2004-10-25 14:55:44 +02:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
2004-10-22 18:44:51 +03:00
monty@mysql.com
97b4a3415d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-22 14:59:59 +03:00
heikki@hundin.mysql.fi
dd1b2ace33 os0file.c:
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03:00
heikki@hundin.mysql.fi
215cd1e4a3 row0mysql.c, row0ins.c:
Fix bug #5961: release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
2004-10-22 00:25:57 +03:00
jan@hundin.mysql.fi
65a9dd2dca SHOW TABLE STATUS now prints create_time, update_time and check_time
for InnoDB tables. Note that these times may always be correct ones,
because for example ALTER TABLE creates a table again.
2004-10-21 14:57:43 +03:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
f9cd4a60e4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-20 15:14:06 +03:00
monty@mishka.local
7af65592c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-10-20 02:55:03 +03:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
2004-10-20 01:28:42 +03:00
heikki@hundin.mysql.fi
20ac420eb1 trx0rec.c:
test
2004-10-19 18:58:53 +03:00
heikki@hundin.mysql.fi
2fd67321e9 os0file.c:
InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
2004-10-19 14:44:14 +03:00
marko@hundin.mysql.fi
665e22eeae Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-19 11:00:02 +03:00
marko@hundin.mysql.fi
57f1f4ea41 InnoDB: Treat UTF-8 strings properly in case insensitive operations 2004-10-18 16:00:57 +03:00
heikki@hundin.mysql.fi
f687608e1c srv0srv.c:
If innodb_thread_concurrency would be exceeded, let a thread sleep 10 ms before entering the FIFO queue; previously, the value was 50 ms, which Peter Z considered too long
2004-10-18 15:00:39 +03:00
jan@hundin.mysql.fi
f45aacd9a3 Use already parsed SQL-query in the current thread when determining
was the query REPLACE or LOAD DATA INFILE REPLACE.
2004-10-15 11:28:19 +03:00
jan@hundin.mysql.fi
d07ade5579 This patch removes unnecessary lock from the supremum record, takes
X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.
2004-10-14 15:36:36 +03:00
heikki@hundin.mysql.fi
5fa601111e srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:
Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
2004-10-13 20:04:52 +03:00
marko@hundin.mysql.fi
ab316c36db InnoDB: correct potential overflow in trx_purge() 2004-10-13 11:29:57 +03:00
heikki@hundin.mysql.fi
af3681f2d9 trx0rec.c:
Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row
2004-10-09 14:13:40 +03:00
heikki@hundin.mysql.fi
0543320240 row0mysql.c:
If one tries to drop an InnoDB table without an .ibd file, print to .err log that we DID remove the table from the internal data dictionary of InnoDB, and return DB_SUCCESS so that MySQL will delete the .frm file; the drawback in this is that then DROP TABLE returns success, and the user is not alerted; maybe it could return a warning
2004-10-08 23:52:25 +03:00
monty@mysql.com
73e4a41103 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-10-08 16:40:00 +03:00
monty@mysql.com
8d73628d88 Merge 2004-10-08 15:43:27 +03:00
heikki@hundin.mysql.fi
67ce68acb9 row0sel.c, row0row.c:
Fix bug #5975 about UTF-8 chars and prefix indexes; do not print warnings if a column prefix is > 255 bytes
2004-10-08 15:25:59 +03:00
heikki@hundin.mysql.fi
89ecfd7fa6 Many files:
Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
2004-10-07 20:53:20 +03:00
marko@hundin.mysql.fi
badf8e715a InnoDB: tolerate system clock glitches a little better
in the error monitor thread.  (Bug #5898)
2004-10-07 15:58:47 +03:00
joerg@mysql.com
a9fc6cfd31 Correct an 'unresolved identifier' problem caused by an "inline"
function being used before it was defined - "forward" declaration
was insufficient.
2004-10-07 12:02:22 +02:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
heikki@hundin.mysql.fi
5d2492c855 dict0mem.h:
Fix typos in previous push
2004-10-05 19:22:13 +03:00
heikki@hundin.mysql.fi
3985d58ad2 ha_innodb.cc:
Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum); add comments about why innobase_get_at_most_n_mbchars() works ok
dict0mem.h:
  Raise maximum column prefix len to 767 bytes, so that MySQL can create a column prefix index of 255 UTF-8 characters (each takes 3 bytes at the maximum)
row0mysql.c:
  If MySQL tries to create a column prefix index longer that 255 UTF-8 characters, give an error, and drop the table from the InnoDB internal data dictionary. MySQL did not drop the table there in its own error handling.
2004-10-05 17:08:22 +03:00
marko@hundin.mysql.fi
d4b3df6d31 InnoDB: Fix ALTER TABLE t DISCARD TABLESPACE (Bug #5851) 2004-10-04 20:38:23 +03:00
heikki@hundin.mysql.fi
e7500f435f lock0lock.c:
Fix compiler warning
2004-10-04 19:48:41 +03:00
marko@hundin.mysql.fi
d5728b91bb InnoDB: make ALTER TABLE to work on table names containing '#' (Bug #5856) 2004-10-04 16:24:37 +03:00
heikki@hundin.mysql.fi
8e8b34b1af fsp0fsp.h:
Remove accidentally pushed fsp debug code
2004-10-01 20:05:30 +03:00
heikki@hundin.mysql.fi
1390ce0f75 Many files:
Fix bug introduced by the prefix key + multibyte charsets patch today
2004-10-01 20:01:25 +03:00
marko@hundin.mysql.fi
76cda983a9 Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-10-01 14:17:05 +03:00
marko@hundin.mysql.fi
d7ea8e7c6c InnoDB: quote identifiers according to MySQL settings (Bug #5292) 2004-10-01 11:51:59 +03:00
marko@hundin.mysql.fi
1bd65d7715 InnoDB: implement innodb_max_purge_lag 2004-09-30 15:54:19 +03:00
rburnett@build.mysql.com
6ba5a57009 os0file.c:
Added #ifdef around is_set in os_aio_print
2004-09-23 17:53:46 +02:00
jan@hundin.mysql.fi
762c24f29a Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-16 21:32:05 +03:00
heikki@hundin.mysql.fi
6083e00d73 dict0dict.h, dict0dict.c, row0row.c, pars0opt.c:
Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()
2004-09-16 20:50:24 +03:00
heikki@hundin.mysql.fi
fd7dde7caf sync0arr.c:
Correct the comment on the 'waiting' field in sync_cell_struct
2004-09-13 20:08:09 +03:00
heikki@hundin.mysql.fi
d6b4c4f90e row0mysql.h:
Improve the comment on stored_select_lock_type
ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.
2004-09-13 19:05:39 +03:00
heikki@hundin.mysql.fi
4c7c2343c7 os0file.c:
Add more precise diagnostics about the state of the I/O threads of InnoDB; print in SHOW INNODB STATUS if the event wait semaphore of each I/O thread is set
2004-09-11 09:37:16 +03:00
marko@hundin.mysql.fi
fd17beb0d9 dict0dict.c:
Fixed typo
2004-09-10 13:44:06 +03:00
marko@hundin.mysql.fi
7a845e43ad InnoDB: Update links to the user manual 2004-09-08 14:24:13 +03:00
marko@hundin.mysql.fi
934a5c0b99 InnoDB: Add configuration option innodb_autoextend_increment 2004-09-07 16:26:38 +03:00
monty@mysql.com
31122efde7 Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0)
2004-09-06 15:14:10 +03:00
heikki@hundin.mysql.fi
b3325a06d1 srv0start.c:
Fix bug #5414 in 4.1: srv_max_n_threads was always set to only 1000, regardless of the buffer pool size; undelr very high concurrent loads this could cause an assertion failure in sync0arr.c line 384 when we ran out of wait slots for threads; also innodb_thread_concurrency did not work, because the wait queue also there overflowed at 1000 concurrent threads; also remove redundant code
trx0undo.c:
  Add a missing newline to fprints
2004-09-06 13:01:29 +03:00
jan@hundin.mysql.fi
c794ace161 Fixed copy-paste bug introduced on patch (jan:1.1960). 2004-09-03 16:50:13 +03:00
jan@hundin.mysql.fi
a48db602dd Fixed unique prefix key bug for multibyte character sets (BUG #4521) for
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
2004-09-03 15:26:29 +03:00
jan@hundin.mysql.fi
9253e5ccfd Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-09-03 08:23:16 +03:00
heikki@hundin.mysql.fi
290443298a srv0start.c:
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
2004-09-02 20:06:25 +03:00
marko@hundin.mysql.fi
09f3166267 row0mysql.c:
row_drop_table_for_mysql(): Removed duplicated block of code.
2004-09-01 14:04:17 +03:00
jan@hundin.mysql.fi
35849854df Fixed unique prefix key bug for multibyte character sets (BUG #4521) for
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
2004-08-31 10:37:03 +03:00
jan@hundin.mysql.fi
4b6c341bb0 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-08-30 08:30:21 +03:00
serg@serg.mylan
b4bb38e896 merged 2004-08-26 15:19:46 +02:00
heikki@hundin.mysql.fi
852181a21e buf0rea.c:
Fix bug: if there was little file I/O in InnoDB, but the insert buffer was used, it could happen that 'Pending normal aio reads' was bigger than 0, but the I/O handler thread did not get waken up in 600 seconds. This resulted in a hang, and crashing of InnoDB.
2004-08-24 20:17:23 +03:00
jan@hundin.mysql.fi
9cae7b0885 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-08-19 11:37:46 +03:00
serg@serg.mylan
e1237cbc53 manually merged 2004-08-18 19:57:55 +02:00
heikki@hundin.mysql.fi
6feb6ea545 srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
  Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com, polished a little by Heikki Tuuri)
2004-08-18 01:48:01 +03:00
jan@hundin.mysql.fi
656a376285 Relaxed lock wait rules so that record lock does not need to wait for a
gap type lock.
2004-08-17 09:45:54 +03:00
heikki@hundin.mysql.fi
5273b4e5f5 row0mysql.c:
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
2004-08-13 17:27:58 +03:00
jan@hundin.mysql.fi
7e7a22d049 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-08-13 08:32:57 +03:00
jan@hundin.mysql.fi
38255a2cad This change includes optimization for a lock wait rules and a new behaviour for
a REPLACE command.
2004-08-12 13:38:10 +03:00
marko@hundin.mysql.fi
d9ead8a11e InnoDB: Make UNIV_LOG_DEBUG work 2004-08-11 16:04:37 +03:00
jan@hundin.mysql.fi
664cce3f3c Take X-lock for duplicate keys in REPLACE command. 2004-08-11 13:01:30 +03:00
marko@hundin.mysql.fi
61c509fbd7 os0file.c:
os_file_create_tmpfile(): display errno in case of failure
2004-08-10 16:11:34 +03:00
marko@hundin.mysql.fi
cd6292d219 InnoDB: Use create_temp_file() when available 2004-08-10 14:17:32 +03:00
marko@hundin.mysql.fi
b9a8ce1b20 row0mysql.c:
row_drop_table_for_mysql(): Removed a ut_ad() assertion that failed
  when a DROP TABLE is executed in the background.
2004-08-09 15:38:40 +03:00
marko@hundin.mysql.fi
3cb09c9817 InnoDB: Add option for disabling innodb_status.<pid> files.
InnoDB: Implement tmpfile() differently on Windows (Bug #3998)
2004-08-06 15:55:50 +03:00
marko@hundin.mysql.fi
2f3e628649 dyn0dyn.h:
dyn_array_open(): mention the size limit
mtr0log.ic, mtr0log.h:
  mlog_open(): mention the size limit
2004-08-02 13:02:34 +03:00
marko@hundin.mysql.fi
f283baade6 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-07-30 17:37:43 +03:00
marko@hundin.mysql.fi
b435b8d47e fil0fil.c:
Restore accidentally deleted comment of fil_create_directory_for_tablename()
2004-07-30 17:04:56 +03:00
heikki@hundin.mysql.fi
fe784f4962 row0sel.c, page0page.ic:
Add still more diagnostic code to track buffer pool corruption in one AMD64/Linux computer
2004-07-30 17:02:26 +03:00
marko@hundin.mysql.fi
c4ee1bcc10 dict0crea.c:
Restore accidentally deleted comment to dict_create_sys_tables_tuple()
2004-07-30 16:58:25 +03:00
heikki@hundin.mysql.fi
fb0b02415c buf0flu.c, os0file.c:
Add more diagnostic code to determine when an lsn field gets corrupt; tracks a crash reported from one Itanium computer
2004-07-27 19:14:50 +03:00
heikki@hundin.mysql.fi
1b7334c4c0 row0sel.c, page0page.ic:
Add diagnostic code to print hex dumps and track corruption of next record offsets in an index page
2004-07-27 09:00:17 +03:00
jan@hundin.mysql.fi
3ca686c5fb Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2004-07-21 08:52:12 +03:00
serg@serg.mylan
8d080cbcfa manual merge 2004-07-20 15:34:57 +02:00
jan@hundin.mysql.fi
0449396a67 Added innodb_locks_unsafe_for_binlog option. This option turns off Innodb
next-key locking. Using this option the locks InnoDB sets on index 
  records do not affect the ``gap'' before that index record. Thus, this option
  allows phantom problem.
2004-07-20 14:15:38 +03:00
serg@serg.mylan
1f0cd873c5 manual merged (blame me!) 2004-07-20 00:53:24 +02:00
marko@hundin.mysql.fi
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE
(Bug #4446)
2004-07-15 15:46:22 +03:00
heikki@hundin.mysql.fi
0614f8c718 btr0cur.c:
Do not add + 1 to the InnoDB index cardinality estimate if the B-tree just contains one page; the fix made in March 2004 caused InnoDB systematically to overestimate the cardinality of empty or small tables by 1
2004-07-15 09:08:51 +03:00
marko@hundin.mysql.fi
b92d70b231 lock0lock.c:
Decrement n_lock_table_exp in lock_table_remove_low()
  instead of lock_table_dequeue().
  Do not empty lock_heap in lock_release_tables_off_kernel().
2004-07-13 12:30:34 +03:00
marko@hundin.mysql.fi
88369368f5 InnoDB: LOCK TABLES clean-up, part 2 2004-07-12 17:14:13 +03:00
marko@hundin.mysql.fi
a323342728 InnoDB: LOCK TABLE clean-up 2004-07-12 16:47:22 +03:00
marko@hundin.mysql.fi
bea2f4305e InnoDB: Increment the lock wait watchdog timeout during CHECK TABLE
(Bug #2694)
2004-07-12 15:13:18 +03:00
marko@hundin.mysql.fi
74f3da33bf srv0start.c:
innobase_start_or_create_for_mysql(): Rename innodb.status.<pid>
  to innodb_status.<pid> to avoid problems on VMS
2004-07-12 14:12:53 +03:00
monty@mysql.com
1e31199995 Merge with 4.1.3-beta 2004-07-07 11:29:39 +03:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
guilhem@mysql.com
bccf57fbb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-23 23:52:49 +02:00
marko@hundin.mysql.fi
5abd76355e lexyy.c, pars0lex.l:
Document the handling of quoted strings
2004-06-22 16:15:58 +03:00
marko@hundin.mysql.fi
4fc8a45126 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-21 11:06:45 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
2004-06-21 10:21:20 +03:00
guilhem@mysql.com
f5d6424487 Robustness feature.
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
2004-06-20 19:11:02 +02:00
heikki@hundin.mysql.fi
3cd6299b22 mem0dbg.c:
InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable
2004-06-19 12:12:00 +03:00
marko@hundin.mysql.fi
45bc431267 mach0data.ic, mach0data.h:
Improve documentation of mach_*write_*compressed()
mtr0log.ic, mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()
2004-06-18 15:54:19 +03:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173)
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
2004-06-18 03:02:29 +03:00
heikki@hundin.mysql.fi
c98bfe12c6 mem0dbg.h, mem0dbg.c:
Put back mem_print_info() functions that are used to analyze memory leaks; Marko removed them by accident in his Feb 20th, 2004 patch; these functions are very important for debugging, and should always be kept in the source code base
2004-06-17 17:30:33 +03:00
heikki@hundin.mysql.fi
3c4597e14b que0que.c, srv0que.c:
Put asserts that make sure srv_que_task_enqueue() is never called under MySQL
2004-06-17 16:05:19 +03:00
heikki@hundin.mysql.fi
0e3c22ea17 log0recv.c:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
2004-06-17 15:13:27 +03:00
heikki@hundin.mysql.fi
a460d438d8 log0log.h:
Revert the patch that put log debug code behind UNIV_LOG_DEBUG
log0log.ic, log0recv.c, log0log.c, log0log.h:
  Revert 1.1730.18.1 about UNIV_LOG_DEBUG: debug code is often needed in debugging the production version
2004-06-17 15:11:37 +03:00
heikki@hundin.mysql.fi
af35718074 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040316101802|63386 2004-06-17 14:01:56 +03:00
heikki@hundin.mysql.fi
15dccebb0f Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613 2004-06-17 13:25:06 +03:00
heikki@hundin.mysql.fi
3b96c95fdf srv0que.c:
Revert Marko's untested changeset 1.1844.1.6 to the stable 4.0 version; stable 4.0 must NOT BE modified except in case of bugs
srv0que.c, srv0que.h:
  new file
2004-06-17 12:35:04 +03:00
heikki@hundin.mysql.fi
bfb0e28499 Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040525171209|56870 2004-06-17 11:57:45 +03:00
heikki@hundin.mysql.fi
79fd0c68d3 fil0fil.c:
Remove the use of mem_realloc in fil0fil.c; mem_realloc() was broken and the patch to remove its definition will propagate from the 4.0 tree; crash recovery with innodb_file_per_table has to be tested after this patch, not tested yet
2004-06-17 00:21:41 +03:00
heikki@hundin.mysql.fi
8ff57ee469 ut0mem.c:
Remove printf's that were accidentally pushed in the last push
2004-06-16 23:46:47 +03:00
heikki@hundin.mysql.fi
0aa9e45e64 ut0mem.h, ut0mem.c:
Implement ut_realloc
lexyy.c, pars0lex.l:
  Start using ut_malloc, ut_free, ut_realloc in pars0lex.l and lexyy.c; mem_realloc was broken; eliminate possible memcpy(NULL, ..., 0) from string_append()
2004-06-16 23:42:58 +03:00
heikki@hundin.mysql.fi
4a7b9fda98 mem0mem.ic, mem0mem.h:
Remove broken mem_realloc(); a patch to remove its uses in pars0lex.l and fil0fil.c will soon follow
2004-06-16 20:24:35 +03:00
marko@hundin.mysql.fi
30606486e7 InnoDB bug fix: mem_realloc() didn't preserve the block contents 2004-06-16 17:22:35 +03:00
marko@hundin.mysql.fi
d2724e66db InnoDB: Revert most of ChangeSet@1.1772, as the debug functions may
be needed when testing production releases
2004-06-16 13:41:14 +03:00
heikki@hundin.mysql.fi
6d197336ed row0ins.c:
Return the code of row_ins_foreign_check_on_constraint() as close to 4.0 as possible, except that we use mem_strdup() to allocate the memory for the modified table name
2004-06-16 04:08:07 +03:00
marko@hundin.mysql.fi
dfc36c886c InnoDB: fix bug in call to innobase_invalidate_query_cache(),
introduced in ChangeSet@1.1843.1.25
InnoDB: fix bug in the error exit of
  fil_create_new_single_table_tablespace(), introduced in
  ChangeSet@1.1843.1.11
2004-06-16 01:55:24 +03:00
marko@hundin.mysql.fi
3af839f45a InnoDB bug fix (row0mysql.c): make reserved table names innodb_* special again 2004-06-15 22:09:09 +03:00
sergefp@mysql.com
ee0a516ccd Manual merge 2004-06-14 11:18:56 +04:00
monty@mysql.com
8b2a735563 Portability fixes (and a typo after last merge) 2004-06-04 11:02:35 +03:00
heikki@hundin.mysql.fi
347a21e118 fil0fil.c:
Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
2004-06-03 17:31:46 +03:00
heikki@hundin.mysql.fi
0dced9ea3b os0file.c, fil0fil.c:
Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
2004-06-03 17:02:37 +03:00
heikki@hundin.mysql.fi
8dae598aa2 fil0fil.c:
Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
2004-06-02 18:19:28 +03:00
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-02 12:14:36 +03:00
monty@mysql.com
e6c5715126 after merge fixes 2004-06-02 12:13:49 +03:00
marko@hundin.mysql.fi
82475cfb76 InnoDB cleanup: Remove debug function
cmp_debug_dtuple_rec_with_match()
unless #ifdef UNIV_DEBUG
2004-06-02 11:12:04 +03:00
heikki@hundin.mysql.fi
a106806324 fil0fil.c:
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
2004-06-02 08:44:08 +03:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
heikki@hundin.mysql.fi
aac5c88bcd row0mysql.c, row0mysql.h, ha_innodb.cc:
Inside LOCK TABLES, use either LOCK_S or LOCK_X in locking reads; an improvent over the previous patch
2004-06-01 19:19:48 +03:00
marko@hundin.mysql.fi
a5d8f243a9 InnoDB: os0file.c:
Do not lock raw devices or files opened for read only
2004-06-01 17:30:46 +03:00
heikki@hundin.mysql.fi
59e44ff8d8 fil0fil.c:
Add missing newlines in fprintfs
2004-06-01 16:41:13 +03:00
marko@hundin.mysql.fi
2b2e7e4580 InnoDB cleanup: Fix potential buffer overflows,
allow deletion of tablespaces whose names contain "'"
2004-06-01 15:19:09 +03:00
sergefp@mysql.com
5843eec521 Manual merge 2004-05-29 20:55:46 +04:00
marko@hundin.mysql.fi
fb9257dc45 InnoDB: Add diagnostics when tmpfile() fails at start (Bug #3919) 2004-05-28 11:15:59 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
33dcccb5bf Portability fix for HPUX 2004-05-28 02:00:34 +03:00
marko@hundin.mysql.fi
fc85c80b88 InnoDB cleanup:
Disable log archiving code unless #ifdef UNIV_LOG_ARCHIVE
Remove (char*) casts of string constants; add const qualifiers
Remove some Hot Backup code unless #ifdef UNIV_HOTBACKUP
2004-05-27 15:27:43 +03:00
monty@mysql.com
3ad2158b42 Portability fixes 2004-05-27 12:03:16 +03:00
monty@mysql.com
61a6557307 merge with 4.0 to get windows fixes 2004-05-27 00:30:28 +03:00
marko@hundin.mysql.fi
9e983e629e InnoDB fixup: remove debug assertion that causes compile error
when UNIV_DEBUG is defined (introduced in ChangeSet@1.1850)
2004-05-26 19:41:14 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03:00
marko@hundin.mysql.fi
9a5dafba83 InnoDB cleanup: Remove unused code for online backup 2004-05-26 10:45:37 +03:00
monty@mysql.com
390d9898f9 merge with 4.0 to get Netware patches and fixes for libmysqld.dll 2004-05-25 22:54:00 +03:00
marko@hundin.mysql.fi
7ee9540976 InnoDB cleanup and possible bug-fix: Remove srv0que 2004-05-25 20:12:09 +03:00
monty@mysql.com
af44187bff Merge with 4.0 to get fixes for Windows project files 2004-05-25 02:47:25 +03:00
monty@mysql.com
0babddff40 New MYSQL_SERVER_SUFFIX usage (for easier compilation)
Update of VC++ project files.
2004-05-25 02:28:44 +03:00
marko@hundin.mysql.fi
86d011dfee InnoDB cleanup: sync0arr.c: sync_array_cell_print(): Remove unused variable str 2004-05-24 15:43:34 +03:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536 After merge fixes
Remove compiler warnings
Update windows project files
2004-05-24 14:42:34 +03:00
marko@hundin.mysql.fi
40711b570a InnoDB cleanup: Remove unused functions ut_sprintf() and ut_fprintf() 2004-05-20 01:32:02 +03:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
monty@mysql.com
86a966256b Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.
2004-05-19 16:38:12 +03:00
heikki@hundin.mysql.fi
0189d5afe8 mem0pool.c:
Fix a memory corruption bug: in 32-bit computers, every 4 billionth malloc outside innodb_additional_mem_pool_size was mistreated when freeing the memory; this could corrupt the InnoDB additional mem pool and could have caused crashes anywhere, also inside MySQL, or even database corruption! the bug exists also in 3.23 and 4.1; workaround: configure innodb_additional_mem_pool_size big enough
2004-05-18 01:53:06 +03:00
heikki@hundin.mysql.fi
7ff94b3808 dict0dict.c:
Allocate the table name buffer from the mem heap of a foreign key object rather than pointing to the name buffer in the table object; even though this apparently caused no bugs in RENAME, DROP, ALTER TABLE, or elsewhere, this convention was very prone to memory allocation bugs
2004-05-17 17:27:25 +03:00
marko@hundin.mysql.fi
de76ef323a InnoDB: srv0srv.c: Remove reference to sync0ipm.h (fix ChangeSet@1.1833) 2004-05-17 16:19:55 +03:00
marko@hundin.mysql.fi
e58b9c62fb InnoDB cleanup: Remove unused function ut_printf() 2004-05-17 14:51:46 +03:00
marko@hundin.mysql.fi
03f19377a9 InnoDB cleanup: Add const qualifiers to many char* arguments 2004-05-17 14:40:31 +03:00
marko@hundin.mysql.fi
e6fb3e3531 InnoDB: Remove unused module sync0ipm 2004-05-17 11:11:26 +03:00
marko@hundin.mysql.fi
521c1983ee InnoDB: Remove unused module os0shm 2004-05-17 10:49:01 +03:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
marko@hundin.mysql.fi
a5cca9df64 InnoDB cleanup: eliminate IB__FILE__ 2004-05-14 16:06:21 +03:00
marko@hundin.mysql.fi
3c87eda7ee InnoDB: ut0mem: Remove ut_str_catenate(), add const qualifiers 2004-05-14 14:23:46 +03:00
marko@hundin.mysql.fi
3a9e590166 InnoDB: Disable file locking on FreeBSD 2004-05-14 14:11:13 +03:00
marko@hundin.mysql.fi
b4ae2577f0 InnoDB: Remove unused function ut_str_catenate() 2004-05-14 12:26:12 +03:00
heikki@hundin.mysql.fi
d2649c110a ha_innodb.cc, trx0trx.h, lock0lock.c, trx0trx.c:
Reserve the MySQL LOCK_thread_count mutex when printing thd->query of
an arbitrary transaction; if we are printing thd->query of a transaction that
we know is currently executing inside InnoDB, then we know that MySQL cannot
meanwhile change thd->query, and no need to reserve the MySQL mutex; note
that this patch still leaves open the possibility of races in MySQL's
thd->query_len
2004-05-13 22:07:51 +03:00
marko@hundin.mysql.fi
bd8901fd73 InnoDB: fixed bug in dict0dict.c: dict_index_name_print() 2004-05-13 15:51:02 +03:00
marko@hundin.mysql.fi
c838192066 InnoDB: Remove os_file_lock() from the 4.0 tree (unfix Bug #3608) 2004-05-13 15:28:56 +03:00
sergefp@mysql.com
3b29cad05c Manual merge 2004-05-13 01:49:47 +04:00
sergefp@mysql.com
a46d7542c9 This is first cset for WL#1394 "Optimize index merge when all involved index ranges include only values with equal keys"
The main idea is to exploit the fact that key scans for "key=const" return ordered sequences of rowids.
2004-05-13 01:38:40 +04:00
marko@hundin.mysql.fi
ecdac0a326 eval0eval.c:
Backport suppression of MSVC++ warning from 4.1
2004-05-12 10:40:04 +03:00
marko@hundin.mysql.fi
05a716a75f InnoDB: Replace ut_strdup() with mem_strdup() 2004-05-11 12:51:42 +03:00
marko@hundin.mysql.fi
981f6ef979 InnoDB: Changed bug reporting address to http://bugs.mysql.com 2004-05-11 11:05:02 +03:00
marko@hundin.mysql.fi
d48d5681c8 InnoDB: Fix assertion failure for orphaned tables in DROP DATABASE 2004-05-10 17:15:29 +03:00
marko@hundin.mysql.fi
c066b3022e Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 2004-05-07 12:13:45 +03:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
marko@hundin.mysql.fi
d15b0b577d InnoDB portability fix: new function os_file_set_eof() 2004-05-05 15:54:28 +03:00
marko@hundin.mysql.fi
fc7ae6a222 InnoDB: Truncate "<datadir>/innodb.status.<pid>" to its actual size
(Bug #3596)
2004-05-05 11:50:58 +03:00
marko@hundin.mysql.fi
09fc359480 InnoDB: os0file.c: Lock files exclusively (Bug #3608) 2004-05-05 11:40:17 +03:00
guilhem@mysql.com
6a6d5ef75e trying to remove Windows compiler warnings (Miguel, could you please check if it's better now?) 2004-05-03 23:35:11 +02:00
marko@hundin.mysql.fi
8ab135a71c Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-05-03 10:43:05 +03:00
marko@hundin.mysql.fi
a490b95b04 InnoDB: implement LOCK TABLE (Bug #3299) 2004-04-29 16:42:33 +03:00
lenz@mysql.com
7901fca494 - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)
2004-04-29 14:48:49 +02:00
monty@mysql.com
35579a2acb Portability fix (for AIX) 2004-04-29 13:18:20 +03:00
marko@hundin.mysql.fi
acb54a243e InnoDB: make UNIV_SYNC_DEBUG useable again 2004-04-28 17:03:26 +03:00
monty@mishka.local
e9cfe01db0 After merge fixes
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
heikki@hundin.mysql.fi
7d3e633edc ha_innodb.cc, sync0sync.h, sync0sync.c:
Use only noninlined InnoDB functions in ha_innodb.cc
2004-04-09 22:18:18 +03:00
marko@hundin.mysql.fi
9dec81b89c InnoDB: Fix a preprocessor error introduced in ChangeSet 1.1772 2004-04-08 10:47:38 +03:00
marko@hundin.mysql.fi
253bf9861b InnoDB: Remove debug functions unless #ifdef UNIV_DEBUG 2004-04-07 14:19:26 +03:00
marko@hundin.mysql.fi
6af38c65be InnoDB: send diagnostic output to stderr or files
instead of stdout or fixed-size memory buffers
2004-04-06 16:14:43 +03:00
marko@hundin.mysql.fi
f7f8efc263 InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.x 2004-04-05 15:40:56 +03:00
marko@hundin.mysql.fi
23a5fc5558 InnoDB: ignore intra-database foreign key references between tables
when dropping database (Bug #3058)
2004-04-02 16:25:48 +03:00
marko@hundin.mysql.fi
cfae16667e InnoDB: Handle quotes properly in the InnoDB SQL parser 2004-04-02 11:58:54 +03:00
marko@hundin.mysql.fi
4da72c2eb1 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/j/mysql-4.0
2004-04-01 16:54:22 +03:00
marko@hundin.mysql.fi
e00bf40360 InnoDB cleanup: fixing buffer overflows and quoting of quotes 2004-04-01 16:51:34 +03:00
heikki@hundin.mysql.fi
a169bfa6ae fil0fil.c, os0file.c, srv0srv.h, srv0srv.c:
Add an accessor function to set srv_io_thread_op_info, change the type to const char*, also change the type of srv_io_thread_function to const char*
2004-04-01 09:18:32 +03:00
heikki@hundin.mysql.fi
f30da8edd5 fil0fil.c:
Add assertions to check that we do not go out of bounds of io thread status array
os0file.c:
  Fix memory corruption (assertion failure on line 244 of sync0sync.c) reported by Miguel in a Windows build of MySQL-4.1.2. The bug is present in all InnoDB versions in Windows, but it depends on how the linker places a static array in srv0srv.c, whether the bug shows itself. 4 bytes were overwritten with a pointer to a statically allocated string: 'get windows aio return value'.
2004-03-31 18:06:13 +03:00
marko@hundin.mysql.fi
7f1f7b9391 InnoDB: cleanup of B-tree cursor operations 2004-03-31 11:40:07 +03:00
marko@hundin.mysql.fi
7f2a007496 InnoDB: Remove ut_str_contains() and replace it with strchr() 2004-03-31 11:26:56 +03:00
marko@hundin.mysql.fi
16ac732cb9 InnoDB: Remove unused hash table code and parameters 2004-03-31 10:58:50 +03:00
marko@hundin.mysql.fi
3476db87a0 InnoDB: Remove unnecessary code, mostly related to stored procedures 2004-03-31 10:30:14 +03:00
marko@hundin.mysql.fi
80c37f6a92 InnoDB: parse CONSTRAINT FOREIGN KEY correctly (Bug #3332) 2004-03-30 17:26:20 +03:00
heikki@hundin.mysql.fi
86569695f7 mem0dbg.c:
Backport from 4.1: make mem_current_allocated_memory global variable
2004-03-26 17:49:02 +02:00
heikki@hundin.mysql.fi
d1622a941d mem0dbg.c:
Let mem_current_allocated_memory be a global variable, because it is used in an .ic file if UNIV_MEM_DEBUG is defined
2004-03-26 17:46:27 +02:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
heikki@hundin.mysql.fi
035778d631 sync0sync.c:
Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically
2004-03-22 18:11:13 +02:00
heikki@hundin.mysql.fi
d22f36cdfd sync0sync.c:
Fix typo __NETWARE --> __NETWARE__ in mutex creation
2004-03-22 18:06:26 +02:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
heikki@hundin.mysql.fi
a8da91f9fb btr0btr.c:
Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
2004-03-20 06:09:18 +02:00
heikki@hundin.mysql.fi
c9bbc83d11 btr0btr.c:
Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
2004-03-19 22:51:25 +02:00
monty@mysql.com
933278a52b merge with 4.0 (to get compiler error fixes for innodb) 2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0 Portability fixes
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
heikki@hundin.mysql.fi
fd15536808 trx0undo.h, trx0undo.c, trx0trx.c:
Update an obsolete comment about trx commit: we can no longer call trx_undo_update_cleanup_by_discard(), and actually, the idea to call it was erroneous, it cannot work
2004-03-18 14:57:22 +02:00
heikki@hundin.mysql.fi
2b16cf783f os0file.c:
Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i
2004-03-18 08:26:49 +02:00
monty@mysql.com
19d0a60eca Don't change server suffix if given to configure
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
heikki@hundin.mysql.fi
e8efe9c32a Many files:
Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
2004-03-17 19:37:48 +02:00
monty@mysql.com
f9ad650490 merge with 4.0 2004-03-17 10:36:12 +02:00
monty@mysql.com
44667503b7 After merge fixes 2004-03-17 10:30:40 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
heikki@hundin.mysql.fi
a472dea224 ut0mem.h, ut0mem.c:
Add ut_strdup
os0file.h, os0file.c:
  Add creation of directories
2004-03-16 20:55:49 +02:00
marko@hundin.mysql.fi
e39030c027 InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined 2004-03-16 18:55:44 +02:00
marko@hundin.mysql.fi
20b6863c9a InnoDB: Make btr_cur_unmark_extern_fields() a static function 2004-03-16 15:26:33 +02:00
marko@hundin.mysql.fi
38ae7128f9 InnoDB: Remove unused directory "cry" 2004-03-16 12:48:17 +02:00
marko@hundin.mysql.fi
625c310b5a InnoDB: remove debug code from non-debug version 2004-03-16 12:18:02 +02:00
marko@hundin.mysql.fi
2c0cabd984 InnoDB: Remove log debug code when UNIV_LOG_DEBUG is not defined 2004-03-16 11:48:20 +02:00
marko@hundin.mysql.fi
9ed26f721d InnoDB: Replace ut_a(0) with ut_error 2004-03-13 22:48:00 +02:00
marko@hundin.mysql.fi
27243b2b08 InnoDB: disable unreachable debug functions unless #ifdef UNIV_MEM_DEBUG 2004-03-12 23:26:13 +02:00
marko@hundin.mysql.fi
6e57e23b9c InnoDB: remove redundant functions mach_write() and mach_read() 2004-03-12 22:55:46 +02:00
marko@hundin.mysql.fi
9287264b6b Remove constant parameter MLOG_8BYTES from mtr_read_dulint() and mlog_write_dulint() 2004-03-12 17:44:25 +02:00
marko@hundin.mysql.fi
4573eb566c Allow UNIV_SYNC_DEBUG to be disabled while UNIV_DEBUG is enabled 2004-03-12 17:14:51 +02:00
lenz@kallisto.local
7765418e3c - added AC_PROG_LIBTOOL to innobase/configure.in to be able to compile
MySQL with InnoDB on IBM AIX 5.2 in 64bit mode (which requires a special
   AR flag)
2004-03-12 15:42:26 +01:00
marko@hundin.mysql.fi
c8d6a195dc Replace ut_anp with ut_a 2004-03-12 13:46:26 +02:00
marko@hundin.mysql.fi
5b5d749294 More consistent handling of magic numbers 2004-03-11 23:12:02 +02:00
marko@hundin.mysql.fi
5aeab393af Remove remaining references to the built-in ODBC driver of InnoDB 2004-03-11 16:36:19 +02:00
marko@hundin.mysql.fi
a68a1ed0ca Remove unneeded module "com" 2004-03-11 12:55:28 +02:00
heikki@hundin.mysql.fi
0a0e981220 sync0arr.c, os0file.h:
Print always the count of pending pread() and pwrite() calls if there is a long semaphore wait
2004-03-11 10:38:37 +02:00
heikki@hundin.mysql.fi
9d6f8a7b88 data0data.c:
Do not test a magic number with =, use == instead :)
2004-03-11 10:26:08 +02:00
heikki@hundin.mysql.fi
4f601cd9ef buf0lru.c:
Add typecasts to ulong because ulint is __int64 in Win 64-bits
  Better error message to the .err log if we have to crash the server because the buffer pool is exhausted by the lock table or the adaptive hash index
2004-03-10 11:05:02 +02:00
heikki@hundin.mysql.fi
995b74ee0d srv0srv.c:
Protect the reading of the latest foreign key error explantion buffer with a mutex; in theory, a race condition could cause SHOW INNODB STATUS print garbage characters after the error info; remove the sprintf of the latest UNIQUE KEY error, since the buffer really was always empty
2004-03-04 15:32:16 +02:00
heikki@hundin.mysql.fi
a9e361856b btr0cur.c:
Remove unused function btr_cur_update_sec_rec_in_place; besides, it was faulty, because even if strings are alphabetically identified, they can have different lengths
2004-02-27 19:02:51 +02:00
heikki@hundin.mysql.fi
86932a0b79 row0upd.c:
Fix bug: in a FOREIGN KEY, ON UPDATE CASCADE was not triggered if the update changed a string to another value identical in alphabetical ordering, e.g., abc -> aBc
2004-02-27 16:54:16 +02:00