- Committer: Stewart Smith
- Date: 2010-10-12 05:41:15 UTC
- mto: (1843.1.3 build) (2021.1.2 build) (1953.1.1 build) (1819.7.43 update-innobase)
- Revision ID: stewart@flamingspork.com-20101012054115-8cxgemcwgt6yeok6
[patch 026/129] Merge patch for revision 1814 from InnoDB SVN:
revno: 1814
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5736
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5735
committer: marko
timestamp: Wed 2009-09-02 06:53:19 +0000
message:
branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP.
modified:
include/ut0ut.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fut0ut.h
page/page0zip.c 10@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fpage%2Fpage0zip.c
ut/ut0ut.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0ut.c
diff:
=== modified file 'include/ut0ut.h'
revno: 1814
revision-id: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5736
parent: svn-v4:16c675df-0fcb-4bc9-8058-dcc011a37293:branches/zip:5735
committer: marko
timestamp: Wed 2009-09-02 06:53:19 +0000
message:
branches/zip: Enclose some timestamp functions in #ifndef UNIV_HOTBACKUP.
modified:
include/ut0ut.h 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Finclude%2Fut0ut.h
page/page0zip.c 10@16c675df-0fcb-4bc9-8058-dcc011a37293:branches%2Fzip%2Fpage%2Fpage0zip.c
ut/ut0ut.c 2@16c675df-0fcb-4bc9-8058-dcc011a37293:trunk%2Fut%2Fut0ut.c
diff:
=== modified file 'include/ut0ut.h'
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
client
|
1 | 16 years ago | brian | clean slate |
|
||
|
config
|
1 | 16 years ago | brian | clean slate |
|
||
|
docs
|
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. |
|
||
|
drizzled
|
214 | 16 years ago | Brian Aker | Rename of fields (fix issue with string and decima |
|
||
|
examples
|
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. |
|
||
|
extra
|
1022.2.34 | 15 years ago | Monty Taylor | Merged Monty from lp:~mordred/drizzle/kill-malloc |
|
||
|
libdrizzle
|
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. |
|
||
|
m4
|
202.3.14 | 16 years ago | Monty Taylor | Moved m4 macros to top-level m4 dir, per GNU stand |
|
||
|
plugin
|
1 | 16 years ago | brian | clean slate |
|
||
|
po
|
202.3.1 | 16 years ago | Monty Taylor | Added very initial gettextize stuff. |
|
||
|
support-files
|
1 | 16 years ago | brian | clean slate |
|
||
|
tests
|
77.1.47 | 16 years ago | Monty Taylor | Moved test to tests... |
|
||
|
unittests
|
1377.8.1 | 14 years ago | pawel | primitive integration of the testing framework wit |
|
||
|
win32
|
1712.1.1 | 14 years ago | Monty Taylor | Merged libdrizzle directly into tree. |
|
||
.bzrignore |
1816.2.5 | 14 years ago | Monty Taylor | Added a missing file to .bzrignore. | 6.2 KB |
|
|
|
.quickly |
1776.2.1 | 14 years ago | Monty Taylor | Updated pandora-build files to version 0.155 | 111 bytes |
|
|
|
AUTHORS |
1546 | 14 years ago | Brian Aker | Merge of Joe's patch (and I updated the author fil | 387 bytes |
|
|
|
configure.ac |
1730.6.19 | 14 years ago | Hartmut Holzgraefe | merge from upstream, conflict in .bzrignore resolv | 6.6 KB |
|
|
|
COPYING |
1802.10.1 | 14 years ago | Monty Taylor | Update COPYING file to have current FSF address in | 17.5 KB |
|
|
|
COPYING.Boost |
1815.1.1 | 14 years ago | Monty Taylor | Embed a modified version of parse_config_file. The | 1.3 KB |
|
|
|
COPYING.BSD |
1799.2.2 | 14 years ago | Monty Taylor | Added BSD copying file. | 1.3 KB |
|
|
|
DRIZZLE.FAQ |
665.1.4 | 15 years ago | Eric Herman | Added pointer to online version of the FAQ | 5.8 KB |
|
|
|
EXCEPTIONS-CLIENT |
1 | 16 years ago | brian | clean slate | 5 KB |
|
|
|
Makefile.am |
1815.1.1 | 14 years ago | Monty Taylor | Embed a modified version of parse_config_file. The | 5.1 KB |
|
|
|
NEWS |
194 | 16 years ago | Brian Aker | Documentation cleanup | 41 bytes |
|
|
|
README |
992.1.3 | 15 years ago | Monty Taylor | Clarified instructions in README. | 821 bytes |
|
|