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
marko@hundin.mysql.fi
2693b5ffa3
InnoDB: Cleanups of TRUNCATE TABLE code
2005-01-31 10:35:56 +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
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
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
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
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
marko@hundin.mysql.fi
284191d19a
InnoDB: Detect the availability of the Mac OS X fsync() work-around
...
at run-time, so that an executable compiled on Mac OS X 10.2 can
be run on Mac OS X 10.2 (without the work-around) and Mac OS X 10.3
and later with the work-aroud enabled.
2005-01-13 16:15:14 +02:00
marko@hundin.mysql.fi
c414f138c7
row0mysql.c:
...
row_truncate_table_for_mysql(): Reset the auto_increment counter.
2005-01-13 15:14:11 +02:00
sergefp@mysql.com
106509992e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
2005-01-12 23:22:12 +03:00
vtkachenko@mail.mysql.com
306df48731
Merge
2005-01-12 21:03:06 +01:00
heikki@hundin.mysql.fi
bdc9823cb6
ha_innodb.cc:
...
Add comments about why the InnoDB latching order is obeyed also for the MySQL query cache mutex; add an error printf if that is not the case
sync0sync.h:
Assign sync0sync.h ranks also for the MySQL query cache mutex and the MySQL binlog mutex; the latching order must be obeyed also for these
row0ins.c:
Add a comment why the query cache invalidate operation cannot deadlock in a cascaded FOREIGN KEY operation
2005-01-12 18:25:39 +02:00
marko@hundin.mysql.fi
69afdf53c7
InnoDB: Use system-supplied tmpfile() on Netware, as there is no
...
open interface for setting the "delete-on-close" flag.
2005-01-12 15:24:49 +02:00
marko@hundin.mysql.fi
6289469e97
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-12 14:08:25 +02:00
jan@hundin.mysql.fi
3ba52c1eb8
Take a shared record lock (LOCK_REC_NOT_GAP) for a matching record in the foreign
...
key check because we can allow inserts into gaps (Support Issue #4317 ).
2005-01-12 10:36:50 +02:00
sergefp@mysql.com
fda91bee40
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-bug5401-2
2005-01-12 09:05:11 +03:00
sergefp@mysql.com
194bc6eb9c
BUG#5401: post-review fixes
2005-01-12 08:39:15 +03:00