Merge into libdrizzle-redux : update-copyright-headers : Code : Drizzle Client & Protocol Library

Status:	Merged
Approved by:	Brian Aker on 2013-01-27
Approved revision:	106
Merged at revision:	104
Proposed branch:	lp://qastaging/~brianaker/libdrizzle/update-copyright-headers
Merge into:	lp://qastaging/libdrizzle
Diff against target:	859 lines (+210/-32) (has conflicts) 54 files modified docs/conf.py.in (+1/-1) libdrizzle-5.1/binlog.h (+1/-1) libdrizzle-5.1/column.h (+1/-0) libdrizzle-5.1/column_client.h (+1/-0) libdrizzle-5.1/conn.h (+1/-0) libdrizzle-5.1/conn_client.h (+1/-0) libdrizzle-5.1/constants.h (+1/-0) libdrizzle-5.1/drizzle.h (+1/-0) libdrizzle-5.1/drizzle_client.h (+1/-0) libdrizzle-5.1/error.h (+1/-1) libdrizzle-5.1/field_client.h (+1/-0) libdrizzle-5.1/libdrizzle.h (+1/-1) libdrizzle-5.1/query.h (+1/-0) libdrizzle-5.1/result.h (+1/-0) libdrizzle-5.1/result_client.h (+1/-0) libdrizzle-5.1/return.h (+1/-0) libdrizzle-5.1/row_client.h (+1/-0) libdrizzle-5.1/ssl.h (+1/-1) libdrizzle-5.1/statement.h (+1/-1) libdrizzle-5.1/structs.h (+1/-1) libdrizzle-5.1/verbose.h (+1/-0) libdrizzle-5.1/version.h.in (+1/-0) libdrizzle/binlog.cc (+1/-1) libdrizzle/binlog.h (+1/-1) libdrizzle/column.cc (+1/-0) libdrizzle/column.h (+1/-1) libdrizzle/command.cc (+1/-0) libdrizzle/common.h (+2/-0) libdrizzle/conn.cc (+1/-0) libdrizzle/conn_local.h (+1/-1) libdrizzle/conn_uds.cc (+1/-0) libdrizzle/datetime.h (+1/-1) libdrizzle/drizzle.cc (+1/-0) libdrizzle/drizzle_local.h (+1/-0) libdrizzle/error.cc (+1/-0) libdrizzle/field.cc (+1/-0) libdrizzle/handshake.cc (+1/-0) libdrizzle/handshake_client.h (+1/-0) libdrizzle/include.am (+1/-0) libdrizzle/pack.cc (+1/-0) libdrizzle/pack.h (+1/-0) libdrizzle/poll.cc (+1/-0) libdrizzle/poll.h (+1/-0) libdrizzle/query.cc (+1/-0) libdrizzle/result.cc (+1/-0) libdrizzle/result.h (+143/-0) libdrizzle/row.cc (+1/-0) libdrizzle/ssl.cc (+1/-1) libdrizzle/state.cc (+1/-0) libdrizzle/state.h (+1/-0) libdrizzle/statement_local.h (+1/-1) libdrizzle/statement_param.cc (+1/-1) libdrizzle/structs.h (+5/-0) tests/unit/connect_uds.c (+10/-17) Text conflict in libdrizzle/structs.h
To merge this branch:	bzr merge lp://qastaging/~brianaker/libdrizzle/update-copyright-headers
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Drizzle Trunk		2013-01-27	Pending
Review via email: mp+145086@code.qastaging.launchpad.net

Revision history for this message

Vijay Samuel (vjsamuel) wrote on 2013-01-27:

#

Download full text (25.6 KiB)

Hi Brian,

There are merge conflicts. Please resolve and re submit.

Thanks in advance.

Cheers,
-Vijay
On Jan 27, 2013 5:45 PM, "Brian Aker" <email address hidden> wrote:

