mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
a250e2b453
They had been introduced in 5.1 and were only later backported to 5.0;
as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones,
and changes in 5.0 do not propagate into the 5.1 files.
To fix this, the (previous) files in 5.1 now are deleted ("bk rm"),
and the previously deleted files depending on 5.0 are now moved to the
respective source directories ("bk mv").
The current 5.1 contents is restored in these files.
If you need the previous history of the 5.1 files ("bk revtool"),
access those in "BitKeeper/deleted".
Contrary to the original plan, I did not introduce the name
"CMakeLists.historic" - mostly in order not to clutter the source tree.
This fixes bug#29982.
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
Delete: client/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
Delete: CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~93f0d646:
Delete: dbug/CMakeLists.txt
dbug/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~57492bba:
Delete: extra/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~8c35983c:
Delete: extra/yassl/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f:
Delete: extra/yassl/taocrypt/CMakeLists.txt
extra/yassl/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
Delete: libmysql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
Delete: mysys/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~9e206e11:
Delete: regex/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~95969b72:
Delete: server-tools/instance-manager/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
Delete: sql/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~1960eb07:
Delete: storage/innobase/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~96726c3b:
Delete: storage/myisam/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4:
Delete: storage/heap/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12:
Delete: strings/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47:
Delete: storage/myisammrg/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~fc201a06:
Delete: tests/CMakeLists.txt
tests/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~2a609d33:
Delete: vio/CMakeLists.txt
vio/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt
BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
Delete: zlib/CMakeLists.txt
zlib/CMakeLists.txt:
Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt
CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
client/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
extra/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
libmysql/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
mysys/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
regex/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
server-tools/instance-manager/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
sql/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
storage/heap/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
storage/innobase/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
storage/myisam/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
storage/myisammrg/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
strings/CMakeLists.txt:
Restore the current 5.1 contents into the 5.0-dependent file.
For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
|
||
|---|---|---|
| .. | ||
| .cvsignore | ||
| array.c | ||
| base64.c | ||
| ChangeLog | ||
| charset-def.c | ||
| charset.c | ||
| checksum.c | ||
| CMakeLists.txt | ||
| default.c | ||
| default_modify.c | ||
| errors.c | ||
| hash.c | ||
| list.c | ||
| make-ccc | ||
| make-conf.c | ||
| Makefile.am | ||
| md5.c | ||
| mf_brkhant.c | ||
| mf_cache.c | ||
| mf_dirname.c | ||
| mf_fn_ext.c | ||
| mf_format.c | ||
| mf_getdate.c | ||
| mf_iocache.c | ||
| mf_iocache2.c | ||
| mf_keycache.c | ||
| mf_keycaches.c | ||
| mf_loadpath.c | ||
| mf_pack.c | ||
| mf_path.c | ||
| mf_qsort.c | ||
| mf_qsort2.c | ||
| mf_radix.c | ||
| mf_same.c | ||
| mf_sort.c | ||
| mf_soundex.c | ||
| mf_strip.c | ||
| mf_tempdir.c | ||
| mf_tempfile.c | ||
| mf_unixpath.c | ||
| mf_util.c | ||
| mf_wcomp.c | ||
| mf_wfile.c | ||
| mulalloc.c | ||
| my_access.c | ||
| my_aes.c | ||
| my_alarm.c | ||
| my_alloc.c | ||
| my_append.c | ||
| my_atomic.c | ||
| my_bit.c | ||
| my_bitmap.c | ||
| my_chsize.c | ||
| my_clock.c | ||
| my_compress.c | ||
| my_conio.c | ||
| my_copy.c | ||
| my_crc32.c | ||
| my_create.c | ||
| my_delete.c | ||
| my_div.c | ||
| my_dup.c | ||
| my_error.c | ||
| my_file.c | ||
| my_fopen.c | ||
| my_fstream.c | ||
| my_gethostbyname.c | ||
| my_gethwaddr.c | ||
| my_getncpus.c | ||
| my_getopt.c | ||
| my_getpagesize.c | ||
| my_getsystime.c | ||
| my_getwd.c | ||
| my_handler.c | ||
| my_init.c | ||
| my_largepage.c | ||
| my_lib.c | ||
| my_libwrap.c | ||
| my_lock.c | ||
| my_lockmem.c | ||
| my_malloc.c | ||
| my_memmem.c | ||
| my_messnc.c | ||
| my_mkdir.c | ||
| my_mmap.c | ||
| my_net.c | ||
| my_netware.c | ||
| my_new.cc | ||
| my_once.c | ||
| my_open.c | ||
| my_port.c | ||
| my_pread.c | ||
| my_pthread.c | ||
| my_quick.c | ||
| my_read.c | ||
| my_realloc.c | ||
| my_redel.c | ||
| my_rename.c | ||
| my_seek.c | ||
| my_sleep.c | ||
| my_static.c | ||
| my_static.h | ||
| my_symlink.c | ||
| my_symlink2.c | ||
| my_sync.c | ||
| my_thr_init.c | ||
| my_vle.c | ||
| my_wincond.c | ||
| my_windac.c | ||
| my_winthread.c | ||
| my_write.c | ||
| mysys_priv.h | ||
| ptr_cmp.c | ||
| queues.c | ||
| rijndael.c | ||
| safemalloc.c | ||
| sha1.c | ||
| string.c | ||
| test_charset.c | ||
| test_dir.c | ||
| test_fn.c | ||
| test_xml.c | ||
| testhash.c | ||
| thr_alarm.c | ||
| thr_lock.c | ||
| thr_mutex.c | ||
| thr_rwlock.c | ||
| tree.c | ||
| trie.c | ||
| typelib.c | ||