mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21475 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1132 commits

Author SHA1 Message Date
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
marko@hundin.mysql.fi
e868711319 InnoDB: Small improvements to earlier patch (fix Bug #7350 better), 
suggested in review by Heikki.
 2005-02-14 15:54:08 +02:00
heikki@hundin.mysql.fi
961d8b0ebf Merge hundin.mysql.fi:/home/heikki/mysql-4.0 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-13 21:05:18 +02:00
heikki@hundin.mysql.fi
548f7dbada row0mysql.c: 
Backport the column prefix memory corruption fix from 5.0
 2005-02-13 21:00:07 +02:00
heikki@hundin.mysql.fi
71174327df row0mysql.c: 
Fix memory corruption bug reported by Georg Richter: if one created a table whose primary key contained at least 2 column prefixes, that could corrupt the memory heap of prebuilt_t
 2005-02-13 20:48:02 +02:00
marko@hundin.mysql.fi
e7c10dd2d8 InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers. 2005-02-08 16:41:34 +02:00
marko@hundin.mysql.fi
6c43fb504b InnoDB: Exclude code from InnoDB Hot Backup builds 
by adding #ifndef UNIV_HOTBACKUP and adjusting some function
declarations.
 2005-02-04 16:25:13 +02:00
marko@hundin.mysql.fi
96bbd613c9 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-02-04 16:13:46 +02:00
marko@hundin.mysql.fi
bf5cacf85f InnoDB: A small cleanup: remove two duplicate rec_get_offsets() calls 2005-02-04 15:44:09 +02:00
monty@mysql.com
43eb7cf303 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-03 16:50:06 +02:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jan@hundin.mysql.fi
8fc13ecc97 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 2005-02-03 10:54:38 +02:00
monty@mysql.com
b131520f9d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 16:50:35 +02:00
heikki@hundin.mysql.fi
b75bfa828d eval0eval.ic: 
Remove wrong assertion that fails on 64 bits
 2005-02-02 01:43:25 +02:00
heikki@hundin.mysql.fi
e5479c3f90 rem0rec.ic: 
Fix a debug assertion in rem0rec.ic on AMD64; 4.1 was already fixed
 2005-02-02 00:31:06 +02:00
marko@hundin.mysql.fi
679f4fe66b Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0
 2005-02-01 23:57:05 +02:00
marko@hundin.mysql.fi
1075c406f4 InnoDB: Fix debug compile error on Tru64 (Bug #8244) 2005-02-01 23:55:41 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967 
Support for COMMIT/ROLLBACK optional arguments
 2005-02-01 19:48:05 +00:00
monty@mysql.com
b87e0c52a7 Proper fix for comparision with ' ' 
(Bug #7788 "Table is full" occurs during a multitable update")
 2005-02-01 16:27:08 +02:00
heikki@hundin.mysql.fi
a623cc8d67 mem0pool.c: 
Fix an assertion failure in 64-bit computers if UNIV_MEM_DEBUG is defined
 2005-01-31 22:28:55 +02:00
marko@hundin.mysql.fi
2693b5ffa3 InnoDB: Cleanups of TRUNCATE TABLE code 2005-01-31 10:35:56 +02:00
heikki@hundin.mysql.fi
994fc27330 ut0ut.c: 
Use a 32-bit right-shift implementation through a 64-bit integer that should work ok for both gcc and Visual C++; the code depended on defining SIZEOF_LONG, and that is not set when compiling ibbackup
 2005-01-28 21:49:21 +02:00
heikki@hundin.mysql.fi
1d78506d7a os0file.c: 
Fix Windows porting bugs that broke ibbackup: 1) wrong error check in for CreateDirectory(), 2) wrong error check if the file did not exist in DeleteFile(), 3) too strict sharing restrictions in os_file_create_simple(): when ibbackup called that function, it would not allow mysqld to write to the file
 2005-01-28 20:58:16 +02:00