> Brian Aker has proposed merging
> lp:~brianaker/libdrizzle/update-copyright-headers into lp:libdrizzle.
>
> Requested reviews:
> Drizzle Trunk (drizzle-trunk)
>
> For more details, see:
>
> https://code.launchpad.net/~brianaker/libdrizzle/update-copyright-headers/+merge/145086
> --
>
> https://code.launchpad.net/~brianaker/libdrizzle/update-copyright-headers/+merge/145086
> Your team Drizzle Trunk is requested to review the proposed merge of
> lp:~brianaker/libdrizzle/update-copyright-headers into lp:libdrizzle.
>
> === modified file 'docs/conf.py.in'
> --- docs/conf.py.in 2012-12-21 14:04:15 +0000
> +++ docs/conf.py.in 2013-01-27 12:14:21 +0000
> @@ -47,7 +47,7 @@
>
> # General information about the project.
> project = u'libdrizzle'
> -copyright = u'2012, Drizzle Development Group, http://drizzle.org/'
> +copyright = u'2008-2013, Drizzle Development Group, http://drizzle.org/'
>
> # The version info for the project you're documenting, acts as
> replacement for
> # |version| and |release|, also used in various other places throughout
> the
>
> === modified file 'libdrizzle-5.1/binlog.h'
> --- libdrizzle-5.1/binlog.h 2013-01-27 05:08:57 +0000
> +++ libdrizzle-5.1/binlog.h 2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
> *
> * Drizzle Client & Protocol Library
> *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
> * All rights reserved.
> *
> * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/column.h'
> --- libdrizzle-5.1/column.h 2013-01-05 10:27:32 +0000
> +++ libdrizzle-5.1/column.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
> /*
> * Drizzle Client & Protocol Library
> *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
> * Copyright (C) 2008 Eric Day (<email address hidden>)
> * All rights reserved.
> *
>
> === modified file 'libdrizzle-5.1/column_client.h'
> --- libdrizzle-5.1/column_client.h 2012-12-18 11:36:28 +0000
> +++ libdrizzle-5.1/column_client.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
> /*
> * Drizzle Client & Protocol Library
> *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
> * Copyright (C) 2008 Eric Day (<email address hidden>)
> * All rights reserved.
> *
>
> === modified file 'libdrizzle-5.1/conn.h'
> --- libdrizzle-5.1/conn.h 2013-01-27 01:57:09 +0000
> +++ libdrizzle-5.1/conn.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
> /*
> * Drizzle Client & Protocol Library
> *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
> * Copyright (C) 2008 Eric Day (<email address hidden>)
> * All rights reserved.
> *
>
> === modified file 'libdrizzle-5.1/conn_client.h'
> --- libdrizzle-5.1/conn_client.h 2013-01-05 11:41:26 +0000
> +++ libdrizzle-5.1/conn_client.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
> /*
> * Drizzle Client & Protocol Library
> *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
> * Copyright (C) 2008 Eric Day (eday...

Hi Brian,

There are merge conflicts. Please resolve and re submit.

Thanks in advance.

Cheers,
-Vijay
On Jan 27, 2013 5:45 PM, "Brian Aker" <brian@tangent.org> wrote:

> Brian Aker has proposed merging
> lp:~brianaker/libdrizzle/update-copyright-headers into lp:libdrizzle.
>
> Requested reviews:
>   Drizzle Trunk (drizzle-trunk)
>
> For more details, see:
>
> https://code.launchpad.net/~brianaker/libdrizzle/update-copyright-headers/+merge/145086
> --
>
> https://code.launchpad.net/~brianaker/libdrizzle/update-copyright-headers/+merge/145086
> Your team Drizzle Trunk is requested to review the proposed merge of
> lp:~brianaker/libdrizzle/update-copyright-headers into lp:libdrizzle.
>
> === modified file 'docs/conf.py.in'
> --- docs/conf.py.in     2012-12-21 14:04:15 +0000
> +++ docs/conf.py.in     2013-01-27 12:14:21 +0000
> @@ -47,7 +47,7 @@
>
>  # General information about the project.
>  project = u'libdrizzle'
> -copyright = u'2012, Drizzle Development Group, http://drizzle.org/'
> +copyright = u'2008-2013, Drizzle Development Group, http://drizzle.org/'
>
>  # The version info for the project you're documenting, acts as
> replacement for
>  # |version| and |release|, also used in various other places throughout
> the
>
> === modified file 'libdrizzle-5.1/binlog.h'
> --- libdrizzle-5.1/binlog.h     2013-01-27 05:08:57 +0000
> +++ libdrizzle-5.1/binlog.h     2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/column.h'
> --- libdrizzle-5.1/column.h     2013-01-05 10:27:32 +0000
> +++ libdrizzle-5.1/column.h     2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/column_client.h'
> --- libdrizzle-5.1/column_client.h      2012-12-18 11:36:28 +0000
> +++ libdrizzle-5.1/column_client.h      2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/conn.h'
> --- libdrizzle-5.1/conn.h       2013-01-27 01:57:09 +0000
> +++ libdrizzle-5.1/conn.h       2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/conn_client.h'
> --- libdrizzle-5.1/conn_client.h        2013-01-05 11:41:26 +0000
> +++ libdrizzle-5.1/conn_client.h        2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/constants.h'
> --- libdrizzle-5.1/constants.h  2013-01-27 05:08:57 +0000
> +++ libdrizzle-5.1/constants.h  2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2011 Brian Aker (brian@tangent.org)
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>
> === modified file 'libdrizzle-5.1/drizzle.h'
> --- libdrizzle-5.1/drizzle.h    2013-01-27 09:48:19 +0000
> +++ libdrizzle-5.1/drizzle.h    2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/drizzle_client.h'
> --- libdrizzle-5.1/drizzle_client.h     2013-01-27 09:48:19 +0000
> +++ libdrizzle-5.1/drizzle_client.h     2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/error.h'
> --- libdrizzle-5.1/error.h      2012-12-30 02:23:50 +0000
> +++ libdrizzle-5.1/error.h      2013-01-27 12:14:21 +0000
> @@ -1,7 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/field_client.h'
> --- libdrizzle-5.1/field_client.h       2012-12-18 11:36:28 +0000
> +++ libdrizzle-5.1/field_client.h       2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/libdrizzle.h'
> --- libdrizzle-5.1/libdrizzle.h 2012-12-24 10:20:04 +0000
> +++ libdrizzle-5.1/libdrizzle.h 2013-01-27 12:14:21 +0000
> @@ -1,5 +1,5 @@
>  /* Drizzle Client Library
> - * Copyright (C) 2011 Olaf van der Spek
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/query.h'
> --- libdrizzle-5.1/query.h      2013-01-27 01:57:09 +0000
> +++ libdrizzle-5.1/query.h      2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/result.h'
> --- libdrizzle-5.1/result.h     2012-12-30 11:18:18 +0000
> +++ libdrizzle-5.1/result.h     2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/result_client.h'
> --- libdrizzle-5.1/result_client.h      2012-12-22 08:54:15 +0000
> +++ libdrizzle-5.1/result_client.h      2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/return.h'
> --- libdrizzle-5.1/return.h     2013-01-26 23:44:28 +0000
> +++ libdrizzle-5.1/return.h     2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * Copyright (C) 2012 Brian Aker (brian@tangent.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/row_client.h'
> --- libdrizzle-5.1/row_client.h 2012-12-18 11:36:28 +0000
> +++ libdrizzle-5.1/row_client.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/ssl.h'
> --- libdrizzle-5.1/ssl.h        2013-01-12 14:14:18 +0000
> +++ libdrizzle-5.1/ssl.h        2013-01-27 12:14:21 +0000
> @@ -1,7 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/statement.h'
> --- libdrizzle-5.1/statement.h  2013-01-12 14:14:18 +0000
> +++ libdrizzle-5.1/statement.h  2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/structs.h'
> --- libdrizzle-5.1/structs.h    2012-12-30 02:23:50 +0000
> +++ libdrizzle-5.1/structs.h    2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle-5.1/verbose.h'
> --- libdrizzle-5.1/verbose.h    2013-01-05 11:31:45 +0000
> +++ libdrizzle-5.1/verbose.h    2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * Copyright (C) 2012 Brian Aker (brian@tangent.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle-5.1/version.h.in'
> --- libdrizzle-5.1/version.h.in 2012-12-18 11:36:28 +0000
> +++ libdrizzle-5.1/version.h.in 2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   *  Drizzle Client & Protocol Library
>   *
> + *  Copyright (C) 2012-2013 Drizzle Developer Group
>   *  Copyright (C) 2012 Brian Aker, http://tangent.org/
>   *  All rights reserved.
>   *
>
> === modified file 'libdrizzle/binlog.cc'
> --- libdrizzle/binlog.cc        2013-01-27 05:22:31 +0000
> +++ libdrizzle/binlog.cc        2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/binlog.h'
> --- libdrizzle/binlog.h 2013-01-12 14:14:18 +0000
> +++ libdrizzle/binlog.h 2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/column.cc'
> --- libdrizzle/column.cc        2013-01-27 04:54:08 +0000
> +++ libdrizzle/column.cc        2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   *  Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/column.h'
> --- libdrizzle/column.h 2013-01-05 10:27:32 +0000
> +++ libdrizzle/column.h 2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/command.cc'
> --- libdrizzle/command.cc       2013-01-27 04:54:08 +0000
> +++ libdrizzle/command.cc       2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/common.h'
> --- libdrizzle/common.h 2013-01-27 09:48:19 +0000
> +++ libdrizzle/common.h 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
> @@ -89,5 +90,6 @@
>  #include "libdrizzle/column.h"
>  #include "libdrizzle/binlog.h"
>  #include "libdrizzle/handshake_client.h"
> +#include "libdrizzle/result.h"
>
>  #include <memory.h>
>
> === modified file 'libdrizzle/conn.cc'
> --- libdrizzle/conn.cc  2013-01-27 09:48:19 +0000
> +++ libdrizzle/conn.cc  2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/conn_local.h'
> --- libdrizzle/conn_local.h     2013-01-27 04:54:08 +0000
> +++ libdrizzle/conn_local.h     2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/conn_uds.cc'
> --- libdrizzle/conn_uds.cc      2013-01-12 13:36:22 +0000
> +++ libdrizzle/conn_uds.cc      2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/datetime.h'
> --- libdrizzle/datetime.h       2012-12-30 02:23:50 +0000
> +++ libdrizzle/datetime.h       2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/drizzle.cc'
> --- libdrizzle/drizzle.cc       2013-01-27 10:02:07 +0000
> +++ libdrizzle/drizzle.cc       2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/drizzle_local.h'
> --- libdrizzle/drizzle_local.h  2013-01-27 09:48:19 +0000
> +++ libdrizzle/drizzle_local.h  2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/error.cc'
> --- libdrizzle/error.cc 2013-01-05 15:56:07 +0000
> +++ libdrizzle/error.cc 2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2012 Brian Aker (brian@tangent.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/field.cc'
> --- libdrizzle/field.cc 2013-01-27 04:54:08 +0000
> +++ libdrizzle/field.cc 2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/handshake.cc'
> --- libdrizzle/handshake.cc     2013-01-27 04:54:08 +0000
> +++ libdrizzle/handshake.cc     2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/handshake_client.h'
> --- libdrizzle/handshake_client.h       2013-01-27 09:48:19 +0000
> +++ libdrizzle/handshake_client.h       2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/include.am'
> --- libdrizzle/include.am       2013-01-27 09:48:19 +0000
> +++ libdrizzle/include.am       2013-01-27 12:14:21 +0000
> @@ -12,6 +12,7 @@
>  noinst_HEADERS+= libdrizzle/pack.h
>  noinst_HEADERS+= libdrizzle/packet.h
>  noinst_HEADERS+= libdrizzle/poll.h
> +noinst_HEADERS+= libdrizzle/result.h
>  noinst_HEADERS+= libdrizzle/sha1.h
>  noinst_HEADERS+= libdrizzle/state.h
>  noinst_HEADERS+= libdrizzle/statement_local.h
>
> === modified file 'libdrizzle/pack.cc'
> --- libdrizzle/pack.cc  2013-01-26 23:31:43 +0000
> +++ libdrizzle/pack.cc  2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/pack.h'
> --- libdrizzle/pack.h   2013-01-05 10:27:32 +0000
> +++ libdrizzle/pack.h   2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/poll.cc'
> --- libdrizzle/poll.cc  2013-01-05 15:46:05 +0000
> +++ libdrizzle/poll.cc  2013-01-27 12:14:21 +0000
> @@ -1,4 +1,5 @@
>  /* LibMemcached
> + * Copyright (C) 2013 Drizzle Developer Group
>   * Copyright (C) 2010 Brian Aker, Trond Norbye
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/poll.h'
> --- libdrizzle/poll.h   2013-01-05 15:46:05 +0000
> +++ libdrizzle/poll.h   2013-01-27 12:14:21 +0000
> @@ -1,4 +1,5 @@
>  /* LibMemcached
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * Copyright (C) 2010 Brian Aker, Trond Norbye
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/query.cc'
> --- libdrizzle/query.cc 2013-01-27 01:57:09 +0000
> +++ libdrizzle/query.cc 2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/result.cc'
> --- libdrizzle/result.cc        2013-01-27 05:22:31 +0000
> +++ libdrizzle/result.cc        2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === added file 'libdrizzle/result.h'
> --- libdrizzle/result.h 1970-01-01 00:00:00 +0000
> +++ libdrizzle/result.h 2013-01-27 12:14:21 +0000
> @@ -0,0 +1,143 @@
> +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
> + *
> + * Drizzle Client & Protocol Library
> + *
> + * Copyright (C) 2013 Drizzle Developer Group
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are
> + * met:
> + *
> + *     * Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer.
> + *
> + *     * Redistributions in binary form must reproduce the above
> + * copyright notice, this list of conditions and the following disclaimer
> + * in the documentation and/or other materials provided with the
> + * distribution.
> + *
> + *     * The names of its contributors may not be used to endorse or
> + * promote products derived from this software without specific prior
> + * written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
> + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
> + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
> + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
> + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
> + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
> + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
> + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + *
> + */
> +
> +
> +#pragma once
> +
> +/**
> + * @ingroup drizzle_result
> + */
> +struct drizzle_result_st
> +{
> +  drizzle_st *con;
> +  drizzle_result_st *next;
> +  drizzle_result_st *prev;
> +  drizzle_result_options_t options;
> +
> +  char info[DRIZZLE_MAX_INFO_SIZE];
> +  uint16_t error_code;
> +  char sqlstate[DRIZZLE_MAX_SQLSTATE_SIZE + 1];
> +  uint64_t insert_id;
> +  uint16_t warning_count;
> +  uint64_t affected_rows;
> +
> +  uint16_t column_count;
> +  uint16_t column_current;
> +  drizzle_column_st *column_list;
> +  drizzle_column_st *column;
> +  drizzle_column_st *column_buffer;
> +
> +  uint64_t row_count;
> +  uint64_t row_current;
> +
> +  uint16_t field_current;
> +  size_t field_total;
> +  size_t field_offset;
> +  size_t field_size;
> +  drizzle_field_t field;
> +  drizzle_field_t field_buffer;
> +
> +  uint64_t row_list_size;
> +  drizzle_row_t row;
> +  drizzle_row_t *row_list;
> +  size_t *field_sizes;
> +  size_t **field_sizes_list;
> +  drizzle_binlog_st *binlog_event;
> +  bool binlog_checksums;
> +  uint8_t **null_bitmap_list;
> +  uint8_t *null_bitmap;
> +  uint8_t null_bitmap_length;
> +  bool binary_rows;
> +
> +  drizzle_result_st() :
> +    con(NULL),
> +    next(NULL),
> +    prev(NULL),
> +    options(DRIZZLE_RESULT_NONE),
> +    error_code(0),
> +    insert_id(0),
> +    warning_count(0),
> +    affected_rows(0),
> +    column_count(0),
> +    column_current(0),
> +    column_list(NULL),
> +    column(NULL),
> +    column_buffer(NULL),
> +    row_count(0),
> +    row_current(0),
> +    field_current(0),
> +    field_total(0),
> +    field_offset(0),
> +    field_size(0),
> +    field(NULL),
> +    field_buffer(NULL),
> +    row_list_size(0),
> +    row(NULL),
> +    row_list(NULL),
> +    field_sizes(NULL),
> +    field_sizes_list(NULL),
> +    binlog_event(NULL),
> +    binlog_checksums(false),
> +    null_bitmap_list(NULL),
> +    null_bitmap(NULL),
> +    null_bitmap_length(0),
> +    binary_rows(false)
> +  {
> +    info[0]= '\0';
> +    sqlstate[0]= '\0';
> +  }
> +
> +  bool push_state(drizzle_state_fn* func_)
> +  {
> +    if (con)
> +    {
> +      return con->push_state(func_);
> +    }
> +
> +    return false;
> +  }
> +
> +  bool has_state() const
> +  {
> +    if (con)
> +    {
> +      return con->has_state();
> +    }
> +
> +    return false;
> +  }
> +};
>
> === modified file 'libdrizzle/row.cc'
> --- libdrizzle/row.cc   2013-01-27 04:54:08 +0000
> +++ libdrizzle/row.cc   2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   *  Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/ssl.cc'
> --- libdrizzle/ssl.cc   2013-01-12 14:14:18 +0000
> +++ libdrizzle/ssl.cc   2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/state.cc'
> --- libdrizzle/state.cc 2013-01-27 04:54:08 +0000
> +++ libdrizzle/state.cc 2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/state.h'
> --- libdrizzle/state.h  2012-12-23 01:05:57 +0000
> +++ libdrizzle/state.h  2013-01-27 12:14:21 +0000
> @@ -1,6 +1,7 @@
>  /*
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
>
> === modified file 'libdrizzle/statement_local.h'
> --- libdrizzle/statement_local.h        2013-01-14 21:18:05 +0000
> +++ libdrizzle/statement_local.h        2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/statement_param.cc'
> --- libdrizzle/statement_param.cc       2013-01-15 13:37:21 +0000
> +++ libdrizzle/statement_param.cc       2013-01-27 12:14:21 +0000
> @@ -2,7 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> - * Copyright (C) 2012 Drizzle Developer Group
> + * Copyright (C) 2012-2013 Drizzle Developer Group
>   * All rights reserved.
>   *
>   * Redistribution and use in source and binary forms, with or without
>
> === modified file 'libdrizzle/structs.h'
> --- libdrizzle/structs.h        2013-01-27 06:03:16 +0000
> +++ libdrizzle/structs.h        2013-01-27 12:14:21 +0000
> @@ -2,6 +2,7 @@
>   *
>   * Drizzle Client & Protocol Library
>   *
> + * Copyright (C) 2008-2013 Drizzle Developer Group
>   * Copyright (C) 2008 Eric Day (eday@oddments.org)
>   * All rights reserved.
>   *
> @@ -391,6 +392,7 @@
>    }
>  };
>
> +<<<<<<< TREE
>  /**
>   * @ingroup drizzle_result
>   */
> @@ -492,6 +494,9 @@
>  };
>
>  struct drizzle_binlog_event_st
> +=======
> +struct drizzle_binlog_st
> +>>>>>>> MERGE-SOURCE
>  {
>    uint32_t timestamp;
>    drizzle_binlog_event_types_t type;
>
>
>

lp://qastaging/~brianaker/libdrizzle/update-copyright-headers updated on 2013-01-27

107. By Brian Aker on 2013-01-27: Extend error message in test.

Drizzle Client & Protocol Library

Merge lp://qastaging/~brianaker/libdrizzle/update-copyright-headers into lp://qastaging/libdrizzle

Commit message

Description of the change

Preview Diff

Subscribers