maria-developers team mailing list archive

[Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>]

Sergey Petrunya <psergey@xxxxxxxxxxxx> writes:

> At file:///home/psergey/bzr-new/mysql-5.1-maria-contd3/
>
> ------------------------------------------------------------
> revno: 2730
> revision-id: psergey@xxxxxxxxxxxx-20090914224548-yho0nxw78vvxd5yi
> parent: knielsen@xxxxxxxxxxxxxxx-20090912073839-2jfav265c8pkm1ae
> committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
> branch nick: mysql-5.1-maria-contd3
> timestamp: Tue 2009-09-15 02:45:48 +0400
> message:
>   MySQL 5.1 -> MariaDB 5.1 merge: windows build fixes

> === modified file 'storage/maria/ma_rt_index.c'
> --- a/storage/maria/ma_rt_index.c	2009-02-19 09:01:25 +0000
> +++ b/storage/maria/ma_rt_index.c	2009-09-14 22:45:48 +0000
> @@ -1134,12 +1134,12 @@
>      uint nod_flag;
>      ulong i;
>      MARIA_KEY tmp_key;
> +	uchar *page_buf;
> +	MARIA_PAGE page;

^^^ You've gotten tabs into those lines (Visual Studio messing up?).

> === modified file 'storage/maria/CMakeLists.txt'
> --- a/storage/maria/CMakeLists.txt	2008-06-09 09:06:06 +0000
> +++ b/storage/maria/CMakeLists.txt	2009-09-14 22:45:48 +0000
> @@ -12,8 +12,10 @@
>  # You should have received a copy of the GNU General Public License
>  # along with this program; if not, write to the Free Software
>  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> +INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
>  INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
>  
> +
>  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
>  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")

(extra blank line not needed).

> === modified file 'unittest/mysys/waiting_threads-t.c'
> --- a/unittest/mysys/waiting_threads-t.c	2009-03-20 11:41:30 +0000
> +++ b/unittest/mysys/waiting_threads-t.c	2009-09-14 22:45:48 +0000
> @@ -263,6 +263,7 @@
>    kill_strategy=X;                              \
>    do_one_test();
>  #else
> +  #define test_kill_strategy(X)                 \

Strange, I've seen this one before. Maybe since we are not merged with newest
lp:maria?

 - Kristian.