Commit graph

1296 commits

Author SHA1 Message Date
marko@hundin.mysql.fi
48cd94d9ae After merge fixes 2005-03-08 17:18:27 +02:00
marko@hundin.mysql.fi
63d01ae103 dict0load.c:
dict_load_table(): Remove the check for row_format=compact for now,
  because the flag bit we used (high-order bit of mix_len)
  has not been zero for at least two customers.
2005-03-08 17:08:17 +02:00
marko@hundin.mysql.fi
c098c27af5 InnoDB: Win64 portability fixes 2005-03-08 16:25:31 +02:00
marko@hundin.mysql.fi
4fe94704a7 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-08 16:02:13 +02:00
marko@hundin.mysql.fi
beea918092 InnoDB: Win64 portability fix: add missing declaration and
correct the definition of srv_max_buf_pool_modified_pct.
2005-03-08 11:12:18 +02:00
marko@hundin.mysql.fi
42ea96f9fd row0sel.c:
row_search_for_mysql(): Add a clarifying comment.
2005-03-07 16:32:24 +02:00
marko@hundin.mysql.fi
a6f17f4cc4 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-07 15:28:11 +02:00
heikki@hundin.mysql.fi
69fe070acb trx0trx.c:
Print a hex dump of the trx_t object if trx->n_mysql_tables_in_use != 0 at trx_free()
2005-03-07 15:28:10 +02:00
marko@hundin.mysql.fi
3c55fef5a8 InnoDB: optimize SELECT performance 2005-03-07 15:23:06 +02:00
marko@hundin.mysql.fi
38adb1ba79 InnoDB: Portability fixes for warnings reported on IA-64 Windows 2005-03-07 12:03:33 +02:00
marko@hundin.mysql.fi
ea4f6ded74 ut0mem.c:
ut_malloc_low(): fix the fprintf() format string
  (an extraneous comma split the format into two arguments)
2005-03-07 09:43:19 +02:00
bar@mysql.com
d50d213162 Merge 2005-03-05 18:20:35 +04:00
heikki@hundin.mysql.fi
d565920ba2 ut0mem.c:
If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary
2005-03-04 18:17:29 +02:00
heikki@hundin.mysql.fi
474a910499 trx0trx.c:
Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0
2005-03-04 17:58:06 +02:00
marko@hundin.mysql.fi
92d8692495 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-04 15:27:07 +02:00
jimw@mysql.com
f7c01cfb76 Merged from 4.1 2005-03-03 15:01:46 -08:00
heikki@hundin.mysql.fi
07a0fdeb24 srv0start.c:
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
2005-03-03 18:00:34 +02:00
heikki@hundin.mysql.fi
c93fcd19a5 Merge 2005-03-03 17:50:04 +02:00
heikki@hundin.mysql.fi
df6d26e4bd srv0start.c:
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
  Revert the AIX patch here
