Commit graph

891 commits

Author SHA1 Message Date
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
jan@hundin.mysql.fi
4f3b3047a6 This is a code cleanup patch for X/Open XA. 2004-12-01 09:20:32 +02:00
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