Commit graph

81 commits

Author SHA1 Message Date
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups.
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
2005-07-19 22:21:12 +04:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
reggie@linux.site
7de0a01800 ha_archive.cc:
Added cast to fix windows compile error
2005-07-11 06:14:42 -06:00
brian@brian-akers-computer.local
054e0e1712 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/optimize-5.0
2005-07-10 22:27:36 -07:00
brian@brian-akers-computer.local
2ff7ce856b Fixed 32bit issue, reworked error logic for open tables, and redid the repair table code so that it uses the extended optimize table code. 2005-07-10 21:17:03 -07:00
brian@brian-akers-computer.local
85e2b662bf Refactoring of write_row() into two parts to allow future additions. Also rewrote the OPTIMIZE TABLE code, to add new extended optimize. This form of optimize rebuilds not only the file, but each individual row. 2005-07-10 18:19:37 -07:00
brian@zim.(none)
9bd74f7e81 Fixed indention issue, made scan_rows an ha_rows type, and fixed show table status so archive rows are displayed as being compressed. 2005-07-09 08:57:08 -07:00
petr@mysql.com
5d6365d0a3 Apply Guilhem's patch (mmap->my_mmap, munmap->my_munmap in ha_tina) to improve
portability.
2005-07-08 14:43:27 +04:00
jimw@mysql.com
f2b0874f80 Clean up warnings and build problems on Windows. (Bug #11045) 2005-06-18 01:55:42 +02:00
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before*
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
brian@zim.(none)
113a99626d Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
brian@zim.(none)
efb5ed5bab Merge 2005-06-01 18:48:29 -07:00
kent@mysql.com
bd48eed988 tztime.cc:
Set #pragma implementation" earlier
Many files:
  Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993 Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina. 2005-06-01 17:34:10 -07:00
kent@mysql.com
bedc2e3d4c ha_archive.cc:
Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
2005-05-24 18:51:53 +02:00
msvensson@neptunus.(none)
34cec09efb Merge neptunus.(none):/home/msvensson/mysql/bug10241
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-09 11:26:48 +02:00
msvensson@neptunus.(none)
5b5565c30a BUG#10241 cygwin port: invalid pragma interface directives
- Introduce ifdefs so we can control when to use #pragma interface on cygwin
2005-05-04 15:05:56 +02:00
msvensson@neptunus.(none)
f78e1d1c44 Merge 2005-04-28 10:58:24 +02:00
msvensson@neptunus.(none)
9969e1c5ea BUG#9911 After review fixes
- Remove ha_archive::rename_table and move the fix to handler::rename_table
2005-04-28 10:49:18 +02:00
msvensson@neptunus.(none)
1ba85ac979 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.
2005-04-27 22:20:58 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
c12ee8dc16 BUG#9714 libsupc++ problem
- Remove linking of libsupc++
 - Move all local static variables to filescope
2005-04-27 11:25:08 +02:00
msvensson@neptunus.(none)
8d370fbcf9 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Implemented ha_archive::rename_table
 - Added testcases for rename
2005-04-26 11:35:52 +02:00
serg@serg.mylan
8986ffebde print xa recovery progress
add names to handlertons
trans_need_2pc() macro
2005-03-13 21:58:09 +01:00
monty@mysql.com
7e5f74f8f2 Merge with global tree 2005-02-25 17:12:06 +02:00
monty@mysql.com
0a6b7aedb2 Remove compiler warnings and remove not used variables
(Found during build process)
2005-02-25 16:53:22 +02:00
brian@zim.(none)
b6ed75e9a9 Solved bug 8691.
Funny sometimes how things work when in reality you would think it would crash pretty hard :)
2005-02-24 12:42:06 -08:00
petr@mysql.com
bacdd62fb9 Fix confusing comments. 2005-02-20 22:52:28 +03:00
serg@serg.mylan
ede1a0dbc7 fix compilation errors 2005-02-19 10:51:49 +01:00
serg@serg.mylan
3f7355dfef making XA tree to compile (and pass tests) in -max build 2005-02-17 22:52:40 +01:00
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-17 14:00:44 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
monty@mysql.com
38d1a42481 Merge with 4.1 2005-02-15 17:12:13 +02:00
guilhem@mysql.com
40a2e968f9 new static archive_inited variable, so that archive_db_end() will do something only if archive_db_init() was run before
(protection against destroying uninited mutex in the case where mysqld fails early at startup (before archive_db_init() was called)
and then calls archive_db_end() to clean up).
2005-02-12 19:17:33 +01:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
brian@zim.(none)
6471b65ad0 Removed duplicate close call and added archive to the debug build and test. 2005-01-31 12:17:34 -08:00
brian@zim.(none)
69de46a8de Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-28 18:10:47 -08:00
brian@zim.(none)
b484e29231 Cleanup for lost file descriptors on close table for ha_archive. 2005-01-28 16:43:10 -08:00
ingo@mysql.com
98ef0b2b26 Test bug: Memory leak in archive handler.
Added a call to close the meta file after a repair.
2005-01-26 22:31:42 +01:00
ingo@mysql.com
bbcd542917 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00
ingo@mysql.com
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
jimw@mysql.com
3d0e2e70c6 Merge 2005-01-11 05:10:08 +01:00
jimw@mysql.com
699cb2c066 Fix style nit 2005-01-11 01:01:35 +01:00
jimw@mysql.com
2347e386d7 Fix double-initalization of mutex in archive storage engine. (Bug #7762) 2005-01-10 23:59:28 +01:00
brian@zim.(none)
2ee9d854b4 Updates for Monty's changes in the table structure. All tests pass currently.
Seems like such a short commit message...
2005-01-06 18:34:17 -08:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
brian@avenger.(none)
14a5f5ddda Clean up from code review. 2004-12-16 16:27:52 -08:00
brian@avenger.(none)
c8137bbb80 A few simple fixes plus the added support of being able to repair the meta data file via REPAIR TABLE. More information is now provided in SHOW TABLE STATUS. 2004-12-09 01:48:07 -08:00