Merge lp:~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes into lp:~drizzle-trunk/drizzle/development

Proposed by Henrik Ingo on 2012-02-08
Status: Merged
Approved by: Mark Atwood on 2012-02-08
Approved revision: 2506
Merged at revision: 2504
Proposed branch: lp:~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 743 lines (+65/-434)
18 files modified
.bzrignore (+2/-0)
.bzrignore.THIS (+0/-389)
Makefile.am (+1/-15)
client/drizzle.cc (+2/-2)
client/drizzledump.cc (+2/-2)
client/server_detect.cc (+13/-3)
configure.ac (+2/-2)
docs/installing/redhat.rst (+3/-1)
drizzled/main.cc (+2/-2)
drizzled/sys_var.cc (+4/-4)
m4/pandora_vc_build.m4 (+23/-3)
plugin/auth_ldap/docs/index.rst (+3/-3)
plugin/innobase/xtrabackup/xtrabackup.cc (+1/-1)
support-files/drizzle.pc.in (+1/-1)
support-files/include.am (+1/-1)
tests/r/comments.result (+2/-2)
tests/valgrind.supp (+2/-2)
win32/config.h (+1/-1)
To merge this branch: bzr merge lp:~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes
Reviewer Review Type Date Requested Status
Drizzle Merge Team 2012-02-08 Pending
Review via email: mp+92161@code.launchpad.net

Description of the change

Combines
https://code.launchpad.net/~hingo/drizzle/drizzle-drizzledump-and-other-version-fixes/+merge/91598
and
https://code.launchpad.net/~hingo/drizzle/drizzle-the-version-is-7.1-not-a-date-and-certainly-not-7/+merge/90809

To recap:

To pass all tests, you must do bzr tag 7.1.31-rc first
If you don't, then main.comments will fail, this is correct behavior. Everything else should pass either way.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-02-05 04:23:43 +0000
3+++ .bzrignore 2012-02-08 23:35:14 +0000
4@@ -224,6 +224,7 @@
5 plugin/transaction_log/utilities/drizzletrx
6 po/POTFILES
7 po/drizzle7.pot
8+po/drizzle.pot
9 po/remove-potcdate.sed
10 po/stamp-it
11 po/stamp-po
12@@ -303,6 +304,7 @@
13 support-files/Makefile.in
14 support-files/drizzle-log-rotate
15 support-files/drizzle7.pc
16+support-files/drizzle.pc
17 support-files/drizzle.server
18 support-files/drizzle.spec
19 support-files/libdrizzle.pc
20
21=== removed file '.bzrignore.THIS'
22--- .bzrignore.THIS 2011-12-30 22:59:59 +0000
23+++ .bzrignore.THIS 1970-01-01 00:00:00 +0000
24@@ -1,389 +0,0 @@
25-*.bb
26-*.bbg
27-*.da
28-*.dirstamp
29-*.gcda
30-*.gcno
31-*.gmo
32-*.gz
33-*.la
34-*.linted
35-*.lo
36-*.orig
37-*.rej
38-*.reject
39-*.rpm
40-*replication.pb.*
41-*stamp-h
42-./ChangeLog
43-.DS_Store
44-.deps
45-.libs
46-.plugin.ini.stamp
47-.plugin.scan
48-ChangeLog
49-DEPENDENCIES
50-INSTALL
51-Makefile
52-Makefile.in
53-TAGS
54-aclocal.m4
55-authentication.gcno
56-autom4te.cache/
57-cached_item.gcno
58-calendar.gcno
59-check_stack_overrun.gcno
60-client/Makefile.in
61-client/drizzle
62-client/drizzleadmin
63-client/drizzlebinlog
64-client/drizzlecheck
65-client/drizzledump
66-client/drizzleimport
67-client/drizzleslap
68-client/drizzletest
69-client/mysqlslap
70-comp_creator.gcno
71-compile
72-config.guess
73-config.h
74-config.h.gch
75-config.h.in
76-config.log
77-config.status
78-config.sub
79-config/bzr_revinfo
80-config/pandora-plugin.list
81-config/pandora_vc_revinfo
82-config/plugin-list.ac
83-config/plugin-list.am
84-config/plugin.ac
85-config/plugin.am
86-config/plugin.list
87-config/plugin.stamp
88-config/top.h
89-configure
90-configvar.gcno
91-current_session.gcno
92-dbug/Makefile.in
93-depcomp
94-docs
95-docs/doctrees
96-docs/html
97-docs/plugins/*
98-docs/plugins/list.rst
99-doxerr.log
100-drizzle-2010.01.1315.tar.gz
101-drizzle.pot
102-drizzled.gcno
103-drizzled/configmake.h
104-drizzled/drizzled
105-drizzled/drizzled_safe
106-drizzled/function_hash.h
107-drizzled/gen_lex_hash
108-drizzled/generated_probes.h
109-drizzled/lex_hash.h
110-drizzled/message/alter_table.pb.cc
111-drizzled/message/alter_table.pb.h
112-drizzled/message/binary_log.pb.cc
113-drizzled/message/binary_log.pb.h
114-drizzled/message/binlog_reader
115-drizzled/message/binlog_writer
116-drizzled/message/command_reader
117-drizzled/message/engine.pb.cc
118-drizzled/message/engine.pb.h
119-drizzled/message/event.pb.cc
120-drizzled/message/event.pb.h
121-drizzled/message/length
122-drizzled/message/replication.pb.cc
123-drizzled/message/replication.pb.h
124-drizzled/message/replication_event.pb.cc
125-drizzled/message/replication_event.pb.h
126-drizzled/message/replication_event_reader
127-drizzled/message/replication_event_writer
128-drizzled/message/resultset.pb.cc
129-drizzled/message/resultset.pb.h
130-drizzled/message/schema.pb.cc
131-drizzled/message/schema.pb.h
132-drizzled/message/schema_reader
133-drizzled/message/schema_writer
134-drizzled/message/table.pb.cc
135-drizzled/message/table.pb.h
136-drizzled/message/table_raw_reader
137-drizzled/message/table_reader
138-drizzled/message/table_writer
139-drizzled/message/transaction.pb.cc
140-drizzled/message/transaction.pb.h
141-drizzled/message/transaction_writer
142-drizzled/module/load_list.h
143-drizzled/plugin/version.h
144-drizzled/schema.pb.cc
145-drizzled/schema.pb.h
146-drizzled/sql_builtin.cc
147-drizzled/sql_yacc.cc
148-drizzled/sql_yacc.hh
149-drizzled/sql_yacc.output
150-drizzled/sql_reserved_words.h
151-drizzled/symbol_hash.h
152-drizzled/version.h
153-dtcollation.gcno
154-errmsg.gcno
155-errmsg_print.gcno
156-error.gcno
157-examples/client
158-examples/pipe_query
159-examples/proxy
160-examples/server
161-examples/simple
162-examples/simple_multi
163-examples/sqlite_server
164-extra/Makefile.in
165-extra/comp_err
166-extra/innochecksum
167-extra/my_print_defaults
168-extra/mysql_waitpid
169-field.gcno
170-field_conv.gcno
171-field_iterator.gcno
172-filesort.gcno
173-gnulib/getopt.h
174-gnulib/time.h
175-gnulib/unistd.h
176-ha_trx_info.gcno
177-handler.gcno
178-handlerton.gcno
179-hybrid_type_traits.gcno
180-hybrid_type_traits_decimal.gcno
181-hybrid_type_traits_integer.gcno
182-include/Makefile.in
183-include/config.h
184-include/drizzle_version.h
185-include/mysqld_ername.h
186-include/mysqld_error.h
187-include/sql_state.h
188-include/stamp-h1
189-install-sh
190-item.gcno
191-key.gcno
192-key_map.gcno
193-libdrizzle-2.0/libdrizzle/mysql_password_hash
194-libdrizzle-2.0/libdrizzle/drizzle_password_hash
195-libmysql/Makefile.in
196-libserialutil_la-db.gcno
197-libserialutil_la-unireg.gcno
198-libtool
199-lint-rules.am
200-lock.gcno
201-log.gcno
202-logging.gcno
203-ltmain.sh
204-m4/bzr_version.m4
205-m4/libtool.m4
206-m4/ltoptions.m4
207-m4/ltsugar.m4
208-m4/ltversion.m4
209-m4/lt~obsolete.m4
210-mf_iocache.gcno
211-missing
212-my_decimal.gcno
213-mysql-test/Makefile.in
214-mysys/Makefile.in
215-mysys/tests/Makefile.in
216-name_resolution_context_state.gcno
217-natural_join_column.gcno
218-opt_range.gcno
219-opt_sum.gcno
220-out
221-pandora-plugin.ac
222-pandora-plugin.am
223-parser.gcno
224-patch
225-plugin/Makefile.in
226-plugin/archive/Makefile.in
227-plugin/archive/archive_performance
228-plugin/archive/archive_reader
229-plugin/archive/archive_test
230-plugin/archive/concurrency_test
231-plugin/blackhole/Makefile.in
232-plugin/csv/Makefile.in
233-plugin/heap/Makefile.in
234-plugin/innobase/Makefile.in
235-plugin/innobase/include/pars0grm.hh
236-plugin/innobase/include/pars0grm.h
237-plugin/innobase/pars/pars0grm.c
238-plugin/innobase/pars/pars0grm.cc
239-plugin/innobase/pars/pars0grm.h
240-plugin/innobase/pars/pars0lex.c
241-plugin/memcached_functions/start_mc.sh
242-plugin/memcached_functions/tests/start_mc.sh
243-plugin/myisam/Makefile.in
244-plugin/myisam/myisamchk
245-plugin/myisam/myisamlog
246-plugin/myisam/myisampack
247-plugin/storage_engine_api_tester/cursor_states_to_dot
248-plugin/storage_engine_api_tester/engine_states_to_dot
249-plugin/transaction_log/utilities/drizzletrx
250-po/POTFILES
251-po/drizzle7.pot
252-po/remove-potcdate.sed
253-po/stamp-it
254-po/stamp-po
255-protocol.gcno
256-qcache.gcno
257-query_id.gcno
258-records.gcno
259-regex/Makefile.in
260-rename.gcno
261-replicator.gcno
262-scheduling.gcno
263-scripts/Makefile.in
264-server/drizzled_safe
265-server/gen_lex_hash
266-server/lex_hash.h
267-server/share/czech/
268-server/share/danish/
269-server/share/dutch/
270-server/share/english/
271-server/share/estonian/
272-server/share/french/
273-server/share/german/
274-server/share/greek/
275-server/share/hungarian/
276-server/share/italian/
277-server/share/japanese-sjis/
278-server/share/japanese/
279-server/share/korean/
280-server/share/norwegian-ny/
281-server/share/norwegian/
282-server/share/polish/
283-server/share/portuguese/
284-server/share/romanian/
285-server/share/russian/
286-server/share/serbian/
287-server/share/slovak/
288-server/share/spanish/
289-server/share/swedish/
290-server/share/ukrainian/
291-server/sql_yacc.cc
292-server/sql_yacc.h
293-server/sql_yacc.output
294-session.gcno
295-set_var.gcno
296-show.gcno
297-sj_tmp_table.gcno
298-sql-common/Makefile.in
299-sql/Makefile.in
300-sql/share/Makefile.in
301-sql_base.gcno
302-sql_client.gcno
303-sql_connect.gcno
304-sql_delete.gcno
305-sql_derived.gcno
306-sql_error.gcno
307-sql_handler.gcno
308-sql_insert.gcno
309-sql_lex.gcno
310-sql_list.gcno
311-sql_load.gcno
312-sql_locale.gcno
313-sql_parse.gcno
314-sql_plugin.gcno
315-sql_select.gcno
316-sql_state.gcno
317-sql_string.gcno
318-sql_table.gcno
319-sql_udf.gcno
320-sql_union.gcno
321-sql_update.gcno
322-sql_yacc.gcno
323-stacktrace.gcno
324-stamp-h1
325-strfunc.gcno
326-strings/Makefile.in
327-strings/tests/Makefile.in
328-support-files/Makefile.in
329-support-files/drizzle-log-rotate
330-support-files/drizzle7.pc
331-support-files/drizzle.server
332-support-files/drizzle.spec
333-support-files/libdrizzle.pc
334-support-files/libdrizzle-1.0.pc
335-support-files/libdrizzle-2.0.pc
336-support-files/libdrizzleclient.pc
337-support-files/smf/Makefile.in
338-support-files/smf/drizzle
339-support-files/smf/drizzle.xml
340-support-files/smf/install.sh
341-table.gcno
342-table_map_iterator.gcno
343-temporal.gcno
344-temporal_format.gcno
345-tests/Makefile.in
346-tests/dtr
347-tests/dtr@
348-tests/dbqp
349-tests/dbqp_data/uuid
350-tests/dbqp_work
351-tests/install_test_db
352-tests/mtr
353-tests/mtr@
354-tests/resolve_stack_dump
355-tests/stripped_log
356-tests/test-run
357-tests/test-run@
358-tests/total_warning_count
359-tests/var
360-tests/workdir
361-thr_malloc.gcno
362-time.gcno
363-tmp_table.gcno
364-tztime.gcno
365-uniques.gcno
366-unittests/atomics_test
367-unittests/calendar_test
368-unittests/unittests
369-unittests/uwagi.txt
370-virtual_column_info.gcno
371-xid.gcno
372-ylwrap
373-docs/html
374-docs/dirhtml
375-docs/singlehtml
376-docs/pickle
377-docs/json
378-docs/htmlhelp
379-docs/qthelp
380-docs/devhelp
381-docs/epub
382-docs/latex
383-docs/latexpdf
384-docs/text
385-docs/man
386-docs/changes
387-docs/linkcheck
388-docs/doctest
389-.pc
390-drizzled/message/catalog.pb.cc
391-drizzled/message/catalog.pb.h
392-drizzled/message/catalog_reader
393-drizzled/message/catalog_writer
394-drizzled/message/replication_options.pb.cc
395-drizzled/message/replication_options.pb.h
396-drizzled/message/access.pb.cc
397-drizzled/message/access.pb.h
398-drizzled/execute/parser.cc
399-drizzled/execute/parser.h
400-drizzled/execute/parser.output
401-drizzled/execute/scanner.cc
402-drizzled/execute/scanner.h
403-plugin/innobase/xtrabackup/drizzlebackup.innobase
404-libdrizzle-2.0/drizzle_password_hash
405-libdrizzle-2.0/mysql_password_hash
406-tags
407-libdrizzle-1.0/t/c_test
408-libdrizzle-1.0/t/client_server
409-libdrizzle-1.0/t/drizzle_column_st
410-libdrizzle-1.0/t/drizzle_con_st
411-libdrizzle-1.0/t/drizzle_query_st
412-libdrizzle-1.0/t/drizzle_result_st
413-libdrizzle-1.0/t/drizzle_st
414
415=== modified file 'Makefile.am'
416--- Makefile.am 2012-02-05 04:23:43 +0000
417+++ Makefile.am 2012-02-08 23:35:14 +0000
418@@ -197,24 +197,10 @@
419 find ./ | $(GREP) \~$$ | xargs rm -f
420 bzr unknowns
421
422-install-exec-hook:
423- cd $(DESTDIR)$(sbindir) && \
424- mv -f drizzled$(EXEEXT) drizzled7$(EXEEXT) && \
425- $(LN_S) drizzled7$(EXEEXT) drizzled$(EXEEXT)
426-
427-install-data-hook:
428- cd $(DESTDIR)$(man8dir) && \
429- mv -f drizzled.8 drizzled7.8 && \
430- $(LN_S) drizzled7.8 drizzled.8
431-
432-uninstall-hook:
433- rm $(DESTDIR)$(man8dir)/drizzled7.8
434- rm $(DESTDIR)$(sbindir)/drizzled7$(EXEEXT)
435-
436 rpm-build: support-files/drizzle.spec
437 @rm -f ~/rpmbuild/RPMS/x86_64/drizzle-$(VERSION)*.rpm
438 @rm -f ~/rpmbuild/SRPMS/drizzle-$(VERSION)*.rpm
439- @cp drizzle7-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
440+ @cp drizzle-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
441 @cp support-files/drizzled.init ~/rpmbuild/SOURCES/
442 @rpmbuild -ba support-files/drizzle.spec
443 @cp ~/rpmbuild/RPMS/x86_64/drizzle-$(VERSION)*.rpm .
444
445=== modified file 'client/drizzle.cc'
446--- client/drizzle.cc 2012-02-05 04:23:43 +0000
447+++ client/drizzle.cc 2012-02-08 23:35:14 +0000
448@@ -1374,8 +1374,8 @@
449 # if defined(HAVE_LOCALE_H)
450 setlocale(LC_ALL, "");
451 # endif
452- bindtextdomain("drizzle7", LOCALEDIR);
453- textdomain("drizzle7");
454+ bindtextdomain("drizzle", LOCALEDIR);
455+ textdomain("drizzle");
456 #endif
457
458 po::options_description commandline_options(_("Options used only in command line"));
459
460=== modified file 'client/drizzledump.cc'
461--- client/drizzledump.cc 2012-02-05 04:23:43 +0000
462+++ client/drizzledump.cc 2012-02-08 23:35:14 +0000
463@@ -465,8 +465,8 @@
464 # if defined(HAVE_LOCALE_H)
465 setlocale(LC_ALL, "");
466 # endif
467- bindtextdomain("drizzle7", LOCALEDIR);
468- textdomain("drizzle7");
469+ bindtextdomain("drizzle", LOCALEDIR);
470+ textdomain("drizzle");
471 #endif
472
473 po::options_description commandline_options(_("Options used only in command line"));
474
475=== modified file 'client/server_detect.cc'
476--- client/server_detect.cc 2011-08-07 20:48:33 +0000
477+++ client/server_detect.cc 2012-02-08 23:35:14 +0000
478@@ -30,12 +30,22 @@
479 {
480 boost::match_flag_type flags = boost::match_default;
481
482- boost::regex mysql_regex("^([3-9]\\.[0-9]+\\.[0-9]+)");
483- boost::regex drizzle_regex("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
484+ // FIXME: Detecting capabilities from a version number is a recipe for
485+ // disaster, like we've seen with 15 years of JavaScript :-)
486+ // Anyway, as there is no MySQL 7.x yet, this will do for tonight.
487+ // I will get back to detect something tangible after the release (like
488+ // presence of some table or its record in DATA_DICTIONARY.
489+ boost::regex mysql_regex("^([3-6]\\.[0-9]+\\.[0-9]+)");
490+ boost::regex drizzle_regex7("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
491+ boost::regex drizzle_regex71("^([7-9]\\.[0-9]+\\.[0-9]+)");
492
493 version= drizzle_con_server_version(connection);
494
495- if (regex_search(version, drizzle_regex, flags))
496+ if (regex_search(version, drizzle_regex7, flags))
497+ {
498+ type= SERVER_DRIZZLE_FOUND;
499+ }
500+ else if (regex_search(version, drizzle_regex71, flags))
501 {
502 type= SERVER_DRIZZLE_FOUND;
503 }
504
505=== modified file 'configure.ac'
506--- configure.ac 2012-02-05 04:23:43 +0000
507+++ configure.ac 2012-02-08 23:35:14 +0000
508@@ -20,7 +20,7 @@
509 AC_PREREQ(2.59)dnl Minimum Autoconf version required.
510 dnl Version from the AC_INIT call below is overridden later
511 dnl So don't update it here
512-AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle],[drizzle7],[http://drizzle.org/])
513+AC_INIT([drizzle],[7.1],[http://bugs.launchpad.net/drizzle],[drizzle],[http://drizzle.org/])
514 AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
515 AC_CONFIG_AUX_DIR([config])
516
517@@ -170,7 +170,7 @@
518 tests/Makefile dnl
519 drizzled/plugin/version.h dnl
520 support-files/drizzle.spec dnl
521- support-files/drizzle7.pc dnl
522+ support-files/drizzle.pc dnl
523 support-files/libdrizzle.pc dnl
524 support-files/libdrizzle-1.0.pc dnl
525 support-files/smf/install.sh dnl
526
527=== modified file 'docs/installing/redhat.rst'
528--- docs/installing/redhat.rst 2012-02-05 04:23:43 +0000
529+++ docs/installing/redhat.rst 2012-02-08 23:35:14 +0000
530@@ -71,5 +71,7 @@
531
532 .. code-block:: bash
533
534- sudo yum install drizzle7-server drizzle7-client
535+ sudo yum install drizzle-server drizzle-client
536+
537+Note: On older versions of Fedora and RHEL, the packages are named drizzle7-server and drizzle7-client.
538
539
540=== modified file 'drizzled/main.cc'
541--- drizzled/main.cc 2012-02-05 04:23:43 +0000
542+++ drizzled/main.cc 2012-02-08 23:35:14 +0000
543@@ -237,8 +237,8 @@
544 # if defined(HAVE_LOCALE_H)
545 setlocale(LC_ALL, "");
546 # endif
547- bindtextdomain("drizzle7", LOCALEDIR);
548- textdomain("drizzle7");
549+ bindtextdomain("drizzle", LOCALEDIR);
550+ textdomain("drizzle");
551 #endif
552
553 module::Registry &modules= module::Registry::singleton();
554
555=== modified file 'drizzled/sys_var.cc'
556--- drizzled/sys_var.cc 2012-02-05 04:23:43 +0000
557+++ drizzled/sys_var.cc 2012-02-08 23:35:14 +0000
558@@ -94,8 +94,8 @@
559
560 namespace
561 {
562- static size_t revno= DRIZZLE7_VC_REVNO;
563- static size_t release_id= DRIZZLE7_RELEASE_ID;
564+ static size_t revno= DRIZZLE_VC_REVNO;
565+ static size_t release_id= DRIZZLE_RELEASE_ID;
566 }
567
568 const char *bool_type_names[]= { "OFF", "ON", NULL };
569@@ -245,8 +245,8 @@
570 /* Global read-only variable containing hostname */
571 static sys_var_const_string sys_hostname("hostname", getServerHostname());
572
573-static sys_var_const_str sys_revid("vc_revid", DRIZZLE7_VC_REVID);
574-static sys_var_const_str sys_branch("vc_branch", DRIZZLE7_VC_BRANCH);
575+static sys_var_const_str sys_revid("vc_revid", DRIZZLE_VC_REVID);
576+static sys_var_const_str sys_branch("vc_branch", DRIZZLE_VC_BRANCH);
577 static sys_var_size_t_ptr_readonly sys_revno("vc_revno", &revno);
578 static sys_var_size_t_ptr_readonly sys_release_id("vc_release_id", &release_id);
579
580
581=== modified file 'm4/pandora_vc_build.m4'
582--- m4/pandora_vc_build.m4 2012-02-05 04:23:43 +0000
583+++ m4/pandora_vc_build.m4 2012-02-08 23:35:14 +0000
584@@ -60,7 +60,15 @@
585 PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
586 PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
587 PANDORA_VC_BRANCH=`bzr nick`
588+ # Check if this branch has just been tagged (not yet committed)
589 PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
590+ # If not, then check if we have checked out a branch where most recent commit
591+ # was tagged, and there are no further (uncommitted) changes in the branch.
592+ if test "x${PANDORA_VC_TAG}" = "x"; then
593+ if test `bzr diff | wc -l` = 0; then
594+ PANDORA_VC_TAG=`bzr tags -r-2 | cut -f1 -d' ' | head -1`
595+ fi
596+ fi
597 PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' ' | tail -1`
598 if test "x${vc_changelog}" = "xyes"; then
599 bzr log --gnu > ChangeLog
600@@ -128,14 +136,26 @@
601
602 AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[
603 PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
604+ # We now support release tags to append a descriptive tag -stable, -rc, -beta, -alpha, -milestone.
605+ # But for the release id we want to remove that.
606+ PANDORA_VC_TAG_JUST_NUMBERS=`echo ${PANDORA_VC_TAG} | sed -e 's/-stable//' -e 's/-rc//' -e 's/-beta//' -e 's/-alpha//' -e 's/-milestone//'`
607+ # For release id we make sure each part is at least 2 digits, prepended with 0 when necessary.
608+ # Example: 1.2.3 should end up as 10203.
609+ # The sed's from left to right:
610+ # 1) Make sure minor version has at least 2 digits (2 -> 02)
611+ # 2) Make sure build version has at least 2 digits (3 -> 03)
612+ # 3) Remove dots (1.02.03 -> 10203)
613 changequote(<<, >>)dnl
614- PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'`
615+ PANDORA_RELEASE_ID=`echo ${PANDORA_VC_TAG_JUST_NUMBERS} | sed -e 's/\.\([0-9]\)\./.0\1./' | sed -e 's/\.\([0-9]\)$/.0\1/' | sed 's/[^0-9]//g'`
616 changequote([, ])dnl
617 ],[
618 AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[
619- PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}"
620+ # We now support release tags to append a descriptive tag -stable, -rc, -beta, -alpha, -milestone.
621+ # Since this is just a snapshot build, we need to remove that.
622+ PANDORA_VC_LATEST_TAG_JUST_NUMBERS=`echo ${PANDORA_VC_LATEST_TAG} | sed -e 's/-stable//' -e 's/-rc//' -e 's/-beta//' -e 's/-alpha//' -e 's/-milestone//'`
623+ PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG_JUST_NUMBERS}.${PANDORA_VC_REVNO}-snapshot"
624 changequote(<<, >>)dnl
625- PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG} | sed 's/[^0-9]//g'`
626+ PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG_JUST_NUMBERS} | sed -e 's/\.\([0-9]\)\./.0\1./' | sed -e 's/\.\([0-9]\)$/.0\1/' | sed 's/[^0-9]//g'`
627 changequote([, ])dnl
628 ],[
629 PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
630
631=== modified file 'plugin/auth_ldap/docs/index.rst'
632--- plugin/auth_ldap/docs/index.rst 2012-02-05 04:23:43 +0000
633+++ plugin/auth_ldap/docs/index.rst 2012-02-08 23:35:14 +0000
634@@ -418,12 +418,12 @@
635
636 You could just setup Drizzle to authenticate against standard LDAP accounts like
637 John Doe above. But the recommended way is to add a specific Drizzle schema.
638-You will find this in ``$DRIZZLE_ROOT/share/drizzle7/drizzle_openldap.ldif``.
639+You will find this in ``$DRIZZLE_ROOT/share/drizzle/drizzle_openldap.ldif``.
640 You can add it to your LDAP schema like this:
641
642 .. code-block:: none
643
644- $ sudo ldapadd -Y EXTERNAL -H ldapi:/// -f share/drizzle7/drizzle_openldap.ldif
645+ $ sudo ldapadd -Y EXTERNAL -H ldapi:/// -f share/drizzle/drizzle_openldap.ldif
646 SASL/EXTERNAL authentication started
647 SASL username: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth
648 SASL SSF: 0
649@@ -464,7 +464,7 @@
650
651 .. code-block:: none
652
653- $ share/drizzle7/drizzle_create_ldap_user -p secret -b bin/drizzle_password_hash -u hingo -n 1 -l "ou=people,dc=example,dc=com" > hingo.example.com.ldif
654+ $ share/drizzle/drizzle_create_ldap_user -p secret -b bin/drizzle_password_hash -u hingo -n 1 -l "ou=people,dc=example,dc=com" > hingo.example.com.ldif
655 $ cat hingo.example.com.ldif
656 dn: uid=hingo,ou=people,dc=example,dc=com
657 objectclass: top
658
659=== modified file 'plugin/innobase/xtrabackup/xtrabackup.cc'
660--- plugin/innobase/xtrabackup/xtrabackup.cc 2012-02-05 04:23:43 +0000
661+++ plugin/innobase/xtrabackup/xtrabackup.cc 2012-02-08 23:35:14 +0000
662@@ -634,7 +634,7 @@
663 static void print_version(void)
664 {
665 printf("%s Ver %s Rev %s for %s %s (%s)\n" ,my_progname,
666- XTRABACKUP_VERSION, XTRABACKUP_REVISION, "Drizzle7",
667+ XTRABACKUP_VERSION, XTRABACKUP_REVISION, "Drizzle",
668 TARGET_OS, TARGET_CPU);
669 }
670
671
672=== renamed file 'support-files/drizzle7.pc.in' => 'support-files/drizzle.pc.in'
673--- support-files/drizzle7.pc.in 2012-02-08 06:30:51 +0000
674+++ support-files/drizzle.pc.in 2012-02-08 23:35:14 +0000
675@@ -3,7 +3,7 @@
676 libdir=@libdir@
677 pkgincludedir=@pkgincludedir@
678
679-Name: drizzle7
680+Name: drizzle
681 Description: Drizzle CLI
682 Version: @VERSION@
683 URL: http://drizzle.org/
684
685=== modified file 'support-files/include.am'
686--- support-files/include.am 2012-02-05 04:23:43 +0000
687+++ support-files/include.am 2012-02-08 23:35:14 +0000
688@@ -27,6 +27,6 @@
689
690 pkgconfigdir= $(libdir)/pkgconfig
691 pkgconfig_DATA= \
692- support-files/drizzle7.pc \
693+ support-files/drizzle.pc \
694 support-files/libdrizzle.pc \
695 support-files/libdrizzle-1.0.pc
696
697=== modified file 'tests/r/comments.result'
698--- tests/r/comments.result 2011-03-06 23:59:06 +0000
699+++ tests/r/comments.result 2012-02-08 23:35:14 +0000
700@@ -11,8 +11,8 @@
701 1 +1
702 2
703 select 1 /*!72301 +1 */;
704-1 +1
705-2
706+1
707+1
708 select 1--1;
709 1--1
710 2
711
712=== modified file 'tests/valgrind.supp'
713--- tests/valgrind.supp 2012-02-05 04:23:43 +0000
714+++ tests/valgrind.supp 2012-02-08 23:35:14 +0000
715@@ -555,7 +555,7 @@
716 Memcheck:Leak
717 fun:_Znwm
718 fun:_ZN5boost6detail12set_tss_dataEPKvNS_10shared_ptrINS0_20tss_cleanup_functionEEEPvb
719- fun:_ZN8drizzled7Session12storeGlobalsEv
720+ fun:_ZN8drizzledSession12storeGlobalsEv
721 fun:_ZN8drizzled21drizzle_rm_tmp_tablesEv
722 fun:main
723 }
724@@ -564,7 +564,7 @@
725 Memcheck:Leak
726 fun:_Znwj
727 fun:_ZN5boost6detail12set_tss_dataEPKvNS_10shared_ptrINS0_20tss_cleanup_functionEEEPvb
728- fun:_ZN8drizzled7Session12storeGlobalsEv
729+ fun:_ZN8drizzledSession12storeGlobalsEv
730 fun:_ZN8drizzled21drizzle_rm_tmp_tablesEv
731 fun:main
732 }
733
734=== modified file 'win32/config.h'
735--- win32/config.h 2012-02-05 04:23:43 +0000
736+++ win32/config.h 2012-02-08 23:35:14 +0000
737@@ -34,6 +34,6 @@
738
739 #pragma once
740
741-#define PACKAGE_VERSION "drizzle7"
742+#define PACKAGE_VERSION "drizzle"
743 #define PACKAGE_BUGREPORT "http://bugs.launchpad.net/drizzle"
744