2005-03-03 17:46:56 +02:00
heikki@hundin.mysql.fi
80fca0a075 Merge hundin.mysql.fi:/home/heikki/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-03-03 17:26:12 +02:00
heikki@hundin.mysql.fi
47440f4b5a os0file.c:
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
2005-03-03 17:20:05 +02:00
marko@hundin.mysql.fi
74194d23de InnoDB: Merge fix of Bug #8771 from the 4.1 tree 2005-03-02 12:49:51 +02:00
ingo@mysql.com
306bd2fc69 Merge 2005-03-02 10:56:13 +01:00
jan@hundin.mysql.fi
b9ae89a1e6 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-03-02 07:48:00 +02:00
marko@hundin.mysql.fi
c75036ed70 row0sel.c:
row_sel_store_mysql_rec(): Do not try to space-pad BLOB fields. (Bug #8771)
2005-03-01 20:46:23 +02:00
marko@hundin.mysql.fi
7252e44bf5 After review fixes. Fix bugs in TRUNCATE. 2005-03-01 19:42:59 +02:00
marko@hundin.mysql.fi
5faaf74818 InnoDB: Zero fill newly created pages and deleted records to
remove old junk and to improve compression ratio.
InnoDB: Make implicit type conversions explicit. (Bug #8826)
2005-03-01 13:54:48 +02:00
jan@hundin.mysql.fi
d49f382410 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-03-01 12:39:23 +02:00
marko@hundin.mysql.fi
2b10afd911 After merge fixes 2005-03-01 09:51:32 +02:00
marko@hundin.mysql.fi
ce553fc2fe InnoDB: Fix compilation errors on IA-64 Windows 2005-03-01 09:27:09 +02:00
jan@hundin.mysql.fi
40d89eea68 Fixed XA recovery for InnoDB. Note that XA recovery is still disabled
until it has been comprehensive tested.
2005-03-01 08:17:03 +02:00
monty@mysql.com
3839e443a4 merge with 4.1 2005-02-28 12:18:39 +02:00
monty@mysql.com
ab11370de6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-28 12:00:18 +02:00
monty@mysql.com
253bfcf783 Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)
2005-02-28 11:59:46 +02:00
monty@mysql.com
265a3585e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-02-26 12:19:56 +02:00
heikki@hundin.mysql.fi
6d848111f2 trx0trx.c, trx0trx.h:
Fix wrong spelling
2005-02-25 22:54:33 +02:00
heikki@hundin.mysql.fi
ec248f78cf trx0undo.h, trx0undo.c, trx0trx.c, trx0roll.c:
Make InnoDB-5.0.3 to process log records of 4.1 undo log header create and reuse just like in 4.1; storing XID to the start of the undo log is a separately logged operation; this conforms to Rule 3 of InnoDB redo logging
2005-02-25 22:35:33 +02:00
heikki@hundin.mysql.fi
41e45ab16a fil0fil.c:
Check if node == NULL, which means we are outside tablespace bounds, and print a big fatal error message
2005-02-25 22:16:14 +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
heikki@hundin.mysql.fi
5f427ec35d row0sel.c:
Fix bug #8677: if one used LOCK TABLES, created an InnoDB temp table, and did a multi-table update where a MyISAM table was the update table and the temp table was a read table, then InnoDB aserted in row0sel.c because n_mysql_tables_in_use was 0. Also, we remove the assertion altogether and just print an error to the .err log if this important consistency check fails. Then it is up to the user to read the .err log and notice the problem if there still are errors in MySQL's table locking.
2005-02-22 21:05:17 +02:00
heikki@hundin.mysql.fi
e70e62ad2d Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-02-22 16:20:47 +02:00
heikki@hundin.mysql.fi
819af98845 trx0trx.c:
Disable the XA code in InnoDB crash recovery; when Jan and Sergei want to test XA, they should revert this patch
2005-02-22 16:18:34 +02:00
jan@hundin.mysql.fi
57e474758d Fixed a bug on InnoDB X/Open XA prepare. 2005-02-22 15:40:13 +02:00
jan@hundin.mysql.fi
886b406e13 Clean up prints in innodb_xa_prepare. 2005-02-22 15:03:17 +02:00
jan@hundin.mysql.fi
14a7a642b0 Copy X/Open XA XID from trx structure to a list in recovery. 2005-02-22 14:39:15 +02:00
serg@serg.mylan
c0dda01f76 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
2005-02-18 12:02:46 +01:00
marko@hundin.mysql.fi
baffd9ad2d After review fixes (Bug #5682) 2005-02-17 18:40:45 +02:00
marko@hundin.mysql.fi
612e06617c InnoDB: Make CREATE TABLE return error when the minimum row length
exceeds the maximum record size.  (Bug #5682)
2005-02-17 17:15:29 +02:00
serg@serg.mylan
fd828e5b4d manually merged 2005-02-14 21:50:09 +01:00
marko@hundin.mysql.fi
e0e87d0c92 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/k/mysql-5.0
2005-02-14 17:23:12 +02:00