diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-02-20 16:23:18 +0200 |
| commit | ae07ec6cbf08e311e538f5149f93385e5bcaa7a6 (patch) | |
| tree | 4f2dee1467f3c3e3bd8feb6ffb7adf7684bdc653 /libmysqld | |
| parent | 0c568a99dfe3e528ec5bd09dfe0f2f90acb52db4 (diff) | |
| parent | dacaaf22a3f132df5573fe8e58c0617c30c5e9fc (diff) | |
| download | mariadb-git-ae07ec6cbf08e311e538f5149f93385e5bcaa7a6.tar.gz | |
Merge with MYSQL 5.1.61
Fixed README with link to source
Merged InnoDB change to XtraDB
README:
Added information of where to find MariaDB code
storage/archive/ha_archive.cc:
Removed memset() of rows, a MariaDB checksum's doesn't touch not used data.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index b74a38cc8a6..94b5b8c3133 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -103,6 +103,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/password.c ../sql/discover.cc ../sql/derror.cc ../sql/field.cc ../sql/field_conv.cc ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc + ../sql/signal_handler.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc ../sql/item_func.cc |