Commit graph

1133 commits

Author SHA1 Message Date
sergefp@mysql.com
5cf716aa4e Make index_merge code call handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) if it
will call handler::position() during key scan. 
Undo the previous, less efficient fix (cset 2004-11-30 19:56:25+02:00, heikki@hundin.mysql.fi)
2004-12-23 15:23:39 +03:00
sergefp@mysql.com
9ebf3a3316 Fix for BUG#5401 (attempt 2) 2004-12-23 02:26:22 +03:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
heikki@hundin.mysql.fi
f1fe6e1784 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
2004-12-21 19:33:43 +02:00
heikki@hundin.mysql.fi
b56085a87e os0file.c:
Put back accidentally removed undef and remove a debug def
2004-12-21 18:33:53 +02:00
heikki@hundin.mysql.fi
e25b633367 os0file.c:
Fix InnoDB bug: on HP-UX, with a 32-bit binary, InnoDB was only able to read or write <= 2 GB files; the reason was that InnoDB treated the return value of lseek() as a 32-bit integer; lseek was used on HP-UX-11 as a replacement for pread() and pwrite() because HAVE_BROKEN_PREAD was defined on that platform
2004-12-21 18:21:17 +02:00
jan@hundin.mysql.fi
198dc7a8ec Content merge. 2004-12-21 07:49:38 +02:00
kaa@polly.local
10bca216c1 Fixed compilation for old Linux distributions that have no HugeTLB support 2004-12-20 20:17:36 +03:00
kaa@polly.local
3777af459e Merge akopytov@bk-internal.mysql.com:/home/bk/mysql-5.0
into polly.local:/home/kaa/src/mysql-5.0
2004-12-19 13:00:03 +03:00
kaa@polly.local
8bebebf826 Fixed cut&paste bug that broke compilation with compile-pentium-valgrind-max 2004-12-19 12:57:34 +03:00
heikki@hundin.mysql.fi
7d68f2e40d trx0roll.c:
Put a sensible value of thread id and process no to a background rollback transaction
2004-12-18 19:52:43 +02:00
heikki@hundin.mysql.fi
2a072721c3 trx0roll.c:
Fix the rollback progress printout in crash recovery
2004-12-18 18:44:03 +02:00
heikki@hundin.mysql.fi
75b6b7ed70 trx0roll.c:
Print progress of background rollback of transactions with more than 1000 undo log entries
srv0start.c, trx0roll.c, log0recv.c, trx0roll.h:
  Cleanup background rollback code in crash recovery; do not flush all modified pages from the buffer pool after a crash recovery: this makes mysqld accesible for users more quickly