marko@hundin.mysql.fi
8342958665 InnoDB: Allow concurrent TRUNCATE and INSERT on a table. (Bug #8144) 2005-01-28 12:18:33 +02:00
heikki@hundin.mysql.fi
6979789732 fil0fil.c: 
We accidentally checked if the DIRECTORY is of type OS_FILE_TYPE_UNKNOWN; our intention was to check if the FILE is that; best to remove the check altogether, as in crash recovery it is safest to try to open also files whose type is unknown
os0file.c:
  Fix a bug: in Windows, os_file_readdir_next_file() returned OS_FILE_TYPE_UNKNOWN as the type of a regular file; this did not break mysqld, but did break ibbackup on Windows
 2005-01-27 22:00:36 +02:00
heikki@hundin.mysql.fi
61a0e57cd0 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-01-27 21:33:15 +02:00
heikki@hundin.mysql.fi
5014402000 os0file.c: 
Add includes for the _stat() call to compile on Windows in Hot Backup build
 2005-01-27 18:54:00 +02:00
heikki@hundin.mysql.fi
a4908dbcd1 ut0mem.c: 
Add a note to the error message that is printed when memory allocation fails: 32-bit computers usually have at most 2 GB or 4 GB process memory space
 2005-01-27 18:53:59 +02: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
georg@beethoven.site
3b2bf2f512 Fixes for windows compilation bugs 
(After review of cs georg:1.1800 by Monty)
 2005-01-26 15:19:20 +01:00
monty@mysql.com
f16b456ddc Only enable Innodb extra debugging when using the --debug=full configure option 2005-01-26 16:07:53 +02:00
serg@serg.mylan
160f254d34 merged 2005-01-26 09:54:12 +01:00
serg@serg.mylan
d8f35cec21 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-01-26 09:05:58 +01:00
serg@serg.mylan
7084b494c4 innobase/include/univ.i 
remove a change that broke the test
 2005-01-26 08:57:43 +01:00
heikki@hundin.mysql.fi
a4d445aae7 buf0rea.c: 
Add more diagnostics about why page reads in recovery may hang: print the number of pending pread calls
 2005-01-25 22:42:50 +02:00
marko@hundin.mysql.fi
81ce1c8d75 rem0rec.h: 
Corrected formatting of comments.
rem0rec.ic:
  rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
  in the correct order.
  Corrected formatting of comments.
 2005-01-25 22:40:20 +02:00
serg@serg.mylan
76f3d6f002 merged 2005-01-25 21:11:04 +01:00
monty@mysql.com
37168015cd Cleanups during review 2005-01-25 21:27:51 +02:00
marko@hundin.mysql.fi
638e2bd733 InnoDB: Backport innodb_autoextend_increment from 4.1 2005-01-25 16:27:13 +02:00
marko@hundin.mysql.fi
72de651ab5 One more after merge fix of Jan Lindström's changeset in 4.1 2005-01-25 14:49:30 +02:00
marko@hundin.mysql.fi
7eaec7eff7 After merge fixes 2005-01-25 14:44:34 +02:00
marko@hundin.mysql.fi
ee22415528 Merge hundin.mysql.fi:/home/marko/k/mysql-4.0 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2005-01-25 14:17:51 +02:00
marko@hundin.mysql.fi
ea1bd1d5e5 InnoDB: Enable ut_ad() assertions in MySQL debug builds. 2005-01-25 14:16:41 +02:00
marko@hundin.mysql.fi
fbb7d9a9df InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries. 
It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973)
 2005-01-25 12:10:24 +02:00
jan@hundin.mysql.fi
a37a3cd69c Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-01-24 09:55:41 +02:00
heikki@hundin.mysql.fi
944c29ce4a Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-22 04:49:35 +02:00
heikki@hundin.mysql.fi
e30b5f86e5 fil0fil.c: 
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE
 2005-01-22 04:45:22 +02:00
heikki@hundin.mysql.fi
a0263e8661 log0recv.c: 
Remove superfluous fprintf about log record application in InnoDB startup
 2005-01-21 23:47:44 +02:00
heikki@hundin.mysql.fi
3df04944e4 fil0fil.c: 
Add a missing newline to an error print
 2005-01-21 23:36:00 +02:00
heikki@hundin.mysql.fi
324e5688b4 dict0load.c: 
Fix a compilation error reported by Paul Dubois; I forgot to compile 5.0 after the merge
os0thread.c:
  test
 2005-01-21 22:03:08 +02:00
heikki@hundin.mysql.fi
d1d68b1413 Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-21 18:16:02 +02:00
heikki@hundin.mysql.fi
d6706798d2 fil0fil.c: 
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
 2005-01-21 17:59:23 +02:00
heikki@hundin.mysql.fi
9a03676b69 dict0dict.c: 
Fix bug #7831: ALTER TABLE ... ADD CONSTRAINT PRIMARY KEY ... complained about bad foreign key definition
 2005-01-21 17:54:50 +02:00
jan@hundin.mysql.fi
c0c93929a8 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2005-01-17 09:17:48 +02:00
jan@hundin.mysql.fi
c894ebd66c Required changes to support recovery of X/Open XA in InnoDB. 2005-01-17 09:09:59 +02:00
serg@serg.mylan
1034677f94 XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
heikki@hundin.mysql.fi
f1dc2017c1 dict0load.c: 
Correct typo in comment
 2005-01-15 01:10:40 +02:00
heikki@hundin.mysql.fi
71ec20ec1f dict0load.c, dict0crea.c: 
Add diagnostic code to track corruption in mix_len; it was reported on the mailing list Jan 14, 2005
 2005-01-15 01:06:15 +02:00
marko@hundin.mysql.fi
080869f995 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/k/mysql-4.1
 2005-01-14 15:23:34 +02:00
marko@hundin.mysql.fi
045aea9d92 InnoDB: Remove redundant page_no field from dict_index_t. 
This completes the patch for fast TRUNCATE TABLE.
 2005-01-14 13:54:23 +02:00
marko@hundin.mysql.fi
7ef8a20950 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into hundin.mysql.fi:/home/marko/j/mysql-5.0
 2005-01-14 13:06:46 +02:00
heikki@hundin.mysql.fi
bdf26a4f9d Merge hundin.mysql.fi:/home/heikki/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-5.0
 2005-01-13 21:42:37 +02:00
heikki@hundin.mysql.fi
fca5ee0c63 Merge 2005-01-13 19:27:44 +02:00