2004-12-18 18:20:23 +02:00
heikki@hundin.mysql.fi
afc9c81292 rem0rec.ic:
Do not use short int in rem0rec.ic, since its size is not fixed in ANSI C; improve comments of the relative offset field in a record; use mach_read_from_2() to read the relative offset field to save CPU time, if the compiler does not optimize a more complex access function
2004-12-18 13:04:34 +02:00
marko@hundin.mysql.fi
a2c9c8eaa0 InnoDB: fix a compilation error due to missing typedef (Bug #7383)
rem0rec.ic:
  Replace (int16_t) with (signed short).
2004-12-18 00:19:00 +02:00
heikki@hundin.mysql.fi
dda8c10f1b page0page.ic:
Move inline function page_is_cmp() before its use in page0page.ic; maybe this fixes a linking error reported by Lenz
2004-12-17 22:46:42 +02:00
lenz@mysql.com
aedb38e81a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2004-12-17 18:00:59 +01:00
marko@hundin.mysql.fi
e2f9201041 InnoDB: Fixed bugs in the padding and trimming of trailing spaces
that affected the UCS2 character set. (Bug #7350)
2004-12-17 18:35:11 +02:00
lenz@mysql.com
1bde3b170c - added file innobase/include/trx0xa.h which was missing from the source
distribution when running "make dist"
2004-12-17 14:06:12 +01:00
kaa@polly.local
2ce0ad6d7e Forward port of HugeTLB, InnoDB doublewrite and checksums patches to 5.0 2004-12-14 22:26:31 +03:00
sergefp@mysql.com
a8e52ef412 Merge mysql.com:/dbdata/psergey/mysql-4.0-bug6976
into mysql.com:/dbdata/psergey/mysql-4.1-merge
2004-12-13 20:30:44 +03:00
jan@hundin.mysql.fi
a5a1f7d7c3 Fixed problems with deadlocks on LOCK TABLES...WHERE ENGINE = InnoDB. 2004-12-13 14:22:18 +02:00
marko@hundin.mysql.fi
cd8743409f dict0load.c:
dict_load_table(): detect the new table format of MySQL 5.0.3
2004-12-13 12:31:17 +02:00
jan@hundin.mysql.fi
1d3a32c719 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-13 08:59:52 +02:00
marko@hundin.mysql.fi
99571d271e Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-12-10 23:38:44 +02:00
marko@hundin.mysql.fi
e8885a0824 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-12-10 23:33:55 +02:00
heikki@hundin.mysql.fi
2c1e258586 row0mysql.h:
Remove accidentally pushed unnecessary change
2004-12-10 18:09:07 +02:00
heikki@hundin.mysql.fi
713a3103c6 dict0dict.c, log.cc:
Remove accidentally merged 4.0 changes
dict0dict.c:
  Remove the 4.0 fix accidentally auto-merged to 4.1
row0mysql.h, dict0dict.h:
  Remove a change auto-merged from 4.0
2004-12-10 18:03:43 +02:00
heikki@hundin.mysql.fi
d9fbdff6a2 Merge 2004-12-10 17:15:23 +02:00
heikki@hundin.mysql.fi
ea6b5e117a dict0dict.h, dict0dict.c, ha_innodb.cc:
Fix for the 0xA0 character problem in the InnoDB FOREIGN KEY parser: if my_isspace() treats 0xA0 as space, then let InnoDB do the same; this might break some multi-byte charset id's, though for big5, ujis, sjis this seems not to change the current behavior (I checked the tables in /share/charsets); this fix must NOT be merged to 4.1 because in 4.1 everything is in UTF-8
2004-12-10 17:12:47 +02:00
heikki@hundin.mysql.fi
536702f4c5 dict0dict.c:
In the FOREIGN KEY parser, do not cut 0xC2A0 from the end of an identifier if it was quoted
2004-12-10 17:05:40 +02:00
marko@hundin.mysql.fi
9dc1f5146a InnoDB: Reduce the stack space consumption of ON UPDATE CASCADE
operations.
2004-12-10 12:55:56 +02:00
jan@hundin.mysql.fi
9f5b8f9b4a Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-10 08:49:31 +02:00
heikki@hundin.mysql.fi
4915d196eb dict0dict.c:
Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
2004-12-10 02:36:45 +02:00
marko@hundin.mysql.fi
15152a380d srv0srv.c:
srv_printf_innodb_monitor(): Removed extraneous rewind() call.
  The caller of this function calls rewind() if necessary.
  In this way, we avoid rewind()ing stderr in
  srv_lock_timeout_and_monitor_thread().
2004-12-10 00:06:33 +02:00
marko@hundin.mysql.fi
7506ca1be1 InnoDB: Changed interface to rec_get_offsets(), to reduce the use of
memory heaps.  This changeset plugs also a few memory leaks that
were introduced with the compact InnoDB table format.
2004-12-09 15:29:55 +02:00
jan@hundin.mysql.fi
49c0044a2f Content merge. 2004-12-09 11:20:50 +02:00
jan@hundin.mysql.fi
d6effde5d0 Added support for a LOCK TABLES...WHERE ENGINE = InnoDB query which sets
transactional table locks to tables mentioned in the query. These locks
are released at the end of the transaction automatically.
This is fix for bugs #5655, #5998 and issue #3762.
2004-12-09 11:10:45 +02:00
heikki@hundin.mysql.fi
a90b40fcd3 os0file.c:
Print a better error message to the .err log if InnoDB's advisory file locking fails
2004-12-08 17:53:01 +02:00
marko@hundin.mysql.fi
3f806c3b66 InnoDB: Make btr_search_drop_page_hash_index() work with the compact
record format without requiring the doubly linked list added by
Heikki in ChangeSet@1.1627.16.2
2004-12-08 15:20:58 +02:00
marko@hundin.mysql.fi
83ac19929d Cset exclude: heikki@hundin.mysql.fi|ChangeSet|20041027124510|04970 2004-12-08 14:34:58 +02:00
marko@hundin.mysql.fi
5e5a3f3f4f row0mysql.c:
Remove parameter from call to btr_search_validate().
buf0buf.c:
  Initialize member "index" of buf_block_t.
buf0buf.h:
  Add member "index" to buf_block_t.
btr0sea.h:
  Remove parameter of btr_search_validate()
btr0sea.c:
  Make use of the added member "index" of buf_block_t.
2004-12-08 14:33:09 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
marko@hundin.mysql.fi
2db2cda3ed InnoDB: Fix ctype_utf8 test failure caused by the new record format. 2004-12-03 17:57:44 +02:00
serg@serg.mylan
3328c65597 syntax error fixed 2004-12-03 00:10:12 +01:00
marko@hundin.mysql.fi
dd48953956 Many files:
Implement more compact InnoDB record format.
  Old format is available as CREATE TABLE ... ROW_FORMAT=DYNAMIC.
2004-12-02 19:45:07 +02:00
heikki@hundin.mysql.fi
3ca8c79ecf trx0xa.h:
Remove compiler errors from Jan's XA header by commenting the __P macros out
2004-12-02 17:40:50 +02:00
heikki@hundin.mysql.fi
227ffeb9e0 configure.in:
Let MySQL check the existence of readdir_r with 3 arguments; Solaris seems to have just 2 args
  Check the existence of readdir_r and localtime_r; even though MySQL does check these too, we need our own check for Hot Backup code
os0file.c:
  Use re-entrant readdir_r where available
ut0ut.c:
  Make a function to use thread-safe localtime_r where available; that particular function was not called from anywhere, though
2004-12-01 18:02:34 +02:00
jan@hundin.mysql.fi
4ca36f3fd7 Remove unnecessary copyright header from trx0xa.h 2004-12-01 13:56:04 +02:00
jan@hundin.mysql.fi
5cf76a3667 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2004-12-01 09:21:42 +02:00