ChangeSet
  1.2264 05/05/13 10:04:35 lenz@mysql.com +1 -0
  - don't include sys.h directly in the autogenerated libedit source
    files - include config.h instead (compile fix for FreeBSD and AIX
    4.3/5.2)

  cmd-line-utils/libedit/makelist.sh
    1.8 05/05/13 10:04:31 lenz@mysql.com +2 -2
    - don't include sys.h directly in the autogenerated files - include
      config.h instead (compile fix for FreeBSD and AIX 4.3/5.2)

ChangeSet
  1.2263 05/05/12 19:02:26 kent@mysql.com +2 -0
  readline.c:
    Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
  search.c:
    FreeBSD needs <sys/types.h> to get 'off_t' defined

  cmd-line-utils/libedit/readline.c
    1.9 05/05/12 19:01:53 kent@mysql.com +1 -1
    Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2

  cmd-line-utils/libedit/search.c
    1.6 05/05/12 18:26:11 kent@mysql.com +1 -0
    FreeBSD needs <sys/types.h> to get 'off_t' defined

ChangeSet
  1.2262 05/05/12 18:18:37 lenz@mysql.com +1 -0
  - added a check for "u_int32_t"  to configure.in that will define 
    HAVE_U_INT32_T when available (needed to fix a double typedef in
    libedit)

  configure.in
    1.372 05/05/12 18:18:26 lenz@mysql.com +1 -0
    - added a check for "u_int32_t" that will define HAVE_U_INT32_T
      when available (needed to fix a double typedef in libedit)

ChangeSet
  1.2261 05/05/10 14:44:03 lenz@mysql.com +2 -0
  Applied two patches already commited to the main tree to resolve bugs found during the build:
   - removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
   - Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)

  sql/item_strfunc.h
    1.94 05/05/10 14:43:57 lenz@mysql.com +0 -1
    Remove the testcode

  mysql-test/t/range.test
    1.26 05/05/10 14:43:56 lenz@mysql.com +2 -0
    Fix for BUG#10070: Make the test not to produce warnings if InnoDB is not available

ChangeSet
  1.2260 05/05/10 02:15:59 holyfoot@hf-ibm.(none) +2 -0
  Fix for bug #10493 (SJIS fields are not correctly saved)

  BitKeeper/etc/logging_ok
    1.390 05/05/10 02:15:59 holyfoot@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  strings/ctype-sjis.c
    1.77 05/05/10 02:15:24 holyfoot@mysql.com +1 -1
    pos should be decreased

ChangeSet
  1.2259 05/05/09 20:55:06 bar@noter.(none) +3 -0
  SUBSTR with negative argument didn't work
  with multi-byte strings, length() instead
  of numchars() where used in a mistake.

  sql/item_strfunc.cc
    1.222 05/05/09 20:54:58 bar@mysql.com +1 -1
    SUBSTR with negative argument didn't work
    with multi-byte strings, length() instead
    of numchars() where used in a mistake.

  mysql-test/t/ctype_utf8.test
    1.52 05/05/09 20:54:58 bar@mysql.com +6 -0
    SUBSTR with negative argument didn't work
    with multi-byte strings, length() instead
    of numchars() where used in a mistake.

  mysql-test/r/ctype_utf8.result
    1.52 05/05/09 20:54:58 bar@mysql.com +3 -0
    SUBSTR with negative argument didn't work
    with multi-byte strings, length() instead
    of numchars() where used in a mistake.

ChangeSet
  1.2256.1.1 05/05/09 14:50:56 antony@ltantony.mysql.com +1 -0
  Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
  into ltantony.mysql.com:/usr/home/antony/work2/p3-bug8733

  sql/sql_yacc.yy
    1.384 05/05/09 14:50:49 antony@ltantony.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2257 05/05/09 16:25:25 ramil@ram-book.(none) +1 -0
  a fix (bug #10438: Raid stopped working because of change in atomic add detection).

ChangeSet
  1.2217.9.2 05/05/09 14:31:46 antony@ltantony.mysql.com +4 -0
  Bug#8733 - server accepts malformed query (multiply mentioned distinct)
    Detect conflicting options in SELECT

  sql/sql_yacc.yy
    1.382.1.1 05/05/09 14:31:32 antony@ltantony.mysql.com +18 -2
    We want to complain if DISTINCT or ALL is used in SELECT when a
    conflicting option is already selected.

  sql/mysql_priv.h
    1.347 05/05/09 14:31:31 antony@ltantony.mysql.com +3 -0
    New bit for ALL

  mysql-test/t/select.test
    1.36 05/05/09 14:31:31 antony@ltantony.mysql.com +16 -0
    Test for bug#8733

  mysql-test/r/select.result
    1.52 05/05/09 14:31:30 antony@ltantony.mysql.com +10 -0
    Test for bug#8733

ChangeSet
  1.2254.1.1 05/05/09 14:49:27 msvensson@neptunus.(none) +1 -0
  Fixes after review

  BUILD/check-cpu
    1.6 05/05/09 14:49:24 msvensson@neptunus.(none) +5 -4
    Change variable name
    Add missing fi
    Test with -n instead of -z

  include/my_global.h
    1.88 05/05/09 16:24:57 ramil@mysql.com +6 -0
    a fix (bug #10438: Raid stopped working because of change in atomic add detection).
    In order to compile with atomic.h on itanium we redefine 'new' because it's used
    as a local variable in this file and conflicts with a kernel header.

ChangeSet
  1.2254 05/05/09 11:33:16 msvensson@neptunus.(none) +3 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/sql_udf.h
    1.9 05/05/09 11:33:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item_sum.h
    1.80 05/05/09 11:33:15 msvensson@neptunus.(none) +0 -0
    Auto merged

  sql/item_func.h
    1.124 05/05/09 11:33:15 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2251.2.3 05/05/09 11:31:14 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug10241
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  include/my_global.h
    1.87 05/05/09 11:31:10 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2217.5.2 05/05/09 11:30:20 msvensson@neptunus.(none) +1 -0
  After review fixes

  include/my_global.h
    1.85.1.1 05/05/09 11:30:17 msvensson@neptunus.(none) +1 -1
    Add "&& defined(__GNUC__)"

ChangeSet
  1.2251.2.2 05/05/09 11:26:03 msvensson@neptunus.(none) +1 -0
  Fix check-cpu, add more recognized cpus

  BUILD/check-cpu
    1.5 05/05/09 11:25:59 msvensson@neptunus.(none) +16 -0
    Recognize more cpu's
    Fix for older compilers

ChangeSet
  1.2251.2.1 05/05/09 11:23:12 msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug10241
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/item.h
    1.180 05/05/09 11:23:08 msvensson@neptunus.(none) +0 -0
    Auto merged

  include/my_global.h
    1.86 05/05/09 11:23:08 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2251.1.1 05/05/09 11:04:34 joreland@mysql.com +2 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/error/ErrorReporter.cpp
    1.10 05/05/09 11:04:33 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/cw/cpcd/Process.cpp
    1.17 05/05/09 11:04:33 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2217.1.23 05/05/09 11:03:07 joreland@mysql.com +1 -0
  bug#10142 - ndb unique index resource shortage
    honor abort_option as TC now abort on 288

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.16 05/05/09 11:03:04 joreland@mysql.com +1 -1
    honor settings as TC now abort on 288

ChangeSet
  1.2252 05/05/09 12:18:19 dlenev@mysql.com +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/dlenev/src/mysql-4.1-bg9913

  sql/item_func.h
    1.122.1.1 05/05/09 12:18:13 dlenev@mysql.com +0 -0
    Auto merged

  sql/item_func.cc
    1.242 05/05/09 12:18:13 dlenev@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2249.1.1 05/05/09 09:25:47 lenz@mysql.com +2 -0
  - added "--skip-comments" to the "mysqldump" test to avoid printing comments that include 
    version-dependent information (which causes test failures when running the test with a
    different version string)

  mysql-test/t/mysqldump.test
    1.30 05/05/09 09:25:42 lenz@mysql.com +2 -2
    - added "--skip-comments" to avoid printing comments that include version-dependent information
      (which causes test failures when running the test with a different version string)

  mysql-test/r/mysqldump.result
    1.42 05/05/09 09:25:42 lenz@mysql.com +0 -28
    - fixed the results (removed the version-dependent comments to avoid a test failure)

ChangeSet
  1.2250 05/05/09 09:24:05 serg@sergbook.mylan +1 -0
  don't use tmp file for such a triviality

  scripts/mysql_install_db.sh
    1.72 05/05/09 09:21:49 serg@sergbook.mylan +1 -4
    don't use tmp file for such a triviality

ChangeSet
  1.2246.1.2 05/05/09 00:47:47 lenz@mysql.com +1 -0
  - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build)

  mysql-test/t/range.test
    1.25 05/05/09 00:47:38 lenz@mysql.com +2 -0
    - fix the range test to pass when InnoDB is note enabled (e.g. in the "-classic" build)

ChangeSet
  1.2245.1.1 05/05/09 00:35:48 lenz@mysql.com +1 -0
  - added cmd-line-utils/libedit/vis.h to the source distribution

  cmd-line-utils/libedit/Makefile.am
    1.13 05/05/09 00:35:33 lenz@mysql.com +1 -1
    - added vis.h to the source distribution

ChangeSet
  1.2243.1.2 05/05/08 22:16:24 mskold@mysql.com +2 -0
  Fixes to compile with icc

  ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.15 05/05/08 22:15:59 mskold@mysql.com +4 -0
    Fixes to compile with icc

  ndb/src/cw/cpcd/Process.cpp
    1.15.1.1 05/05/08 22:15:59 mskold@mysql.com +4 -1
    Fixes to compile with icc

ChangeSet
  1.2217.1.22 05/05/08 20:23:05 joreland@mysql.com +1 -0
  ndb - autotest
    fix name of result tar ball

  ndb/test/run-test/ndb-autotest.sh
    1.10 05/05/08 20:23:02 joreland@mysql.com +1 -1
    append run to result tar ball

ChangeSet
  1.2246 05/05/08 19:16:37 mwagner@ultrafly.mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into ultrafly.mysql.com:/Users/mwagner/work/bk/mysql-4.1

  BitKeeper/etc/logging_ok
    1.389 05/05/08 19:16:13 mwagner@ultrafly.mysql.com +0 -0
    auto-union

ChangeSet
  1.2243.3.1 05/05/08 19:14:28 mwagner@ultrafly.mysql.com +25 -0
  errmsg.txt:
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  BitKeeper/etc/logging_ok
    1.387.1.1 05/05/08 19:14:27 mwagner@ultrafly.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/ukrainian/errmsg.txt
    1.94 05/05/08 19:13:14 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/swedish/errmsg.txt
    1.134 05/05/08 19:13:12 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/spanish/errmsg.txt
    1.134 05/05/08 19:13:09 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/slovak/errmsg.txt
    1.133 05/05/08 19:13:07 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/serbian/errmsg.txt
    1.80 05/05/08 19:12:59 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/russian/errmsg.txt
    1.128 05/05/08 19:12:57 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/romanian/errmsg.txt
    1.133 05/05/08 19:12:55 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/portuguese/errmsg.txt
    1.133 05/05/08 19:12:52 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/polish/errmsg.txt
    1.132 05/05/08 19:12:50 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/norwegian-ny/errmsg.txt
    1.132 05/05/08 19:12:47 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/norwegian/errmsg.txt
    1.133 05/05/08 19:12:33 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/korean/errmsg.txt
    1.132 05/05/08 19:12:30 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/japanese-sjis/errmsg.txt
    1.3 05/05/08 19:12:27 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/japanese/errmsg.txt
    1.130 05/05/08 19:12:24 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/italian/errmsg.txt
    1.138 05/05/08 19:11:40 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/hungarian/errmsg.txt
    1.133 05/05/08 19:11:38 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/greek/errmsg.txt
    1.133 05/05/08 19:11:36 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/german/errmsg.txt
    1.128 05/05/08 19:11:35 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/french/errmsg.txt
    1.133 05/05/08 19:11:33 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/estonian/errmsg.txt
    1.132 05/05/08 19:11:29 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/english/errmsg.txt
    1.148 05/05/08 19:11:26 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/dutch/errmsg.txt
    1.134 05/05/08 19:11:24 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/danish/errmsg.txt
    1.129 05/05/08 19:11:22 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

  sql/share/czech/errmsg.txt
    1.134 05/05/08 19:11:18 mwagner@ultrafly.mysql.com +1 -0
    Add newline at EOF for proper processing by comp-err.exe on Windows where fgets() works differently than Linux (Bug #6195).

ChangeSet
  1.2245 05/05/08 01:51:26 antony@ltantony.mysql.com +1 -0
  Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
  into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1

  BitKeeper/etc/logging_ok
    1.388 05/05/08 01:50:06 antony@ltantony.mysql.com +0 -1
    auto-union

ChangeSet
  1.2217.9.1 05/05/08 01:18:19 antony@ltantony.mysql.com +2 -0
  FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model.

  BitKeeper/etc/logging_ok
    1.378.1.1 05/05/08 01:18:18 antony@ltantony.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  BUILD/check-cpu
    1.4 05/05/08 01:18:03 antony@ltantony.mysql.com +12 -0
    FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model.

ChangeSet
  1.2243.2.1 05/05/07 13:57:22 jimw@mysql.com +1 -0
  Add special error message for .frm files with an un-understood version, like
  those from 5.0 with new datatypes. (Bug #10435)

  sql/table.cc
    1.128 05/05/07 13:54:07 jimw@mysql.com +13 -2
    Print distinct version mismatch message when encountering a .frm file with
    a version that is not understood.

ChangeSet
  1.2240.1.1 05/05/07 22:04:52 mskold@mysql.com +2 -0
  bug#9813: Post review fixes

  sql/ha_ndbcluster.cc
    1.152 05/05/07 22:04:26 mskold@mysql.com +4 -0
    bug#9813: Post review fixes

  ndb/src/ndbapi/Ndb.cpp
    1.42 05/05/07 22:04:26 mskold@mysql.com +6 -5
    bug#9813: Post review fixes

ChangeSet
  1.2244 05/05/07 22:04:10 lenz@mysql.com +1 -0
  - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" instead of 
    #include <mysql_priv.h>

  sql/ha_blackhole.cc
    1.3 05/05/07 22:04:05 lenz@mysql.com +1 -1
    - Windows compile fix - use #include "mysql_priv.h" instead of #include <mysql_priv.h>

ChangeSet
  1.2233.2.1 05/05/07 09:49:39 brian@brian-akers-computer.local +4 -0
  Patch for --insert-ignore

  mysql-test/t/mysqldump.test
    1.29 05/05/07 09:23:14 brian@brian-akers-computer.local +10 -0
    New additions to the test. 

  mysql-test/r/mysqldump.result
    1.41 05/05/07 09:23:13 brian@brian-akers-computer.local +88 -0
    Test results for --ignore-insert option.

  client/mysqldump.c
    1.186 05/05/07 09:23:13 brian@brian-akers-computer.local +12 -7
    Additional insert-ignore, change of delayed variable to insert_option

  client/client_priv.h
    1.34 05/05/07 09:23:12 brian@brian-akers-computer.local +1 -1
    Additional option for insert-ignore

ChangeSet
  1.2217.1.21 05/05/07 18:20:29 joreland@mysql.com +5 -0
  ndb - autotest
    fix configs and scripts

  ndb/test/run-test/ndb-autotest.sh
    1.9 05/05/07 18:20:26 joreland@mysql.com +5 -4
    minor bugs

  ndb/test/run-test/conf-daily-sql-ndbmaster.txt
    1.3 05/05/07 18:20:26 joreland@mysql.com +1 -1
    fix ports

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.3 05/05/07 18:20:26 joreland@mysql.com +1 -1
    fix ports

  ndb/test/run-test/conf-daily-basic-ndbmaster.txt
    1.3 05/05/07 18:20:26 joreland@mysql.com +1 -1
    fix ports

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.4 05/05/07 18:20:26 joreland@mysql.com +1 -1
    fix ports

ChangeSet
  1.2243 05/05/07 08:35:55 jimw@mysql.com +4 -0
  Merge

  libmysql/libmysql.c
    1.292 05/05/07 08:35:47 jimw@mysql.com +0 -34
    Merge from 4.0

  sql/share/Makefile.am
    1.26 05/05/07 08:35:09 jimw@mysql.com +0 -1
    Auto merged

  configure.in
    1.371 05/05/07 08:35:09 jimw@mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.387 05/05/07 08:35:05 jimw@mysql.com +1 -1
    auto-union

ChangeSet
  1.1346.1.753 05/05/07 07:50:04 jimw@mysql.com +1 -0
  Backport fix for escaping multibyte characters. (Bug #9864)

  libmysql/libmysql.c
    1.95.1.63 05/05/07 07:48:05 jimw@mysql.com +34 -0
    Backport fix for escaping multibyte characters from 4.1

ChangeSet
  1.2242 05/05/07 14:46:54 antony@ltantony.mysql.com +2 -0
  Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666
  into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1

  mysql-test/r/create.result
    1.77 05/05/07 14:46:50 antony@ltantony.mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.386 05/05/07 14:46:27 antony@ltantony.mysql.com +0 -1
    auto-union

ChangeSet
  1.2241 05/05/07 14:43:03 antony@ltantony.mysql.com +1 -0
  Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725
  into ltantony.mysql.com:/usr/home/antony/work2/megapatch-4.1

  BitKeeper/etc/logging_ok
    1.385 05/05/07 14:42:23 antony@ltantony.mysql.com +0 -1
    auto-union

ChangeSet
  1.2229.3.1 05/05/07 13:51:29 antony@ltantony.mysql.com +4 -0
  Bug#9666 - Can't use 'DEFAULT FALSE' for column of type bool
    Fix bug by moving TRUE/FALSE in with other literals.

  BitKeeper/etc/logging_ok
    1.382.3.1 05/05/07 13:51:27 antony@ltantony.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.383 05/05/07 13:50:24 antony@ltantony.mysql.com +2 -4
    Move TRUE/FALSE in with other literals.

  mysql-test/t/create.test
    1.49 05/05/07 13:50:20 antony@ltantony.mysql.com +11 -0
    Test for Bug#9666

  mysql-test/r/create.result
    1.75.1.1 05/05/07 13:50:18 antony@ltantony.mysql.com +11 -0
    Test for Bug#9666

ChangeSet
  1.2229.2.3 05/05/07 13:31:37 antony@ltantony.mysql.com +4 -0
  Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate key update"
    INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
    Fix so that protocol doesn't break by properly ignoring dups.

  BitKeeper/etc/logging_ok
    1.382.2.1 05/05/07 13:31:34 antony@ltantony.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_insert.cc
    1.161 05/05/07 13:31:15 antony@ltantony.mysql.com +4 -0
    Ignore the failure in update_row when IGNORE is set.

  mysql-test/t/insert_update.test
    1.12 05/05/07 13:31:14 antony@ltantony.mysql.com +12 -0
    Test for Bug#9725

  mysql-test/r/insert_update.result
    1.12 05/05/07 13:31:13 antony@ltantony.mysql.com +13 -0
    Test for Bug#9725

ChangeSet
  1.2217.1.20 05/05/07 13:23:38 joreland@mysql.com +3 -0
  ndb - autotest
    fixes

  ndb/test/run-test/ndb-autotest.sh
    1.8 05/05/07 13:23:35 joreland@mysql.com +10 -11
    more scripts updates

  ndb/test/run-test/make-config.sh
    1.5 05/05/07 13:23:35 joreland@mysql.com +8 -2
    output d.txt aswell

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.3 05/05/07 13:23:35 joreland@mysql.com +2 -2
    dl145 uses /home for running

ChangeSet
  1.2217.1.19 05/05/07 11:53:06 joreland@mysql.com +2 -0
  ndb - autotest
    upgrades to shell script

  ndb/test/run-test/ndb-autotest.sh
    1.7 05/05/07 11:53:03 joreland@mysql.com +11 -15
    bump version
    use rsync to sync participating hosts

  ndb/test/run-test/Makefile.am
    1.18 05/05/07 11:53:03 joreland@mysql.com +6 -1
    add config files

ChangeSet
  1.1346.1.751 05/05/07 11:35:14 gbichot@production.mysql.com +3 -0
  [backport of 4.1, because 4.0 autobuild now hits the same problem;
  when merging just use "ul"] In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile).
  In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile.

  BitKeeper/etc/logging_ok
    1.206.36.2 05/05/07 11:35:14 gbichot@production.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/share/Makefile.am
    1.20.1.2 05/05/07 11:30:19 gbichot@production.mysql.com +1 -1
    using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
    all-local is the standard way to :

  configure.in
    1.191.1.135 05/05/07 11:29:23 gbichot@production.mysql.com +0 -1
    Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
    because config.status may later need this file (if it does not find it
    it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.33 05/05/07 11:05:22 pekka@mysql.com +2 -0
    same number of lh3distrbits for all frags

ChangeSet
  1.2235.1.1 05/05/07 10:56:03 pekka@mysql.com +1 -0
  ndb - bug#8928

ChangeSet
  1.2238 05/05/07 01:05:19 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-9186
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  client/mysql.cc
    1.204 05/05/07 01:05:19 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2236 05/05/07 01:00:24 jimw@mysql.com +2 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8497
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/sql_select.cc
    1.399 05/05/07 01:00:23 jimw@mysql.com +0 -0
    Auto merged

  sql/ha_heap.cc
    1.51 05/05/07 01:00:23 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2229.2.2 05/05/07 01:26:10 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0-build
  into mysql.com:/space/my/mysql-4.1-build

  BUILD/compile-dist
    1.5 05/05/07 01:26:09 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.827.2 05/05/07 01:25:20 lenz@mysql.com +1 -0
  - typo fix in BUILD/compile-dist

  BUILD/compile-dist
    1.1.1.3 05/05/07 01:25:15 lenz@mysql.com +1 -1
    - typo fix

ChangeSet
  1.2229.2.1 05/05/07 01:18:01 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0-build
  into mysql.com:/space/my/mysql-4.1-build

  BUILD/compile-dist
    1.4 05/05/07 01:17:58 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.827.1 05/05/07 00:53:36 lenz@mysql.com +1 -0
  - added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
    unresolved symbols

  BUILD/compile-dist
    1.1.1.2 05/05/07 00:53:32 lenz@mysql.com +5 -0
    - added some required CXXFLAGS to allow the distribution build to pass

ChangeSet
  1.2217.1.18 05/05/06 19:20:32 joreland@mysql.com +5 -0
  ndb - autotest
    fix count of nodes needed in test

  ndb/test/run-test/ndb-autotest.sh
    1.6 05/05/06 19:20:29 joreland@mysql.com +8 -2
    Fix count of needed computers for test

  ndb/test/run-test/conf-daily-sql-ndbmaster.txt
    1.2 05/05/06 19:20:29 joreland@mysql.com +2 -2
    Fix typo

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.2 05/05/06 19:20:29 joreland@mysql.com +1 -1
    Fix typo

  ndb/test/run-test/conf-daily-basic-ndbmaster.txt
    1.2 05/05/06 19:20:29 joreland@mysql.com +1 -1
    Fix typo

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.2 05/05/06 19:20:29 joreland@mysql.com +1 -1
    Fix typo

ChangeSet
  1.2217.1.17 05/05/06 18:58:46 joreland@mysql.com +1 -0
  ndb - autotest
    fix to ndb-autotest.sh

  ndb/test/run-test/ndb-autotest.sh
    1.5 05/05/06 18:58:43 joreland@mysql.com +1 -1
    Add bin/ to get access to ndb_cpcc

ChangeSet
  1.2233.1.1 05/05/06 17:30:36 antony@ltantony.mysql.com +1 -0
  Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
  into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1

  BitKeeper/etc/logging_ok
    1.384 05/05/06 17:30:07 antony@ltantony.mysql.com +0 -0
    auto-union

ChangeSet
  1.2217.1.16 05/05/06 17:26:22 joreland@mysql.com +6 -0
  ndb - autotest
    Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads

  ndb/test/src/CpcClient.cpp
    1.11 05/05/06 17:26:19 joreland@mysql.com +3 -0
    Add shutdown options
     (so far only SIGKILL)

  ndb/test/run-test/main.cpp
    1.26 05/05/06 17:26:19 joreland@mysql.com +2 -0
    Add shutdown options
     (so far only SIGKILL)

  ndb/test/include/CpcClient.hpp
    1.3 05/05/06 17:26:19 joreland@mysql.com +1 -0
    Add shutdown options
     (so far only SIGKILL)

  ndb/src/cw/cpcd/Process.cpp
    1.16 05/05/06 17:26:19 joreland@mysql.com +8 -1
    Add shutdown options
     (so far only SIGKILL)

  ndb/src/cw/cpcd/CPCD.hpp
    1.3 05/05/06 17:26:19 joreland@mysql.com +6 -0
    Add shutdown options
     (so far only SIGKILL)

  ndb/src/cw/cpcd/APIService.cpp
    1.7 05/05/06 17:26:19 joreland@mysql.com +1 -0
    Add shutdown options
     (so far only SIGKILL)

ChangeSet
  1.2229.1.1 05/05/06 16:16:05 antony@ltantony.mysql.com +2 -0
  Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616
  into ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616-4.1

  sql/sql_base.cc
    1.246 05/05/06 16:16:01 antony@ltantony.mysql.com +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.382.1.1 05/05/06 16:15:34 antony@ltantony.mysql.com +0 -0
    auto-union

ChangeSet
  1.2234 05/05/06 18:25:54 ramil@ram-book.(none) +5 -0
  fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

ChangeSet
  1.2233 05/05/06 20:11:00 bar@noter.(none) +2 -0
  Bug#6611: wrong sorting order.
  Adding cp1250_croatian_ci collation.

  sql/share/charsets/cp1250.xml
    1.5 05/05/06 20:10:57 bar@mysql.com +23 -2
    Bug#6611: wrong sorting order.
    Adding cp1250_croatian_ci collation.

  sql/share/charsets/Index.xml
    1.35 05/05/06 20:10:57 bar@mysql.com +3 -0
    Bug#6611: wrong sorting order.
    Adding cp1250_croatian_ci collation.

ChangeSet
  1.2217.1.15 05/05/06 16:41:46 joreland@mysql.com +7 -0
  ndb - autotest
    put config files in bk
    

  ndb/test/run-test/conf-daily-sql-ndbmaster.txt
    1.1 05/05/06 16:41:44 joreland@mysql.com +20 -0

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.1 05/05/06 16:41:44 joreland@mysql.com +19 -0

  ndb/test/run-test/conf-daily-sql-ndbmaster.txt
    1.0 05/05/06 16:41:44 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-sql-ndbmaster.txt

  ndb/test/run-test/conf-daily-devel-ndbmaster.txt
    1.0 05/05/06 16:41:44 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-devel-ndbmaster.txt

  ndb/test/run-test/conf-daily-basic-shark.txt
    1.1 05/05/06 16:41:43 joreland@mysql.com +19 -0

  ndb/test/run-test/conf-daily-basic-ndbmaster.txt
    1.1 05/05/06 16:41:43 joreland@mysql.com +19 -0

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.1 05/05/06 16:41:43 joreland@mysql.com +19 -0

  ndb/test/run-test/ndb-autotest.sh
    1.4 05/05/06 16:41:43 joreland@mysql.com +26 -7
    Check for 5.1 disrectory structure
    Add config files to distribution
    Remove unpacking for ndb-autotest.sh

  ndb/test/run-test/make-config.sh
    1.4 05/05/06 16:41:43 joreland@mysql.com +1 -1
    Corrent directory

  ndb/test/run-test/conf-daily-basic-shark.txt
    1.0 05/05/06 16:41:43 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-shark.txt

  ndb/test/run-test/conf-daily-basic-ndbmaster.txt
    1.0 05/05/06 16:41:43 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-ndbmaster.txt

  ndb/test/run-test/conf-daily-basic-dl145a.txt
    1.0 05/05/06 16:41:43 joreland@mysql.com +0 -0
    BitKeeper file /home/jonas/src/mysql-4.1/ndb/test/run-test/conf-daily-basic-dl145a.txt

ChangeSet
  1.2217.1.14 05/05/06 16:14:30 joreland@mysql.com +2 -0
  ndb - autotest
    use newly created script for faster handling of several configurations

  ndb/test/run-test/ndb-autotest.sh
    1.3 05/05/06 16:14:28 joreland@mysql.com +5 -2
    1) install mysql_db 
    2) use make-config script

  ndb/test/run-test/make-config.sh
    1.3 05/05/06 16:14:28 joreland@mysql.com +17 -6
    put cluster config in same config as distribution config

ChangeSet
  1.1346.1.750 05/05/06 14:42:28 antony@ltantony.mysql.com +2 -0
  Bug#6616
    MySQL server 100% CPU if FLUSH TABLES WITH READ LOCK + INSERT
    Infinite loop caused by missing update to thd version.

  BitKeeper/etc/logging_ok
    1.206.36.1 05/05/06 14:42:27 antony@ltantony.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_base.cc
    1.117.1.70 05/05/06 14:42:06 antony@ltantony.mysql.com +1 -0
    Bug#6616
      thd version needs to be updated before reopening tables
      to prevent an infinite loop.

ChangeSet
  1.2231 05/05/06 18:41:41 bar@noter.(none) +3 -0
  Bug#6505 Wrong sorting order:
  latin2_croatian_ci collation was fixed.

  sql/share/charsets/latin2.xml
    1.6 05/05/06 18:41:38 bar@mysql.com +16 -16
    Bug#6505 Wrong sorting order:
    latin2_croatian_ci collation was fixed.

  mysql-test/t/ctype_latin2.test
    1.2 05/05/06 18:41:38 bar@mysql.com +7 -4
    Bug#6505 Wrong sorting order:
    latin2_croatian_ci collation was fixed.

  mysql-test/r/ctype_latin2.result
    1.2 05/05/06 18:41:38 bar@mysql.com +141 -144
    Bug#6505 Wrong sorting order:
    latin2_croatian_ci collation was fixed.

ChangeSet
  1.2217.1.13 05/05/06 15:37:51 joreland@mysql.com +1 -0
  ndb - autotest
    update make-config script

  ndb/test/run-test/make-config.sh
    1.2 05/05/06 15:37:49 joreland@mysql.com +63 -444
    update make-config script

  sql/item.cc
    1.201 05/05/06 18:25:49 ramil@mysql.com +1 -1
    fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

  mysql-test/t/innodb.test
    1.67 05/05/06 18:25:49 ramil@mysql.com +9 -0
    fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

  mysql-test/r/type_float.result
    1.32 05/05/06 18:25:49 ramil@mysql.com +1 -1
    fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

  mysql-test/r/innodb.result
    1.97 05/05/06 18:25:49 ramil@mysql.com +6 -0
    fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

  mysql-test/r/create.result
    1.76 05/05/06 18:25:49 ramil@mysql.com +4 -4
    fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and InnoDB

ChangeSet
  1.2230 05/05/06 15:24:07 rburnett@bk-internal.mysql.com +1 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
  into bk-internal.mysql.com:/users/rburnett/bug10245

  BitKeeper/etc/logging_ok
    1.383 05/05/06 15:23:50 rburnett@bk-internal.mysql.com +0 -1
    auto-union

ChangeSet
  1.2229 05/05/06 15:10:01 rburnett@bk-internal.mysql.com +1 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
  into bk-internal.mysql.com:/users/rburnett/bug9721

  BitKeeper/etc/logging_ok
    1.382 05/05/06 15:09:43 rburnett@bk-internal.mysql.com +0 -0
    auto-union

ChangeSet
  1.2228 05/05/06 15:08:10 rburnett@bk-internal.mysql.com +1 -0
  Bug #9721 net_write_timeout not used on Windows 
  
  viosocket.c:
    Use ?: syntax to simplify code for setting both timeouts

  vio/viosocket.c
    1.30 05/05/06 15:03:20 rburnett@bk-internal.mysql.com +3 -6
    Use ?: syntax to simplify code for setting both timeouts

ChangeSet
  1.2217.1.12 05/05/06 14:44:43 joreland@mysql.com +2 -0
  ndb - add support for mysql servers in autotest

  ndb/test/run-test/run-test.hpp
    1.5 05/05/06 14:44:40 joreland@mysql.com +1 -0
    ndb - add support for mysql servers in autotest

  ndb/test/run-test/main.cpp
    1.25 05/05/06 14:44:40 joreland@mysql.com +19 -22
    ndb - add support for mysql servers in autotest

ChangeSet
  1.2226.4.1 05/05/06 16:12:42 ramil@ram-book.(none) +1 -0
  A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).

  include/my_global.h
    1.84.1.1 05/05/06 16:12:38 ramil@mysql.com +0 -12
    A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).
    We don't need to manipulate HAVE_ATOMIC_XXX here as we test it in the configure.

ChangeSet
  1.2226.3.1 05/05/06 15:22:55 bar@noter.(none) +3 -0
  bug#6504 Upper/Lower conversion bug:
  upper/lower conversion for LATIN LETTER D WITH STROKE
  was wrong in latin2.

  mysql-test/t/ctype_latin2.test
    1.1 05/05/06 15:22:25 bar@mysql.com +47 -0

  mysql-test/r/ctype_latin2.result
    1.1 05/05/06 15:22:25 bar@mysql.com +147 -0

  sql/share/charsets/latin2.xml
    1.5 05/05/06 15:22:25 bar@mysql.com +2 -2
    bug#6504 Upper/Lower conversion bug:
    upper/lower conversion for LATIN LETTER D WITH STROKE
    was wrong in latin2.

  mysql-test/t/ctype_latin2.test
    1.0 05/05/06 15:22:25 bar@mysql.com +0 -0
    BitKeeper file /root/mysql-4.1/mysql-test/t/ctype_latin2.test

  mysql-test/r/ctype_latin2.result
    1.0 05/05/06 15:22:25 bar@mysql.com +0 -0
    BitKeeper file /root/mysql-4.1/mysql-test/r/ctype_latin2.result

ChangeSet
  1.2226.2.5 05/05/06 12:18:37 jani@ibmlab.site +2 -0
  A fix for Bug#8467.

  BitKeeper/etc/logging_ok
    1.380.2.2 05/05/06 12:18:36 jani@ibmlab.site +1 -0
    Logging to logging@openlogging.org accepted

  sql/hostname.cc
    1.28 05/05/06 12:18:10 jani@ibmlab.site +8 -4
    A fix for Bug#8467.

ChangeSet
  1.2225.2.1 05/05/06 10:43:29 stewart@mysql.com +1 -0
  Bug#10193
  
  Invalid DataDir in config causes ndbd segfault

  ndb/src/kernel/error/ErrorReporter.cpp
    1.8.1.1 05/05/06 10:43:24 stewart@mysql.com +5 -0
    print error and return error if unable to open the file for error reporting.

ChangeSet
  1.2226.2.4 05/05/06 10:15:58 marko@hundin.mysql.fi +1 -0
  Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
  into hundin.mysql.fi:/home/marko/mysql-4.1

  sql/ha_innodb.cc
    1.196 05/05/06 10:15:49 marko@hundin.mysql.fi +0 -0
    Auto merged

ChangeSet
  1.2225.1.1 05/05/06 00:16:33 lenz@mysql.com +1 -0
  - fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno)

  sql/hostname.cc
    1.27 05/05/06 00:16:25 lenz@mysql.com +1 -1
    - fixed typo in variable name that caused compile errors on many platforms (tmp_error -> tmp_errno)

ChangeSet
  1.2226.2.2 05/05/05 11:37:52 shuichi@mysql.com +6 -0
  Added cp932 character set

  strings/Makefile.am
    1.41 05/05/05 11:37:43 shuichi@mysql.com +4 -4
    Added cp932 character set

  sql/share/charsets/Index.xml
    1.34 05/05/05 11:37:43 shuichi@mysql.com +21 -1
    Added cp932 character set

  mysys/charset-def.c
    1.11 05/05/05 11:37:43 shuichi@mysql.com +5 -0
    Added cp932 character set

  libmysql/Makefile.shared
    1.57 05/05/05 11:37:43 shuichi@mysql.com +1 -1
    Added cp932 character set

  include/m_ctype.h
    1.104 05/05/05 11:37:43 shuichi@mysql.com +2 -0
    Added cp932 character set

  configure.in
    1.370 05/05/05 11:37:43 shuichi@mysql.com +11 -2
    Added cp932 character set

ChangeSet
  1.2226.2.1 05/05/05 10:46:14 shuichi@mysql.com +1 -0
  Merge stamagawa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/shuichi/apps/mysql/bk/4.1/mysql

  BitKeeper/etc/logging_ok
    1.380.2.1 05/05/05 10:45:56 shuichi@mysql.com +0 -0
    auto-union

ChangeSet
  1.2212.8.1 05/05/05 10:36:17 shuichi@mysql.com +6 -0
  Added cp932 character set

  BitKeeper/etc/logging_ok
    1.377.1.1 05/05/05 10:30:04 shuichi@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  strings/ctype-cp932.c
    1.1 05/05/05 10:29:49 shuichi@mysql.com +5551 -0

  strings/ctype-cp932.c
    1.0 05/05/05 10:29:49 shuichi@mysql.com +0 -0
    BitKeeper file /home/shuichi/apps/mysql/bk/4.1/mysql/strings/ctype-cp932.c

  mysql-test/t/ctype_cp932.test
    1.1 05/05/05 10:29:48 shuichi@mysql.com +408 -0

  mysql-test/r/have_cp932.require
    1.1 05/05/05 10:29:48 shuichi@mysql.com +2 -0

  mysql-test/r/ctype_cp932.result
    1.1 05/05/05 10:29:48 shuichi@mysql.com +8598 -0

  mysql-test/t/ctype_cp932.test
    1.0 05/05/05 10:29:48 shuichi@mysql.com +0 -0
    BitKeeper file /home/shuichi/apps/mysql/bk/4.1/mysql/mysql-test/t/ctype_cp932.test

  mysql-test/r/have_cp932.require
    1.0 05/05/05 10:29:48 shuichi@mysql.com +0 -0
    BitKeeper file /home/shuichi/apps/mysql/bk/4.1/mysql/mysql-test/r/have_cp932.require

  mysql-test/r/ctype_cp932.result
    1.0 05/05/05 10:29:48 shuichi@mysql.com +0 -0
    BitKeeper file /home/shuichi/apps/mysql/bk/4.1/mysql/mysql-test/r/ctype_cp932.result

  mysql-test/include/have_cp932.inc
    1.1 05/05/05 10:29:47 shuichi@mysql.com +4 -0

  mysql-test/include/have_cp932.inc
    1.0 05/05/05 10:29:47 shuichi@mysql.com +0 -0
    BitKeeper file /home/shuichi/apps/mysql/bk/4.1/mysql/mysql-test/include/have_cp932.inc

ChangeSet
  1.2226.1.1 05/05/05 17:48:50 rburnett@bk-internal.mysql.com +2 -0
  Bug #10245 VC++ compiler error with mysql.cc 
  
  Only print the read line version if we are on a platform that supports readline
  
  mysql.cc:
    Add #ifdef to only print readline version if we are on a platform that supports readline

  BitKeeper/etc/logging_ok
    1.380.1.1 05/05/05 17:48:49 rburnett@bk-internal.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  client/mysql.cc
    1.203 05/05/05 17:47:53 rburnett@bk-internal.mysql.com +6 -0
    Add #ifdef to only print readline version if we are on a platform that supports readline

ChangeSet
  1.2227 05/05/05 17:17:57 rburnett@bk-internal.mysql.com +6 -0
  Bug #9721 net_write_timeout not used on Windows 
  
  Added an extra parameter to all calls to timeout().  
  1 means we want to set the write timeout
  0 means we wnat to set the read timeout
  
  viossl.c:
    Add which parameter to ssl timeout routine
  vio_priv.h:
    Added which parameter to vio_ignore_timeout and vio_ssl_timeout
  violite.h:
    Add which parameter to vio_timeout sigs
  net_serv.cc:
    Use proper which code in call to vio_timeout to set the proper timeout
  viosocket.c:
    Set the appropriate timeout in vio_timeout

  BitKeeper/etc/logging_ok
    1.381 05/05/05 17:17:57 rburnett@bk-internal.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  vio/viossl.c
    1.24 05/05/05 17:15:34 rburnett@bk-internal.mysql.com +2 -1
    Add which parameter to ssl timeout routine

  vio/vio_priv.h
    1.3 05/05/05 17:14:18 rburnett@bk-internal.mysql.com +2 -2
    Added which parameter to vio_ignore_timeout and vio_ssl_timeout

  include/violite.h
    1.40 05/05/05 17:13:57 rburnett@bk-internal.mysql.com +3 -3
    Add which parameter to vio_timeout sigs

  sql/net_serv.cc
    1.73 05/05/05 17:11:55 rburnett@bk-internal.mysql.com +2 -2
    Use proper which code in call to vio_timeout to set the proper timeout

  vio/viosocket.c
    1.29 05/05/05 17:11:21 rburnett@bk-internal.mysql.com +7 -2
    Set the appropriate timeout in vio_timeout

ChangeSet
  1.2217.8.1 05/05/05 04:56:30 jimw@mysql.com +1 -0
  Fix option handling of ./BUILD/compile-* to not try and pass options to
  configure. It was already changed not to support additional options, but now
  it was trying to pass all of the options to ./configure. (Bug #8648)

  BUILD/FINISH.sh
    1.27 05/05/05 04:55:08 jimw@mysql.com +0 -6
    Remove obsolete code that took arguments to the build scripts and passed
    them to configure -- now the only options supported are those handled within
    BUILD/SETUP.sh.

ChangeSet
  1.2217.1.11 05/05/05 11:09:00 joreland@mysql.com +1 -0
  ndb - testNodeRestart -n LateCommit
    increase no of rows so that the node failure will "guaranteed" produce an aborted transaction

  ndb/test/ndbapi/testNodeRestart.cpp
    1.10 05/05/05 11:08:57 joreland@mysql.com +1 -1
    increase no of rows so that the node failure will "guaranteed" produce an aborted transaction

ChangeSet
  1.2225 05/05/05 12:55:09 konstantin@mysql.com +4 -0
  A fix and test case for Bug#9777 " Empty set returned by Prepared Statement when it
   should return a non empty one"
  (see comments for the changed files for details).

  sql/item.h
    1.179 05/05/05 12:55:01 konstantin@mysql.com +2 -5
    Declaration for Item_int_with_ref::new_item

  sql/item.cc
    1.200 05/05/05 12:55:01 konstantin@mysql.com +23 -1
    A fix for Bug#9777: when creating a constant item from within 
    Item_int_with_ref::new_item, create the item by value, not by name.
    This should work with prepared statements placeholders.
    Item_int_with_ref is a special optimization case used
     when we compare datetime constants with datetime value.
    Converting the item to integer early is OK as it is in line
    with the purpose of Item_int_with_ref - to speed up comparison by 
    using integers.
    Minor cleanups.

  mysql-test/t/ps.test
    1.33 05/05/05 12:55:01 konstantin@mysql.com +47 -0
    A test case for Bug#9777

  mysql-test/r/ps.result
    1.34 05/05/05 12:55:01 konstantin@mysql.com +38 -0
    A test case for Bug#9777: tests results fixed.

ChangeSet
  1.2217.1.10 05/05/05 10:34:39 joreland@mysql.com +1 -0
  bug#10142 - ndb unique index
    post review fixes

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.55 05/05/05 10:34:37 joreland@mysql.com +4 -9
    remove printout
    abort transaction instead of operation.
      concider m_exec_flag

ChangeSet
  1.2217.6.3 05/05/05 09:34:15 kent@mysql.com +3 -0
  mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
    Initial Metrowerks CodeWarrior compiler support
    new file

  support-files/MacOSX/mwcc-wrapper
    1.1 05/05/05 09:33:41 kent@mysql.com +48 -0
    Initial Metrowerks CodeWarrior compiler support

  BUILD/compile-darwin-mwcc
    1.1 05/05/05 09:33:41 kent@mysql.com +54 -0
    Initial Metrowerks CodeWarrior compiler support

  support-files/MacOSX/mwcc-wrapper
    1.0 05/05/05 09:33:41 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/support-files/MacOSX/mwcc-wrapper

  support-files/MacOSX/mwar-wrapper
    1.1 05/05/05 09:33:40 kent@mysql.com +16 -0
    Initial Metrowerks CodeWarrior compiler support

  BUILD/compile-darwin-mwcc
    1.0 05/05/05 09:33:41 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/BUILD/compile-darwin-mwcc

  support-files/MacOSX/mwar-wrapper
    1.0 05/05/05 09:33:40 kent@mysql.com +0 -0
    BitKeeper file /Users/kent/mysql/cw/mysql-4.1/support-files/MacOSX/mwar-wrapper

ChangeSet
  1.2217.7.1 05/05/05 12:24:10 gluh@mysql.com +1 -0
  Bug #5843: Server code does not check whether PID file was successfully written

  sql/mysqld.cc
    1.571 05/05/05 12:24:02 gluh@mysql.com +7 -1
    Bug #5843: Server code does not check whether PID file was successfully written

ChangeSet
  1.2217.6.2 05/05/05 09:15:14 kent@mysql.com +5 -0
  terminal.c, sql_bitmap.h, my_sys.h, configure.in, config.h:
    Initial Metrowerks CodeWarrior compiler support

  cmd-line-utils/readline/terminal.c
    1.13 05/05/05 09:12:54 kent@mysql.com +1 -1
    Initial Metrowerks CodeWarrior compiler support

  sql/sql_bitmap.h
    1.7 05/05/05 09:11:39 kent@mysql.com +1 -1
    Initial Metrowerks CodeWarrior compiler support

  include/my_sys.h
    1.135 05/05/05 09:11:39 kent@mysql.com +4 -0
    Initial Metrowerks CodeWarrior compiler support

  configure.in
    1.369 05/05/05 09:11:39 kent@mysql.com +21 -2
    Initial Metrowerks CodeWarrior compiler support

  cmd-line-utils/libedit/config.h
    1.4 05/05/05 09:11:39 kent@mysql.com +2 -0
    Initial Metrowerks CodeWarrior compiler support

ChangeSet
  1.2222 05/05/05 08:08:39 jan@hundin.mysql.fi +1 -0
  Fig compiler error.

  sql/ha_innodb.cc
    1.195 05/05/05 08:08:32 jan@hundin.mysql.fi +1 -0
    Fig compiler error.

ChangeSet
  1.2217.1.9 05/05/04 18:40:54 joreland@mysql.com +3 -0
  bug#10358 - ndb
    Cluster failure with non started nodes can result in timedout transactions

  ndb/src/ndbapi/ClusterMgr.hpp
    1.5 05/05/04 18:40:52 joreland@mysql.com +14 -0
    Report NFCOMPLETEREP if no alive node exists 
      (instead of no connected node exists)

  ndb/src/ndbapi/ClusterMgr.cpp
    1.15 05/05/04 18:40:52 joreland@mysql.com +7 -6
    Report NFCOMPLETEREP if no alive node exists 
      (instead of no connected node exists)

  ndb/src/mgmapi/mgmapi.cpp
    1.27 05/05/04 18:40:52 joreland@mysql.com +6 -0
    Increase timeout for restarts

ChangeSet
  1.2217.5.1 05/05/04 15:05:56 msvensson@neptunus.(none) +33 -0
  BUG#10241 cygwin port: invalid pragma interface directives
   - Introduce ifdefs so we can control when to use #pragma interface on cygwin

  sql/tztime.h
    1.8 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_udf.h
    1.7.1.1 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_string.h
    1.56 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_select.h
    1.75 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_list.h
    1.30 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/sql_class.h
    1.278 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/set_var.h
    1.58 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/protocol.h
    1.22 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_IMPLEMENTATION

  sql/procedure.h
    1.17 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/opt_range.h
    1.37 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_timefunc.h
    1.52 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_sum.h
    1.78.1.1 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_subselect.h
    1.61 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_strfunc.h
    1.93 05/05/04 15:05:53 msvensson@neptunus.(none) +2 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_geofunc.h
    1.9 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_func.h
    1.123 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item_cmpfunc.h
    1.106 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/item.h
    1.177.1.1 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/handler.h
    1.138 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_ndbcluster.h
    1.53 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_myisammrg.h
    1.37 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_myisam.h
    1.64 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_isammrg.h
    1.23 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_isam.h
    1.29 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_innodb.h
    1.80 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_heap.h
    1.31 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_blackhole.h
    1.3 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/ha_berkeley.h
    1.69 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/field.h
    1.128 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/examples/ha_example.h
    1.9 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  sql/examples/ha_archive.h
    1.13 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  include/raid.h
    1.19 05/05/04 15:05:53 msvensson@neptunus.(none) +1 -1
    replace __GNUC__ with USE_PRAGMA_INTERFACE

  include/my_global.h
    1.85 05/05/04 15:05:53 msvensson@neptunus.(none) +5 -0
    Turn on use of #pragma implementation and #pragma interface if compiled with GCC and platform != Cygwin

ChangeSet
  1.2217.3.2 05/05/04 14:58:43 lenz@mysql.com +1 -0
  - adjusted the start and stop priority level in the mysql.server init script for chkconfig on
    Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
    (e.g. RHEL3/RHEL4)

  support-files/mysql.server.sh
    1.39 05/05/04 14:58:37 lenz@mysql.com +1 -1
    - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match
      the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)

ChangeSet
  1.2221 05/05/04 12:01:36 jan@hundin.mysql.fi +1 -0
  Initial value for a auto_increment can now be set using ALTER TABLE
  AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
  change is backported from 5.0 (Bug #7061).

  sql/ha_innodb.cc
    1.194 05/05/04 12:01:29 jan@hundin.mysql.fi +18 -3
    Initial value for a auto_increment can now be set using ALTER TABLE
    AUTO_INCREMENT = X; or CREATE TABLE .. AUTO_INCREMENT = X; This
    change is backported from 5.0.

ChangeSet
  1.2217.3.1 05/05/04 10:49:42 lenz@mysql.com +1 -0
  - added missing el_term.h to the source distribution (BUG#10352)

  cmd-line-utils/libedit/Makefile.am
    1.12 05/05/04 10:49:36 lenz@mysql.com +1 -1
    - added missing el_term.h to the source distribution (BUG#10352)

ChangeSet
  1.2217.1.6 05/05/04 10:16:03 tulin@dl145b.mysql.com +4 -0
  logging_ok:
    Logging to logging@openlogging.org accepted
  NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
    BUG#10287

  BitKeeper/etc/logging_ok
    1.380 05/05/04 10:16:02 tulin@dl145b.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  BitKeeper/etc/logging_ok
    1.379 05/05/04 10:15:20 ndbdev@dl145b.mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  ndb/test/src/NDBT_ResultRow.cpp
    1.11 05/05/04 10:14:00 ndbdev@dl145b.mysql.com +6 -2
    BUG#10287

  mysql-test/t/ndb_restore.test
    1.5 05/05/04 10:13:43 ndbdev@dl145b.mysql.com +6 -0
    BUG#10287

  mysql-test/r/ndb_restore.result
    1.4 05/05/04 10:13:26 ndbdev@dl145b.mysql.com +1 -0
    BUG#10287

ChangeSet
  1.2217.2.1 05/05/03 12:16:31 joreland@mysql.com +6 -0
  bug#10142 - ndb unhandle resource shortage in unique index code

  ndb/src/ndbapi/ndberror.c
    1.25 05/05/03 12:16:28 joreland@mysql.com +1 -1
    New error code for out of index operation records

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.15 05/05/03 12:16:28 joreland@mysql.com +1 -1
    Let failed tcindxreq abort

  ndb/src/kernel/error/ErrorReporter.cpp
    1.9 05/05/03 12:16:28 joreland@mysql.com +3 -2
    Include NDB version in ndb_X_error.log

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.54 05/05/03 12:16:28 joreland@mysql.com +39 -42
    1) Set transid on starting TCINDXREQ
    2) New error code for out of index operation records
    3) Check accumulating index op for RNIL before dereferencing it

  ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
    1.9 05/05/03 12:16:28 joreland@mysql.com +1 -3
    remove unneccessary TcSeizedIndexOperation object

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp
    1.20 05/05/03 12:16:28 joreland@mysql.com +2 -28
    remove unneccessary TcSeizedIndexOperation object

ChangeSet
  1.2217.1.5 05/05/03 12:49:22 konstantin@mysql.com +2 -0
  Merge mysql.com:/opt/local/work/mysql-4.1-root
  into mysql.com:/opt/local/work/mysql-4.1-9096-fresh

  sql/item_func.cc
    1.241 05/05/03 12:49:20 konstantin@mysql.com +0 -0
    Auto merged

  sql/item.h
    1.178 05/05/03 12:49:20 konstantin@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2212.7.1 05/05/03 12:47:27 konstantin@mysql.com +5 -0
  A fix and test case for Bug#9096 "select doesn't return all matched 
  records if prepared statements is used".
  This fix changes equality evaluation method of basic constants from
  by-name to by-value, thus effectively enabling use of parameter markers
  in some optimizations (constants propagation, evaluation of possible
  keys for query).

  sql/item_func.cc
    1.239.2.1 05/05/03 12:47:22 konstantin@mysql.com +5 -4
    Fix wrong casts.

  sql/item.h
    1.176.1.1 05/05/03 12:47:22 konstantin@mysql.com +23 -4
    Change declaration of basic_const_item(): now it also widens its 
    argument from const Item * to Item * if the argument is a basic constant.
    Declare eq() for all basic constatns, as long as now they 
    are compared by value, not by name. Each constant needs its own
    comparison method.
    Declarations of Item_param methods needed to fully emulate 
    a basic constant when parameter value is set.

  sql/item.cc
    1.199 05/05/03 12:47:22 konstantin@mysql.com +113 -1
    Implement by-value equality evaluation of basic constants.
    This is needed to work with Item_param values. Until now
    Item_param was compared with other items by its name, which is always "?".
    The bug at hand showed up when an integer
    constant was created from one parameter marker (with value 200887 and
     name "?") and then compared by-name with another parameter marker
    (with value 860 and name "?"). True returned by this comparison resulted
    in a wrong table access method used to evaluate the query.
    Implement Item_param methods needed to emulate "basic constant" mode at 
    full.

  mysql-test/t/ps.test
    1.32 05/05/03 12:47:22 konstantin@mysql.com +26 -0
    A short test case for Bug#9096 "select doesn't return all matched records if
     prepared statements is used". The is enough to reproduce the
    glitch in update_ref_and_keys causing the bug to occur.

  mysql-test/r/ps.result
    1.33 05/05/03 12:47:22 konstantin@mysql.com +25 -0
    Test results for the test case for Bug#9096

ChangeSet
  1.2217.1.2 05/05/02 08:11:32 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-9136
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  mysys/default.c
    1.49 05/05/02 08:11:31 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2217.1.1 05/05/02 08:05:58 jimw@mysql.com +1 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  configure.in
    1.368 05/05/02 08:05:57 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2212.6.1 05/04/30 20:23:40 dlenev@brandersnatch.localdomain +5 -0
  Fix for Bug #9913 "udf_deinit is not called after execution of PS"
  (aka "deinit is not called when calling udf from trigger").
  
  We should call udf_deinit() function during cleanup phase after prepared
  (or ordinary) statement execution instead of calling it from Item's
  desctructor.
  
  No test case is provided since it is hard to test UDF's from our test
  suite.

  sql/sql_udf.h
    1.8 05/04/30 20:23:35 dlenev@mysql.com +1 -0
    Added udf_handler::cleanup() method declaration which is responsible
    for cleaning up UDF execution context at the end of execution of
    statement (using ~udf_handler() for this purprose did not worked for PS).

  sql/item_sum.h
    1.79 05/04/30 20:23:35 dlenev@mysql.com +1 -0
    Added Item_udf_sum::cleanup() method to perform cleanup properly after
    execution of PS with aggregate UDF function.

  sql/item_sum.cc
    1.134 05/04/30 20:23:35 dlenev@mysql.com +11 -0
    Added Item_udf_sum::cleanup() method to perform cleanup properly after
    execution of PS with aggregate UDF function.

  sql/item_func.h
    1.121.1.1 05/04/30 20:23:35 dlenev@mysql.com +1 -0
    Added Item_udf_func::cleanup() method to perform cleanup properly after
    execution of PS with UDF function.

  sql/item_func.cc
    1.239.1.1 05/04/30 20:23:35 dlenev@mysql.com +15 -0
    udf_handler:
     Moved all functionality from udf_handler::~udf_handler() to 
     udf_handler::cleanup() method which will be called after
     each PS execution, thus allowing udf_deinit() to be executed
     symetrically with udf_init() (which is executed for each
     execution of PS).
    Added Item_udf_func::cleanup() which performs proper cleanup after
    execution of PS with UDF function.
      

ChangeSet
  1.2216 05/04/30 03:45:12 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/sql_select.cc
    1.398 05/04/30 03:45:11 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2212.5.2 05/04/30 01:05:15 sergefp@mysql.com +1 -0
  Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about 
  relative sizes of int/long/longlong.
   

  sql/protocol.cc
    1.100 05/04/30 01:05:12 sergefp@mysql.com +1 -1
    Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about 
    relative sizes of int/long/longlong.
     

ChangeSet
  1.2202.17.1 05/04/29 21:19:39 evgen@moonbone.local +2 -0
  Fix bug #9703 "Error 1032 with GROUP BY query and large tables"
  Reset old error if tmp table was successfully created.
  
  Test data is large and can be found in bug report along with test query.

  BitKeeper/etc/logging_ok
    1.378 05/04/29 21:19:39 evgen@moonbone.local +2 -0
    Logging to logging@openlogging.org accepted

  sql/sql_select.cc
    1.396.1.1 05/04/29 21:17:38 evgen@moonbone.local +5 -0
    Fix bug #9703

ChangeSet
  1.2212.1.8 05/04/29 08:46:03 jimw@mysql.com +2 -0
  Manually resolve merge

  mysql-test/t/query_cache.test
    1.41 05/04/29 08:46:00 jimw@mysql.com +0 -0
    Resolve merge

  mysql-test/r/query_cache.result
    1.54 05/04/29 08:46:00 jimw@mysql.com +0 -0
    Resolve merge

ChangeSet
  1.2212.1.7 05/04/29 08:41:25 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.0-clean
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  configure.in
    1.366.1.1 05/04/29 08:41:24 jimw@mysql.com +0 -1
    Auto merged

ChangeSet
  1.1346.1.749 05/04/29 08:26:33 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.0-9690
  into mysql.com:/home/jimw/my/mysql-4.0-clean

  configure.in
    1.191.1.134 05/04/29 08:26:33 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2215 05/04/29 17:03:34 monty@mysql.com +11 -0
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036)
  Produce warnings of wrong cast of strings to signed/unsigned.
  Don't block not resolved IP's if DNS server is down (Bug #8467)
  Fix compiler problems with MinGW (Bug #8872)

  sql/item_func.h
    1.122 05/04/29 17:03:21 monty@mysql.com +3 -6
    CAST(string_argument AS UNSIGNED) didn't work for big integers above the
    signed range. (Bug #7036)

  sql/item_func.cc
    1.240 05/04/29 17:03:21 monty@mysql.com +73 -0
    CAST(string_argument AS UNSIGNED) didn't work for big integers above the
    signed range. (Bug #7036)
    Produce warnings of wrong cast of strings to signed/unsigned

  sql/item.h
    1.177 05/04/29 17:03:19 monty@mysql.com +6 -1
    Added cast_to_int_type() to ensure that enums are casted as numbers

  sql/hostname.cc
    1.26 05/04/29 17:03:18 monty@mysql.com +8 -1
    Don't block not resolved IP's if DNS server is down (Bug #8467)

  sql/field.h
    1.127 05/04/29 17:03:18 monty@mysql.com +2 -0
    Added cast_to_int_type() to ensure that enums are casted as numbers

  mysys/default.c
    1.47.1.4 05/04/29 17:03:17 monty@mysql.com +58 -45
    Cleanup (combine identical code). 
    Done mainly by Jani

  mysql-test/t/cast.test
    1.16 05/04/29 17:03:16 monty@mysql.com +25 -1
    Test for cast to signed/unsigned outside of range (Bug #7036)

  mysql-test/r/cast.result
    1.22 05/04/29 17:03:15 monty@mysql.com +68 -3
    Test for cast to signed/unsigned outside of range (Bug #7036)

  include/my_global.h
    1.84 05/04/29 17:03:15 monty@mysql.com +2 -0
    Fix compiler problems with MinGW (Bug #8872)

  include/config-win.h
    1.52 05/04/29 17:03:15 monty@mysql.com +15 -2
    Fix compiler problems with MinGW (Bug #8872)

  configure.in
    1.367 05/04/29 17:03:14 monty@mysql.com +3 -0
    Fix compiler problems with MinGW (Bug #8872)

ChangeSet
  1.2212.2.2 05/04/29 11:37:47 mskold@mysql.com +1 -0
  Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug

  sql/ha_ndbcluster.cc
    1.151 05/04/29 11:37:15 mskold@mysql.com +1 -1
    Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug

ChangeSet
  1.2202.16.1 05/04/28 15:30:42 jimw@mysql.com +3 -0
  Fix 'CREATE TABLE ... LIKE ...' when lower_case_table_names
  is set on case-sensitive file systems and the source table
  was specified in something other than lowercase. (Bug #9761)

  sql/sql_table.cc
    1.279 05/04/28 15:30:40 jimw@mysql.com +2 -0
    When lower_case_table_names is set, make sure to look for
    the source table using a lowercase filename.

  mysql-test/t/lowercase_table.test
    1.16 05/04/28 15:30:40 jimw@mysql.com +8 -0
    Regression test for Bug #9761

  mysql-test/r/lowercase_table.result
    1.14 05/04/28 15:30:40 jimw@mysql.com +3 -0
    Add results

ChangeSet
  1.2200.4.1 05/04/28 18:28:50 ingo@mysql.com +4 -0
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed the creation of the .MRG file so that only the table  name
  is written when the MyISAM table is in the same database as the
  MERGE table, a relative path is used in other cases in mysqld,
  and possibly an absolute path is used in an embedded server.
  No test case is added as the external behaviour is unchanged.
  Only the file names within the .MRG file are changed.

  sql/ha_myisammrg.cc
    1.54 05/04/28 18:28:44 ingo@mysql.com +24 -4
    BUG#5964 - 4.1 MERGE tables regression from 4.0
    Changed the creation of the .MRG file so that only the table  name
    is written when the MyISAM table is in the same database as the
    MERGE table, a relative path is used in other cases in mysqld,
    and possibly an absolute path is used in an embedded server.

  mysys/my_getwd.c
    1.13 05/04/28 18:28:44 ingo@mysql.com +22 -0
    BUG#5964 - 4.1 MERGE tables regression from 4.0
    Added a new functions which checks for absolute _or_
    relative paths.

  myisammrg/myrg_open.c
    1.28 05/04/28 18:28:44 ingo@mysql.com +1 -1
    BUG#5964 - 4.1 MERGE tables regression from 4.0
    Changed check for absolute path to check for any path.

  include/my_sys.h
    1.134 05/04/28 18:28:44 ingo@mysql.com +1 -0
    BUG#5964 - 4.1 MERGE tables regression from 4.0
    Added declaration for a new function.

ChangeSet
  1.2212.1.3 05/04/28 16:09:53 ingo@mysql.com +1 -0
  Bug#8321 - myisampack bug in compression algorithm
  Merge from 4.0.

  myisam/myisampack.c
    1.39 05/04/28 16:09:48 ingo@mysql.com +1 -2
    Bug#8321 - myisampack bug in compression algorithm
    Merge from 4.0.

ChangeSet
  1.1346.1.748 05/04/28 15:27:42 ingo@mysql.com +1 -0
  Bug#8321 - myisampack bug in compression algorithm
  This is the second of three changesets. It contains the pure bug fix.
  It also contains the second after-review fixes.
  The problem was that with gcc on x86, shifts are done modulo word size. 
  'value' is 32 bits wide and shifting it by 32 bits is a no-op.
  This was triggered by an evil distribution of character incidences. 
  A distribution of 2917027827 characters made of 202 distinct values led to
  34 occurrences of 32-bit Huffman codes.
  This might have been the first time ever that write_bits() had to write
  32-bit values. Since it can be expected that one day even 32 bits might
  be insufficient, the third changeset suggests to enlarge some variables
  to 64 bits.

  myisam/myisampack.c
    1.22.1.13 05/04/28 15:27:40 ingo@mysql.com +7 -2
    Bug#8321 - myisampack bug in compression algorithm
    This is the second of three changesets. It contains the pure bug fix.
    It also contains the second after-review fixes.
    The problem was that with gcc on x86, shifts are done modulo word size. 
    'value' is 32 bits wide and shifting it by 32 bits is a no-op.
    This was triggered by an evil distribution of character incidences. 
    A distribution of 2917027827 characters made of 202 distinct values led to
    34 occurrences of 32-bit Huffman codes.
    This might have been the first time ever that write_bits() had to write
    32-bit values. Since it can be expected that one day even 32 bits might
    be insufficient, the third changeset suggests to enlarge some variables
    to 64 bits.

ChangeSet
  1.2212.1.2 05/04/28 13:30:45 msvensson@neptunus.(none) +1 -0
  After review fixes to check-cpu

  BUILD/check-cpu
    1.3 05/04/28 13:30:37 msvensson@neptunus.(none) +0 -2
    Remove the exit 0 from check-cpu

ChangeSet
  1.2202.5.2 05/04/28 10:49:18 msvensson@neptunus.(none) +3 -0
  BUG#9911 After review fixes
   - Remove ha_archive::rename_table and move the fix to handler::rename_table

  sql/handler.cc
    1.163 05/04/28 10:49:15 msvensson@neptunus.(none) +9 -5
    Fix handler::rename_table so it does not care about if the file to rename is missing 

  sql/examples/ha_archive.h
    1.12 05/04/28 10:49:15 msvensson@neptunus.(none) +0 -1
    Remove ha_archive::rename_table

  sql/examples/ha_archive.cc
    1.22 05/04/28 10:49:15 msvensson@neptunus.(none) +0 -24
    Remove ha_archive::rename_table

ChangeSet
  1.2202.1.11 05/04/28 10:46:39 mskold@mysql.com +1 -0
  Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

  sql/ha_ndbcluster.cc
    1.150 05/04/28 10:46:09 mskold@mysql.com +7 -3
    Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

ChangeSet
  1.2202.1.10 05/04/28 09:39:29 mskold@mysql.com +1 -0
  Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes

  sql/ha_ndbcluster.cc
    1.149 05/04/28 09:38:54 mskold@mysql.com +20 -4
    Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes

ChangeSet
  1.2160.9.1 05/04/27 17:50:48 jimw@mysql.com +2 -0
  Fix 'mysql_client_test' with embedded server. (Bug #9634)

  tests/mysql_client_test.c
    1.151 05/04/27 17:50:46 jimw@mysql.com +51 -2
    Add -A switch for passing arguments to the embedded server.

  mysql-test/mysql-test-run.sh
    1.249 05/04/27 17:50:46 jimw@mysql.com +6 -0
    Set up arguments for mysql_client_test when testing
    the embedded server.

ChangeSet
  1.1346.826.1 05/04/27 17:14:53 jimw@mysql.com +1 -0
  Backport fix from 4.1 for testing whether CXX is gcc. (Bug #9690)

  configure.in
    1.191.20.1 05/04/27 17:14:51 jimw@mysql.com +1 -1
    Use more flexible for test for CXX being gcc.

ChangeSet
  1.2202.15.1 05/04/27 17:05:15 jimw@mysql.com +1 -0
  Clean up error message for connections-per-hour user limit
  being exceeded. (Bug #9947)

  sql/sql_parse.cc
    1.433 05/04/27 16:48:39 jimw@mysql.com +1 -1
    Fix error message when connections per hour has been exceeded

ChangeSet
  1.2213 05/04/28 00:41:39 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/sql_insert.cc
    1.160 05/04/28 00:41:36 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2212 05/04/27 21:40:11 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  configure.in
    1.366 05/04/27 21:40:10 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2202.14.1 05/04/27 20:54:19 ingo@mysql.com +1 -0
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  After merge fix.

  sql/sql_insert.cc
    1.158.1.2 05/04/27 20:54:15 ingo@mysql.com +55 -20
    Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
    After merge fix.

ChangeSet
  1.2202.4.6 05/04/27 18:59:31 ingo@mysql.com +3 -0
  Merge from 4.0 needs fixes

  sql/sql_insert.cc
    1.158.1.1 05/04/27 18:59:27 ingo@mysql.com +18 -55
    Merge from 4.0 needs fixes

  sql/mysql_priv.h
    1.346 05/04/27 18:57:05 ingo@mysql.com +0 -0
    Auto merged

  sql/lock.cc
    1.56 05/04/27 18:57:04 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2202.1.9 05/04/27 18:17:41 mskold@mysql.com +6 -0
  Fix for avoiding gettin Invalid schema object version when doing local changes

  sql/ha_ndbcluster.cc
    1.148 05/04/27 18:17:18 mskold@mysql.com +41 -13
    Fix for avoiding gettin Invalid schema object version when doing local changes

  mysql-test/t/ndb_multi.test
    1.4 05/04/27 18:17:18 mskold@mysql.com +24 -0
    Fix for avoiding gettin Invalid schema object version when doing local changes

  mysql-test/r/ndb_multi.result
    1.3 05/04/27 18:17:18 mskold@mysql.com +21 -1
    Fix for avoiding gettin Invalid schema object version when doing local changes

  sql/ha_ndbcluster.h
    1.52 05/04/27 18:17:17 mskold@mysql.com +2 -2
    Fix for avoiding gettin Invalid schema object version when doing local changes

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.51 05/04/27 18:17:17 mskold@mysql.com +7 -4
    Fix for avoiding gettin Invalid schema object version when doing local changes

  ndb/include/ndbapi/NdbDictionary.hpp
    1.20 05/04/27 18:17:17 mskold@mysql.com +4 -1
    Fix for avoiding gettin Invalid schema object version when doing local changes

ChangeSet
  1.2211 05/04/27 17:52:14 msvensson@neptunus.(none) +1 -0
  After review fix

  BUILD/check-cpu
    1.2 05/04/27 17:52:10 msvensson@neptunus.(none) +7 -1
    Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.

ChangeSet
  1.2202.8.3 05/04/27 14:31:04 monty@mysql.com +3 -0
  Fixed core dump bug when hot link list in key cache was empty. Bug #10167

  tests/index_corrupt.pl
    1.1 05/04/27 14:31:01 monty@mysql.com +212 -0

  tests/index_corrupt.pl
    1.0 05/04/27 14:31:01 monty@mysql.com +0 -0
    BitKeeper file /home/my/mysql-4.1/tests/index_corrupt.pl

  mysys/mf_keycache.c
    1.49 05/04/27 14:31:00 monty@mysql.com +7 -4
    Fixed core dump bug when hot link list in key cache was empty. Bug #10167

  mysql-test/r/drop.result
    1.23 05/04/27 14:31:00 monty@mysql.com +2 -2
    Fixed result

ChangeSet
  1.2210 05/04/27 13:29:37 msvensson@neptunus.(none) +2 -0
  Bug #9954  	mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
   - Reverted removal of errorcheck mutex initialise, used in safe_mutex_init. 

  mysys/my_thr_init.c
    1.30 05/04/27 13:29:34 msvensson@neptunus.(none) +14 -0
    Reverted the removal of errorcheck mutex initializer
    Add destruction of mutex initializer

  include/my_pthread.h
    1.79 05/04/27 13:29:34 msvensson@neptunus.(none) +6 -0
    Reverted the removal of errorcheck mutex initializer

ChangeSet
  1.2209 05/04/27 12:50:37 msvensson@neptunus.(none) +2 -0
  Bug#9263 GCC4: -mcpu is depricated, use -mtune or -march instead
     - Made a script that selects the best compiler optimizations for the current cpu.
     - Use the script from BUILD/SETUP.sh 

  BUILD/check-cpu
    1.1 05/04/27 12:50:35 msvensson@neptunus.(none) +77 -0

  BUILD/check-cpu
    1.0 05/04/27 12:50:35 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-4.1/BUILD/check-cpu

  BUILD/SETUP.sh
    1.33 05/04/27 12:50:34 msvensson@neptunus.(none) +8 -5
    Run check-cpu and use the compiler optimization flags it outputs 

ChangeSet
  1.1346.1.747 05/04/27 12:40:37 ingo@mysql.com +3 -0
  Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
  Added protection against global read lock while creating and
  initializing a delayed insert handler.
  Allowed to ignore a global read lock when locking the table
  inside the delayed insert handler.
  Added some minor improvements.

  sql/sql_insert.cc
    1.63.1.54 05/04/27 12:40:35 ingo@mysql.com +55 -20
    Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
    Added and extended some comments.
    Added a protection against global read lock while a handler is
    created and initialized.
    Moved the unlock of the delayed insert object past its last usage
    in delayed_get_table().
    Changed the table locking in handle_delayed_insert() so that it
    does not wait for global read lock.

  sql/mysql_priv.h
    1.150.1.82 05/04/27 12:40:35 ingo@mysql.com +4 -1
    Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
    Changed existing and added new function declarations.

  sql/lock.cc
    1.38.1.12 05/04/27 12:40:35 ingo@mysql.com +49 -2
    Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
    Changed mysql_lock_tables() to allow for ignoring global read lock.
    Added functions to set/unset protection against global read lock.

ChangeSet
  1.2208 05/04/27 12:24:17 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug8162
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  configure.in
    1.361.1.3 05/04/27 12:24:16 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2207 05/04/27 12:19:18 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/bug9954
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  configure.in
    1.361.1.2 05/04/27 12:19:16 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2202.9.3 05/04/27 12:28:25 jan@hundin.mysql.fi +1 -0
  Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).

  sql/ha_innodb.cc
    1.193 05/04/27 12:28:18 jan@hundin.mysql.fi +3 -4
    Fixed a bug using mysqldump to InnoDB tables causes error (Bug #10200).
    Lock type must be stored when sql_command = SQLCOM_LOCK_TABLES and
    lock_type = TL_READ or TL_READ_INSERT even when 
    innobase_locks_unsafe_for_binlog is set.

ChangeSet
  1.2202.11.1 05/04/27 11:19:00 msvensson@neptunus.(none) +1 -0
  Bug #8162 MySQL cannot be compiled without readline
   - Display error if system readline or libedit can't be found

  configure.in
    1.361.3.1 05/04/27 11:18:57 msvensson@neptunus.(none) +9 -2
    Display an error if user has selected not to use the bundled libedit or readline, AND the system readline or libedit can't be found

ChangeSet
  1.2202.10.1 05/04/27 09:59:12 msvensson@neptunus.(none) +4 -0
  Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
    - Changed makelist.sh
    - Bump up required version of autoconf
    - Use new style to init mutex in my_thr_init

  mysys/my_thr_init.c
    1.29 05/04/27 09:59:09 msvensson@neptunus.(none) +12 -16
    Use new style functions to init mutex if PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP is defined
    Add comment what mutex "kind" means

  include/my_pthread.h
    1.78 05/04/27 09:59:09 msvensson@neptunus.(none) +3 -9
    Use PTHREAD_MUTEX_ADAPTIVE_NP to see if "fast" mutexes are available
    Remove "errorcheck" mutexes, since they are never used.

  configure.in
    1.361.2.1 05/04/27 09:59:09 msvensson@neptunus.(none) +1 -1
    Bump up required AC version number so that correct version of aclocal and autoconf is selected.

  cmd-line-utils/libedit/makelist.sh
    1.7 05/04/27 09:59:09 msvensson@neptunus.(none) +4 -3
    Changed file so it works also on windows cr/lf files.

ChangeSet
  1.2202.9.2 05/04/27 07:56:37 joreland@mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/ndbapi/ndberror.c
    1.24 05/04/27 07:56:36 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2118.3.2 05/04/26 17:33:49 jimw@mysql.com +1 -0
  Fix undersized array in my_print_defaults that caused crash on Sun Solaris
  (and maybe strange results on other platforms). (Bug #9851)

  extra/my_print_defaults.c
    1.20 05/04/26 17:32:45 jimw@mysql.com +1 -1
    Increase size of tmp_arguments array to actually fit possible values

  extra/my_print_defaults.c
    1.19 05/04/26 17:17:25 jimw@mysql.com +11 -0
    Add support for --debug to my_print_defaults

ChangeSet
  1.2202.9.1 05/04/27 02:57:19 heikki@hundin.mysql.fi +3 -0
  dict0dict.c, dict0dict.h, fil0fil.c:
    Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

  innobase/dict/dict0dict.c
    1.64 05/04/27 02:56:43 heikki@hundin.mysql.fi +11 -1
    Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

  innobase/include/dict0dict.h
    1.32 05/04/27 02:56:30 heikki@hundin.mysql.fi +7 -0
    Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

  innobase/fil/fil0fil.c
    1.52 05/04/27 02:56:18 heikki@hundin.mysql.fi +9 -0
    Fix a problem in crash recovery of .ibd files on Windows if the user used lower_case_table_names=0 or 2; the directory scan in crash recovery forgot to put all paths to lower case, so that the tablespace name would be consistent with the internal data dictionary of InnoDB; remember that InnoDB puts internally all database names and table names to lower case on Windows, regardless of the value of lower_case_table_names

ChangeSet
  1.2202.8.2 05/04/26 23:24:59 monty@mysql.com +3 -0
  Cleanups during review

  sql/sql_select.cc
    1.397 05/04/26 23:24:47 monty@mysql.com +7 -5
    Fixed indentation
    added comment

  sql/sql_insert.cc
    1.159 05/04/26 23:24:46 monty@mysql.com +2 -2
    Fix argument

  mysys/default.c
    1.47.1.3 05/04/26 23:24:46 monty@mysql.com +35 -27
    Cleanup:
    - Just test once for recursion level
    - Don't test explicitely for \r or \n as my_isspace() already does that

ChangeSet
  1.2202.8.1 05/04/26 21:09:42 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/mysqld.cc
    1.570 05/04/26 21:09:41 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2202.4.4 05/04/26 19:26:51 joerg@mysql.com +2 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  configure.in
    1.365 05/04/26 19:26:48 joerg@mysql.com +0 -0
    Auto merged

  acinclude.m4
    1.134 05/04/26 19:26:48 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2202.4.2 05/04/26 08:20:00 jimw@mysql.com +1 -0
  Fix typo in include file name (Bug #9063)

  acinclude.m4
    1.132.1.2 05/04/26 08:19:44 jimw@mysql.com +1 -1
    Fix typo

ChangeSet
  1.2202.7.1 05/04/26 15:52:04 gbichot@quadita2.mysql.com +2 -0
  checking that statements get into binlog even when they were affecting
  no rows of the blackhold engine (for this engine to be a binlog propagator).
  NOTE: blackhole.test currently hangs in 5.0 BUG#10175 so I'll merge without running this test; the
  person who fixes the hang will correct the merged blackhole.result or ask me to).

  mysql-test/t/blackhole.test
    1.3 05/04/26 15:52:01 gbichot@quadita2.mysql.com +29 -1
    checking that statements get into binlog even when they were affecting
    no rows of the blackhold engine. So that this engine can serve as
    a binlog propagator (A->B->C replication where B has only blackhole tables,
    B receives binlog from A, applies it to blackhole tables, writes statements
    to its binlog which it sends to C; both A and C have non-blackhole tables). B is just a proxy.

  mysql-test/r/blackhole.result
    1.3 05/04/26 15:52:00 gbichot@quadita2.mysql.com +40 -1
    result update

ChangeSet
  1.2202.6.1 05/04/26 16:03:20 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/mysqld.cc
    1.569 05/04/26 16:03:19 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2194.11.4 05/04/26 13:15:20 joerg@mysql.com +1 -0
  Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).

  include/my_global.h
    1.83 05/04/26 13:15:10 joerg@mysql.com +1 -0
    As we have a new CPP symbol, this should be "undef"ed explicitly.

ChangeSet
  1.2202.5.1 05/04/26 11:35:52 msvensson@neptunus.(none) +4 -0
  BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
   - Implemented ha_archive::rename_table
   - Added testcases for rename

  sql/examples/ha_archive.h
    1.11 05/04/26 11:35:50 msvensson@neptunus.(none) +1 -0
    Implement special version of rename table that does not care it the .arn file is missing

  sql/examples/ha_archive.cc
    1.21 05/04/26 11:35:50 msvensson@neptunus.(none) +24 -0
    Implement special version of rename table that does not care it the .arn file is missing

  mysql-test/t/archive.test
    1.4 05/04/26 11:35:49 msvensson@neptunus.(none) +12 -1
    Addd testcase for rename of archive table

  mysql-test/r/archive.result
    1.3 05/04/26 11:35:49 msvensson@neptunus.(none) +15 -1
    Addd testcase for rename of archive table

ChangeSet
  1.2202.4.1 05/04/25 18:02:03 jimw@mysql.com +3 -0
  Fix compile issues in Intel C/C++ compiler (Bug #9063)

  sql/mysqld.cc
    1.567.1.7 05/04/25 18:02:00 jimw@mysql.com +1 -1
    Use STRUCT_RLIMIT for getting type of struct rlimit.

  configure.in
    1.361.1.1 05/04/25 18:02:00 jimw@mysql.com +2 -0
    Call MYSQL_TYPE_STRUCT_RLIMIT macro

  acinclude.m4
    1.132.1.1 05/04/25 18:02:00 jimw@mysql.com +34 -5
    Use AC_LANG_PUSH/POP instead of _SAVE/RESTORE
    Add test to get type of 'struct rlimit'
    Switch order of including stdlib.h and declaration being tested to
    match how it will be used in regular code.

ChangeSet
  1.2204 05/04/25 12:05:13 msvensson@neptunus.(none) +1 -0
  BUG#2596 MySQL Client Segmentation Fault on Solaris 9
    - Print readline or libedit version

  client/mysql.cc
    1.202 05/04/25 12:05:10 msvensson@neptunus.(none) +10 -2
    Print the version of readline or libedit library used.

ChangeSet
  1.2202.2.5 05/04/25 11:59:00 joreland@mysql.com +2 -0
  bug#9749 - ndb lock upgrade 
    post review fix.
    don't init hash value on restart operations
    make sure that lock mode is correct in entire que.

  ndb/test/ndbapi/testOperations.cpp
    1.11 05/04/25 11:58:58 joreland@mysql.com +12 -4
    Test case also for abort case.
      (abort if not lock owner still fails!)

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.31 05/04/25 11:58:58 joreland@mysql.com +6 -7
    bug#9749 - ndb lock upgrade 
      post review fix.
      don't init hash value on restart operations
      make sure that lock mode is correct in entire que.

ChangeSet
  1.2202.1.7 05/04/25 11:54:00 mskold@mysql.com +1 -0
  Post review fix of ndbcluster_drop_database, typo

  sql/ha_ndbcluster.cc
    1.147 05/04/25 11:53:19 mskold@mysql.com +1 -1
    Post review fix of ndbcluster_drop_database, typo

ChangeSet
  1.2202.1.6 05/04/25 11:34:47 mskold@mysql.com +1 -0
  Post review fix of ndbcluster_drop_database, print error

  sql/ha_ndbcluster.cc
    1.146 05/04/25 11:34:40 mskold@mysql.com +3 -0
    Post review fix of ndbcluster_drop_database, print error

ChangeSet
  1.2202.1.5 05/04/25 11:31:16 mskold@mysql.com +1 -0
  Post review fix of ndbcluster_drop_database

  sql/ha_ndbcluster.cc
    1.145 05/04/25 11:30:36 mskold@mysql.com +11 -5
    Post review fix of ndbcluster_drop_database

ChangeSet
  1.2202.3.1 05/04/25 11:25:40 dlenev@brandersnatch.localdomain +1 -0
  Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040 
  "'func_sapdb' fails on 64bit build hosts")

  sql/item_timefunc.cc
    1.85 05/04/25 11:25:37 dlenev@mysql.com +2 -2
    calc_time_diff():
      Fixed yet another signedness problem.

ChangeSet
  1.2202.2.4 05/04/25 08:43:16 joreland@mysql.com +1 -0
  ndb - autotest
    add more tests to verify correctness of backups

  ndb/test/run-test/daily-basic-tests.txt
    1.18 05/04/25 08:43:13 joreland@mysql.com +24 -0
    ndb - test
      add more tests to verify correctness of backups

ChangeSet
  1.2202.2.3 05/04/25 08:35:18 joreland@mysql.com +1 -0
  bug#9924 - ndb backup
    remove incorrect assertion

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.16 05/04/25 08:35:15 joreland@mysql.com +0 -4
    bug#9924 - ndb backup
      remove incorrect assertion

ChangeSet
  1.2202.2.2 05/04/24 20:34:42 joreland@mysql.com +1 -0
  bug#9924 - ndb backup - abort handling
    uninit variable

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.15 05/04/24 20:34:39 joreland@mysql.com +1 -0
    bug#9924 - ndb backup - abort handling
      uninit variable

ChangeSet
  1.2202.1.3 05/04/23 17:33:12 pekka@mysql.com +7 -0
  ndb - bug#10029 fix

  ndb/test/ndbapi/testOIBasic.cpp
    1.28 05/04/23 17:23:18 pekka@mysql.com +119 -41
    handle multipl index update failure atomically

  ndb/src/ndbapi/ndberror.c
    1.22.1.1 05/04/23 17:23:18 pekka@mysql.com +4 -3
    handle multipl index update failure atomically

  ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
    1.15 05/04/23 17:23:18 pekka@mysql.com +11 -0
    handle multipl index update failure atomically

  ndb/src/kernel/blocks/dbtup/Notes.txt
    1.2 05/04/23 17:23:18 pekka@mysql.com +20 -5
    handle multipl index update failure atomically

  ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.6 05/04/23 17:23:18 pekka@mysql.com +41 -39
    handle multipl index update failure atomically

  ndb/src/kernel/blocks/dbtup/Dbtup.hpp
    1.18 05/04/23 17:23:18 pekka@mysql.com +8 -0
    handle multipl index update failure atomically

  ndb/include/kernel/signaldata/TuxMaint.hpp
    1.3 05/04/23 17:23:18 pekka@mysql.com +2 -2
    handle multipl index update failure atomically

ChangeSet
  1.2194.11.3 05/04/22 20:49:05 joerg@mysql.com +1 -0
  Step 3 of the switch to support configuration with NPTL:
  Change "configure.in".
  
  The branches for Tru64 (ex: OSF/1) and Linux are separated,
  and for Linux 'getconf GNU_LIBPTHREAD_VERSION' is used to tell between Linuxthreads and NPTL.

  configure.in
    1.364 05/04/22 20:49:01 joerg@mysql.com +86 -54
    Step 3 of the switch to support configuration with NPTL:
    Change "configure.in".
    
    1) Separate the branches checking for thread libraries on OSF/1 (now: Tru64) and on Linux,
       as these are different things. In the Tru64 branch, remove the obsolete part for OSF/1 3.2,
       because that is gone since long (about a decade?); we are at 5 now. Adapt the comment.
    
    2) For Linux, the thread libraries are "Linuxthreads" (older) and "NPTL" (newer).
       Until now, we cared only about "Linuxthreads", and we did so by checking a comment in 
       the header file '/usr/include/pthread.h'.
       With NPTL as an alternative or only thread package, this is not secure any more,
       there are distributions where the header file still contains that comment but the lib is NPTL.
       For all current distributions, the way to check is the 'getconf' command.
    
       On old distributions, 'getconf' exists but does not understand the 'GNU_LIBPTHREAD_VERSION'
       parameter. It is unlikely that such an old system should have NPTL, so the header file check is
       sufficient if the getconf inquiry fails.
    
       For both Linuxthreads and NPTL, '-lpthread' is the linker option to use.
    
    3) To detect problems as early as possible, on Linux a link test using '-lpthread' is done.
       The code is copied from a later check where the thread functions are searched in '-lc',
       '-lpthread', and '-lpthreads', but this later search would not be executed after the lib
       was already determined. So if the test is not done here, it will be detected only during
       the real build. This is too late.

ChangeSet
  1.2200.3.1 05/04/22 15:28:23 mskold@mysql.com +4 -0
  Fix for Bug #9318  drop database does not drop ndb tables

  mysql-test/r/ndb_database.result
    1.1 05/04/22 15:27:54 mskold@mysql.com +27 -0

  mysql-test/r/ndb_database.result
    1.0 05/04/22 15:27:54 mskold@mysql.com +0 -0
    BitKeeper file /usr/local/home/marty/MySQL/mysql-4.1/mysql-test/r/ndb_database.result

  mysql-test/t/ndb_database.test
    1.1 05/04/22 15:27:52 mskold@mysql.com +50 -0

  mysql-test/t/ndb_database.test
    1.0 05/04/22 15:27:52 mskold@mysql.com +0 -0
    BitKeeper file /usr/local/home/marty/MySQL/mysql-4.1/mysql-test/t/ndb_database.test

  sql/ha_ndbcluster.h
    1.51 05/04/22 15:27:08 mskold@mysql.com +4 -2
    Fix for Bug #9318  drop database does not drop ndb tables

  sql/ha_ndbcluster.cc
    1.144 05/04/22 15:27:08 mskold@mysql.com +73 -50
    Fix for Bug #9318  drop database does not drop ndb tables

ChangeSet
  1.2202.2.1 05/04/22 13:20:47 joreland@mysql.com +2 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/ndbapi/ndberror.c
    1.23 05/04/22 13:20:46 joreland@mysql.com +0 -0
    Auto merged

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.51 05/04/22 13:20:46 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2202.1.1 05/04/22 12:30:09 ingo@mysql.com +2 -0
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  A fix of the original patch.
  Correctly clear a bit from an enum value.

  sql/table.h
    1.72 05/04/22 12:27:09 ingo@mysql.com +10 -6
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    A fix of the original patch.
    Correctly clear a bit from an enum value.

  sql/sql_insert.cc
    1.158 05/04/22 12:27:09 ingo@mysql.com +6 -3
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    A fix of the original patch.
    Correctly clear a bit from an enum value.

ChangeSet
  1.2175.1.7 05/04/22 11:04:26 joreland@mysql.com +1 -0
  bug#9724 - ndb restart
    if file already open occur print files...

  ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
    1.2 05/04/22 11:04:21 joreland@mysql.com +8 -2
    bug#9724 - ndb restart
      if file already open occur print files...

ChangeSet
  1.2175.1.6 05/04/22 09:40:44 joreland@mysql.com +2 -0
  bug#9969 - ndb
    missleading error message

  ndb/test/src/NdbBackup.cpp
    1.21 05/04/22 09:40:40 joreland@mysql.com +1 -1
    typo

  ndb/src/ndbapi/ndberror.c
    1.21.1.2 05/04/22 09:40:40 joreland@mysql.com +3 -3
    bug#9969 - ndb
      missleading error message

ChangeSet
  1.2175.1.5 05/04/22 09:07:25 joreland@mysql.com +16 -0
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
  bug#9960 - ndb backup
        increase wait completed timeout to 48 hours

  ndb/test/src/NdbBackup.cpp
    1.20 05/04/22 09:07:23 joreland@mysql.com +26 -20
    fix error codes
    introduce checking of backup resources after each test

  ndb/test/run-test/daily-basic-tests.txt
    1.17 05/04/22 09:07:23 joreland@mysql.com +24 -0
    Add failure test cases to autotest

  ndb/test/ndbapi/testBackup.cpp
    1.10 05/04/22 09:07:23 joreland@mysql.com +7 -7
    fix return codes

  ndb/src/ndbapi/ndberror.c
    1.21.1.1 05/04/22 09:07:23 joreland@mysql.com +3 -2
    new error codes

  ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
    1.2 05/04/22 09:07:23 joreland@mysql.com +4 -2
    Handle node failures activly
      (mainly for backup...)

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.25 05/04/22 09:07:22 joreland@mysql.com +3 -1
    Handle node failures activly
      (mainly for backup...)

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.59 05/04/22 09:07:22 joreland@mysql.com +11 -18
    Handle node failures activly
      (mainly for backup...)

  ndb/src/mgmapi/mgmapi.cpp
    1.26 05/04/22 09:07:22 joreland@mysql.com +2 -2
    bug#9960 - ndb backup
      increase wait completed timeout to 48 hours

  ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
    1.17 05/04/22 09:07:22 joreland@mysql.com +1 -0
    Init own version

  ndb/src/kernel/blocks/backup/BackupInit.cpp
    1.10 05/04/22 09:07:22 joreland@mysql.com +1 -1
    bug#9924 - ndb backup abort handling
      Redo abort handling according to descr. in Backup.txt

  ndb/src/kernel/blocks/backup/Backup.txt
    1.2 05/04/22 09:07:22 joreland@mysql.com +25 -0
    bug#9924 - ndb backup abort handling
      Redo abort handling according to descr. in Backup.txt

  ndb/src/kernel/blocks/backup/Backup.hpp
    1.7 05/04/22 09:07:22 joreland@mysql.com +15 -21
    bug#9924 - ndb backup abort handling
      Redo abort handling according to descr. in Backup.txt

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.14 05/04/22 09:07:22 joreland@mysql.com +616 -876
    bug#9924 - ndb backup abort handling
      Redo abort handling according to descr. in Backup.txt

  ndb/src/common/debugger/signaldata/BackupImpl.cpp
    1.3 05/04/22 09:07:22 joreland@mysql.com +2 -4
    fix printout

  ndb/include/kernel/signaldata/BackupSignalData.hpp
    1.3 05/04/22 09:07:22 joreland@mysql.com +3 -0
    new error codes

  ndb/include/kernel/signaldata/BackupImpl.hpp
    1.3 05/04/22 09:07:22 joreland@mysql.com +7 -5
    Add nodeid to reply to be able to fake reply during NF

ChangeSet
  1.2200.2.1 05/04/21 21:47:58 msvensson@neptunus.(none) +1 -0
  C99 Portability fix

  sql/sql_insert.cc
    1.157 05/04/21 21:47:56 msvensson@neptunus.(none) +3 -3
    C99 Portability fix

ChangeSet
  1.2201 05/04/21 21:15:35 lenz@mysql.com +1 -0
  - added missing file config_readline.h to the source distribution

  cmd-line-utils/readline/Makefile.am
    1.13 05/04/21 21:15:30 lenz@mysql.com +1 -1
    - added missing file config_readline.h to the source distribution

ChangeSet
  1.2198.2.1 05/04/21 13:09:19 mskold@mysql.com +1 -0
  Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

  sql/ha_ndbcluster.cc
    1.143 05/04/21 13:08:58 mskold@mysql.com +4 -1
    Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert

ChangeSet
  1.2198.1.2 05/04/21 12:36:23 msvensson@neptunus.(none) +3 -0
  Reverting back to original path of readline.h

  cmd-line-utils/libedit/readline.c
    1.8 05/04/21 12:36:20 msvensson@neptunus.(none) +1 -1
    Reverting back to original path of readline.h

  cmd-line-utils/libedit/Makefile.am
    1.11 05/04/21 12:36:20 msvensson@neptunus.(none) +1 -1
    Reverting back to original path of readline.h

  cmd-line-utils/libedit/readline/readline.h
    1.2 05/04/21 12:34:17 msvensson@neptunus.(none) +0 -0
    mvdir

ChangeSet
  1.2198.1.1 05/04/21 12:06:46 msvensson@neptunus.(none) +43 -0
  Upgrade to libedit-2.9

  cmd-line-utils/libedit/vis.h
    1.1 05/04/21 12:06:39 msvensson@neptunus.(none) +92 -0

  cmd-line-utils/libedit/vis.c
    1.1 05/04/21 12:06:39 msvensson@neptunus.(none) +392 -0

  cmd-line-utils/libedit/unvis.c
    1.1 05/04/21 12:06:39 msvensson@neptunus.(none) +311 -0

  cmd-line-utils/libedit/el_term.h
    1.1 05/04/21 12:06:39 msvensson@neptunus.(none) +131 -0

  cmd-line-utils/libedit/editline/readline.h
    1.1 05/04/21 12:06:39 msvensson@neptunus.(none) +193 -0

  cmd-line-utils/libedit/vis.h
    1.0 05/04/21 12:06:39 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug2596/cmd-line-utils/libedit/vis.h

  cmd-line-utils/libedit/vis.c
    1.0 05/04/21 12:06:39 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug2596/cmd-line-utils/libedit/vis.c

  cmd-line-utils/libedit/vi.c
    1.4 05/04/21 12:06:39 msvensson@neptunus.(none) +72 -77
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/unvis.c
    1.0 05/04/21 12:06:39 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug2596/cmd-line-utils/libedit/unvis.c

  cmd-line-utils/libedit/tty.h
    1.3 05/04/21 12:06:39 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/tty.c
    1.5 05/04/21 12:06:39 msvensson@neptunus.(none) +139 -23
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/tokenizer.c
    1.4 05/04/21 12:06:39 msvensson@neptunus.(none) +64 -34
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/el_term.h
    1.0 05/04/21 12:06:39 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug2596/cmd-line-utils/libedit/el_term.h

  cmd-line-utils/libedit/editline/readline.h
    1.0 05/04/21 12:06:39 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug2596/cmd-line-utils/libedit/editline/readline.h

  cmd-line-utils/libedit/term.c
    1.7 05/04/21 12:06:38 msvensson@neptunus.(none) +72 -71
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/sys.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +28 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/strlcpy.c
    1.2 05/04/21 12:06:38 msvensson@neptunus.(none) +64 -19
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/sig.h
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/sig.c
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +3 -14
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/search.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +3 -7
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/search.c
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +44 -40
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/refresh.h
    1.2 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/refresh.c
    1.6 05/04/21 12:06:38 msvensson@neptunus.(none) +9 -20
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/readline.c
    1.7 05/04/21 12:06:38 msvensson@neptunus.(none) +815 -430
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/read.h
    1.2 05/04/21 12:06:38 msvensson@neptunus.(none) +3 -1
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/read.c
    1.6 05/04/21 12:06:38 msvensson@neptunus.(none) +86 -61
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/prompt.h
    1.2 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/prompt.c
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +6 -17
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/parse.h
    1.2 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/parse.c
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +15 -19
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/map.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/map.c
    1.7 05/04/21 12:06:38 msvensson@neptunus.(none) +23 -35
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/key.h
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +18 -19
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/key.c
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +22 -32
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/history.c
    1.8 05/04/21 12:06:38 msvensson@neptunus.(none) +30 -37
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/histedit.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +26 -11
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/hist.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +2 -6
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/hist.c
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +8 -20
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/fgetln.c
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +79 -100
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/emacs.c
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +61 -48
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/el.h
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +8 -10
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/el.c
    1.6 05/04/21 12:06:38 msvensson@neptunus.(none) +52 -33
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/common.c
    1.4 05/04/21 12:06:38 msvensson@neptunus.(none) +42 -54
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/chared.h
    1.3 05/04/21 12:06:38 msvensson@neptunus.(none) +5 -7
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/chared.c
    1.5 05/04/21 12:06:38 msvensson@neptunus.(none) +37 -18
    Upgrade to libedit-2.9

  cmd-line-utils/libedit/Makefile.am
    1.10 05/04/21 12:06:38 msvensson@neptunus.(none) +1 -1
    Upgrade to libedit-2.9

  client/mysql.cc
    1.201 05/04/21 12:06:38 msvensson@neptunus.(none) +1 -1
    Upgrade to libedit-2.9

  BitKeeper/deleted/.del-readline.h~ac6080227e4b72fc
    1.4 05/04/21 12:04:15 msvensson@neptunus.(none) +0 -0
    Delete: cmd-line-utils/libedit/readline/readline.h

ChangeSet
  1.2181.3.1 05/04/21 10:58:58 hf@deer.(none) +1 -0
  Fix for bug #7344 (Repeating mysql_server_start/mysql_server_end crash clients)
  One more free_charset call added

  libmysql/libmysql.c
    1.291 05/04/21 10:56:59 hf@deer.(none) +1 -0
    free_charset call added

ChangeSet
  1.2196.3.1 05/04/20 15:08:22 igor@rurik.mysql.com +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1
  into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  sql/sql_select.cc
    1.396 05/04/20 15:08:15 igor@rurik.mysql.com +0 -0
    Auto merged

ChangeSet
  1.2194.11.2 05/04/20 20:38:57 joerg@mysql.com +6 -0
  Step 2 of the switch to support configuration with NPTL:
  Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
  Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
  When we support configuration with NPTL but no Linuxthreads, this misuse must cease.

  tools/mysqlmanager.c
    1.44 05/04/20 20:38:54 joerg@mysql.com +1 -1
    Step 2 of the switch to support configuration with NPTL:
    Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.

  sql/stacktrace.h
    1.3 05/04/20 20:38:54 joerg@mysql.com +2 -2
    Step 2 of the switch to support configuration with NPTL:
    Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.

  sql/stacktrace.c
    1.16 05/04/20 20:38:54 joerg@mysql.com +2 -2
    Step 2 of the switch to support configuration with NPTL:
    Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.

  mysys/thr_mutex.c
    1.26 05/04/20 20:38:54 joerg@mysql.com +1 -1
    Step 2 of the switch to support configuration with NPTL:
    Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.

  include/my_global.h
    1.82 05/04/20 20:38:53 joerg@mysql.com +4 -4
    Step 2 of the switch to support configuration with NPTL:
    Use the new 'TARGET_OS_LINUX' where only the OS matters and not the threads Library.

  configure.in
    1.363 05/04/20 20:38:53 joerg@mysql.com +1 -0
    Step 2 of the switch to support configuration with NPTL:
    Define a new CPP symbol that the target OS is Linux.
    Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
    When we support configuration with NPTL but no Linuxthreads, this misuse must cease.

ChangeSet
  1.2194.11.1 05/04/20 20:10:28 joerg@mysql.com +6 -0
  Step 1 of the switch to support configuration with NPTL:
  Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  support-files/Makefile.am
    1.26 05/04/20 20:10:25 joerg@mysql.com +1 -1
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  scripts/mysqld_safe.sh
    1.74 05/04/20 20:10:25 joerg@mysql.com +1 -1
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  scripts/Makefile.am
    1.42 05/04/20 20:10:25 joerg@mysql.com +1 -1
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  myisam/Makefile.am
    1.29 05/04/20 20:10:25 joerg@mysql.com +1 -1
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  configure.in
    1.362 05/04/20 20:10:25 joerg@mysql.com +9 -9
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

  acinclude.m4
    1.133 05/04/20 20:10:25 joerg@mysql.com +1 -1
    Step 1 of the switch to support configuration with NPTL:
    Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.

ChangeSet
  1.2196.1.4 05/04/20 16:09:00 pekka@mysql.com +1 -0
  ndb - dbug aid for api signal log

  ndb/src/ndbapi/TransporterFacade.cpp
    1.30 05/04/20 15:35:20 pekka@mysql.com +4 -0
    dbug aid for api signal log

ChangeSet
  1.2196.1.2 05/04/20 12:02:07 msvensson@neptunus.(none) +1 -0
  After review fix

  cmd-line-utils/readline/config_readline.h
    1.2 05/04/20 12:02:04 msvensson@neptunus.(none) +8 -4
    Fixing code formatting

ChangeSet
  1.2194.2.6 05/04/20 11:08:53 mskold@mysql.com +1 -0
  Removed forgotten abort() call, bug#10001

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.53 05/04/20 11:07:49 mskold@mysql.com +0 -1
    Removed forgotten abort() call

ChangeSet
  1.2194.7.3 05/04/20 08:39:08 lenz@mysql.com +1 -0
  - Enabled the "blackhole" storage engine for the Max RPM subpackage

  support-files/mysql.spec.sh
    1.93 05/04/20 08:39:02 lenz@mysql.com +5 -0
    - Enabled the "blackhole" storage engine for the Max RPM subpackage

ChangeSet
  1.2194.10.1 05/04/19 16:54:30 igor@rurik.mysql.com +3 -0
  sql_select.cc:
    Fixed bug #9681.
    The bug happened with queries using derived tables specified by
    a SELECT with ROLLUP, such as:
    SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
    if column a of table t1 is declared as NOT NULL.
    This was to the fact that the first column of the temporary table
    created to contain the derived table erroneously inherited the NOT NULL
    attribute from column a.
  olap.result, olap.test:
    Added a test case for bug #9681.

  sql/sql_select.cc
    1.394.1.2 05/04/19 16:53:02 igor@rurik.mysql.com +0 -7
    Fixed bug #9681.
    The bug happened with queries using derived tables specified by
    a SELECT with ROLLUP, such as:
    SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
    if column a of table t1 is declared as NOT NULL.
    This was to the fact that the first column of the temporary table
    created to contain the derived table erroneously inherited the NOT NULL
    attribute from column a.

  mysql-test/r/olap.result
    1.16 05/04/19 16:43:35 igor@rurik.mysql.com +13 -0
    Added a test case for bug #9681.

  mysql-test/t/olap.test
    1.13 05/04/19 16:43:03 igor@rurik.mysql.com +13 -0
    Added a test case for bug #9681.

  sql/sql_select.cc
    1.394.1.1 05/04/19 16:40:59 igor@rurik.mysql.com +19 -0
    Fixed bug #9681.
    The bug happened with queries using derived tables specified by
    a SELECT with ROLLUP, such as:
    SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
    if column a of table t1 is declared as NOT NULL.
    This was to the fact that the first column of the temporary table
    created to contain the derived table erroneously inherited the NOT NULL
    attribute from column a.

ChangeSet
  1.2194.2.5 05/04/19 17:23:49 mskold@mysql.com +22 -0
  Disabled ndb tests for embedded

  mysql-test/t/ndb_update.test
    1.4 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_types.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_truncate.test
    1.2 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_transaction.test
    1.5 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_subquery.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_restore.test
    1.4 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_replace.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_multi.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_minmax.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_lock.test
    1.6 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_limit.test
    1.3 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_insert.test
    1.8 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_index_unique.test
    1.11 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_index.test
    1.4 05/04/19 17:23:01 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_index_ordered.test
    1.21 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_charset.test
    1.4 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_cache.test
    1.2 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_blob.test
    1.13 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_basic.test
    1.25 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_autodiscover2.test
    1.6 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_autodiscover.test
    1.15 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

  mysql-test/t/ndb_alter_table.test
    1.19 05/04/19 17:23:00 mskold@mysql.com +1 -0
    Disabled ndb tests for embedded

ChangeSet
  1.2194.7.2 05/04/19 17:18:56 lenz@mysql.com +4 -0
  - manual merge

  tools/Makefile.am
    1.15 05/04/19 17:18:52 lenz@mysql.com +0 -16
    - manual merge

  libmysqld/examples/Makefile.am
    1.22 05/04/19 17:18:52 lenz@mysql.com +0 -0
    - manual merge

  Docs/Makefile.am
    1.53 05/04/19 17:18:52 lenz@mysql.com +1 -2
    - manual merge

  sql/share/Makefile.am
    1.25 05/04/19 17:07:03 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.746 05/04/19 17:00:05 lenz@mysql.com +3 -0
  - added missing copyright headers to several Makefile.am's (noticed
    while testing changes to the mysql-copyright scripts

  tools/Makefile.am
    1.10.1.1 05/04/19 17:00:02 lenz@mysql.com +16 -0
    - added a copyright header

  sql/share/Makefile.am
    1.20.1.1 05/04/19 17:00:02 lenz@mysql.com +16 -0
    - added a copyright header

  libmysqld/examples/Makefile.am
    1.10.1.3 05/04/19 17:00:02 lenz@mysql.com +16 -0
    - added a copyright header

ChangeSet
  1.2194.9.1 05/04/19 15:12:32 ingo@mysql.com +5 -0
  Bug#7806 - insert on duplicate key and auto-update of timestamp
  Modified the check for the timestamp field so that the flags for
  the automatic for inserts and updates are cleared independently.

  sql/table.h
    1.71 05/04/19 15:12:29 ingo@mysql.com +4 -0
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    Extended a comment to warn about usage of enum timestamp_auto_set_type.

  sql/sql_insert.cc
    1.156 05/04/19 15:12:29 ingo@mysql.com +82 -12
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    Modified the check of the insert fields so that an explicit
    assignment of the timestamp field does only disable the automatic
    for inserts and retains the automatic for updates.
    Added a check if the update fields contain the timestamp field.
    In this case, the automatic on update is disabled, but not the
    automatic on insert. This is called from mysql_prepare_insert().

  sql/mysql_priv.h
    1.345 05/04/19 15:12:29 ingo@mysql.com +0 -2
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    Made check_insert_fields() static. It is used only in sql_insert.cc.

  mysql-test/t/type_timestamp.test
    1.24 05/04/19 15:12:29 ingo@mysql.com +21 -0
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    The test case.

  mysql-test/r/type_timestamp.result
    1.26 05/04/19 15:12:29 ingo@mysql.com +47 -0
    Bug#7806 - insert on duplicate key and auto-update of timestamp
    The test result.

ChangeSet
  1.2194.8.1 05/04/19 14:35:47 marko@hundin.mysql.fi +5 -0
  InnoDB: Truncate SHOW INNODB STATUS output at the start of the list
  of active transactions, if necessary and possible.  (Bug #5436)

ChangeSet
  1.1346.1.745 05/04/19 13:33:38 lenz@mysql.com +1 -0
  Updated Docs/Makefile.am:
  
  - fixed copyright header and removed obsolete comments about how to
    build the manual using texinfo
  - added an "install-data-hook" to install the mysql.info info page.
    This seems to be the only way to install info pages, if they are not
    built from texinfo sources directly.

  Docs/Makefile.am
    1.38.1.15 05/04/19 13:33:34 lenz@mysql.com +22 -10
    - fixed copyright header and removed obsolete comments about how to
      build the manual using texinfo
    - added an "install-data-hook" to install the mysql.info info page.
      This seems to be the only way to install info pages, if they are not
      built from texinfo sources directly.

  sql/ha_innodb.cc
    1.191.1.1 05/04/19 14:32:49 marko@hundin.mysql.fi +37 -9
    innodb_show_status(): Truncate oversized output at the beginning
    of the list of active transactions, if possible.

  innobase/srv/srv0srv.c
    1.78 05/04/19 14:32:18 marko@hundin.mysql.fi +25 -4
    srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end.

  innobase/include/srv0srv.h
    1.44 05/04/19 14:31:59 marko@hundin.mysql.fi +5 -1
    srv_printf_innodb_monitor(): Add output parameters trx_start and trx_end.

  innobase/lock/lock0lock.c
    1.48 05/04/19 14:31:17 marko@hundin.mysql.fi +22 -13
    Split lock_print_info() into lock_print_info_summary()
    and lock_print_info_all_transactions().

  innobase/include/lock0lock.h
    1.19 05/04/19 14:31:17 marko@hundin.mysql.fi +9 -2
    Split lock_print_info() into lock_print_info_summary()
    and lock_print_info_all_transactions().

ChangeSet
  1.2176.5.1 05/04/19 13:12:19 msvensson@neptunus.(none) +31 -0
  BUG#9568 mysql segfaults from CTRL-R 
   - Segfault because of passing a 64-bit pointer to 32 bit integer.
   - Add new include  config_readline.h which will calculate some new defines 
     based on what is found in config.h
   - This file was originally included in readline 4.3 as config.h.in, only the part that
      makes new defines have been moved to this file. 

  cmd-line-utils/readline/config_readline.h
    1.1 05/04/19 13:12:15 msvensson@neptunus.(none) +26 -0

  cmd-line-utils/readline/xmalloc.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/vi_mode.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/util.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/undo.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/tilde.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/text.c
    1.4 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/terminal.c
    1.12 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/signals.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/shell.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/search.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/rltty.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/readline.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/parens.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/nls.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/misc.c
    1.3 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/mbutil.c
    1.4 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/macro.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/kill.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/keymaps.c
    1.5 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/isearch.c
    1.8 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/input.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histsearch.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/history.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histfile.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/histexpand.c
    1.9 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/funmap.c
    1.7 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/display.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/config_readline.h
    1.0 05/04/19 13:12:15 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/bug9568/cmd-line-utils/readline/config_readline.h

  cmd-line-utils/readline/complete.c
    1.10 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/callback.c
    1.6 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

  cmd-line-utils/readline/bind.c
    1.12 05/04/19 13:12:15 msvensson@neptunus.(none) +1 -3
    Include local config_readline.h instead of config.h

ChangeSet
  1.2194.6.1 05/04/19 14:44:54 ramil@mysql.com +3 -0
  A fix (bug #9837: round(1, 6) delivers wrong value in create table context).

  sql/item_func.cc
    1.239 05/04/19 14:44:50 ramil@mysql.com +2 -0
    A fix (bug #9837: round(1, 6) delivers wrong value in create table context).
    As we change decimals, we should change max_length accordingly.

  mysql-test/t/func_math.test
    1.14 05/04/19 14:44:50 ramil@mysql.com +13 -0
    A fix (bug #9837: round(1, 6) delivers wrong value in create table context).

  mysql-test/r/func_math.result
    1.22 05/04/19 14:44:50 ramil@mysql.com +11 -0
    A fix (bug #9837: round(1, 6) delivers wrong value in create table context).

ChangeSet
  1.2194.5.1 05/04/19 11:21:26 mskold@mysql.com +3 -0
  Fix for Bug #9691  UPDATE fails on attempt to update primary key

  mysql-test/r/ndb_update.result
    1.3 05/04/19 11:20:56 mskold@mysql.com +25 -5
    Fix for Bug #9691  UPDATE fails on attempt to update primary key

  sql/ha_ndbcluster.cc
    1.142 05/04/19 11:20:55 mskold@mysql.com +24 -15
    Fix for Bug #9691  UPDATE fails on attempt to update primary key

  mysql-test/t/ndb_update.test
    1.3 05/04/19 11:20:55 mskold@mysql.com +13 -2
    Fix for Bug #9691  UPDATE fails on attempt to update primary key

ChangeSet
  1.2194.2.3 05/04/19 11:17:32 joreland@mysql.com +1 -0
  CSC5149 - ndb test programs
    Fix src distributions for benchmark prg

  ndb/test/ndbapi/Makefile.am
    1.16 05/04/19 11:17:03 joreland@mysql.com +2 -2
    CSC5149 - ndb test programs
      Fix src distributions for benchmark prg

ChangeSet
  1.1346.1.744 05/04/19 11:15:36 lenz@mysql.com +1 -0
  - removed COPYING from txt_files of Docs/Makefile.am
    (it's already in EXTRA_DIST of the toplevel Makefile.am)

  Docs/Makefile.am
    1.38.1.14 05/04/19 11:15:33 lenz@mysql.com +1 -1
    - removed COPYING from txt_files (it's already in EXTRA_DIST of the toplevel
      Makefile.am)

ChangeSet
  1.2194.4.1 05/04/19 08:23:03 jan@hundin.mysql.fi +1 -0
  Style change. Use 1 and 0 instead of true and false.

  sql/ha_innodb.cc
    1.192 05/04/19 08:22:57 jan@hundin.mysql.fi +4 -4
    Style change. Use 1 and 0 instead of true and false.

ChangeSet
  1.2175.1.4 05/04/18 12:41:12 joreland@mysql.com +3 -0
  bug#9892
    Make BUILDINDX RF_LOCAL aware

  ndb/test/ndbapi/testIndex.cpp
    1.13 05/04/18 12:41:09 joreland@mysql.com +1 -1
    Run only 1 update thread during NFNR2_O

  ndb/src/ndbapi/Ndbif.cpp
    1.25 05/04/18 12:41:09 joreland@mysql.com +4 -4
    allow TCKEY_FAILREF w/ invalid magic number also when NDB_NODROPPED_SIGNAL

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.32 05/04/18 12:41:09 joreland@mysql.com +28 -9
    bug#9892
      Make BUILDINDX RF_LOCAL aware

ChangeSet
  1.2194.2.1 05/04/18 12:17:32 jan@hundin.mysql.fi +2 -0
  Fixed a bug: deadlock without any locking, simple select and update (Bug #7975).
  Backported from 5.0.3.

  sql/ha_innodb.cc
    1.191 05/04/18 12:17:09 jan@hundin.mysql.fi +15 -4
    INSERT ON DUPLICATE KEY UPDATE will also update duplicate records and we should
    take X-lock in this case for duplicate records.
    

  innobase/row/row0ins.c
    1.54 05/04/18 12:17:09 jan@hundin.mysql.fi +23 -18
    If the SQL-query will update or replace duplicate records we take X-lock
    for duplicate records. 

ChangeSet
  1.2194.1.1 05/04/18 07:26:23 sergefp@mysql.com +3 -0
  Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long 

  sql/protocol.cc
    1.99 05/04/18 07:26:20 sergefp@mysql.com +1 -1
    Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long 

  mysql-test/t/group_by.test
    1.35 05/04/18 07:26:20 sergefp@mysql.com +7 -0
    Testcase for BUG#9298

  mysql-test/r/group_by.result
    1.45 05/04/18 07:26:19 sergefp@mysql.com +9 -0
    Testcase for BUG#9298

ChangeSet
  1.2195 05/04/18 05:21:44 sergefp@mysql.com +5 -0
  Fix for BUG#9103: 
  Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
  is only used to make index search tuples and data truncation that occurs here has no
  relation with truncated values being saved into tables.

  sql/sql_select.h
    1.74 05/04/18 05:21:41 sergefp@mysql.com +1 -1
    cp_buffer_from_ref now has THD* parameter

  sql/sql_select.cc
    1.395 05/04/18 05:21:41 sergefp@mysql.com +13 -6
    Fix for BUG#9103: 
    Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
    is only used to make index search tuples and data truncation that occurs here has no
    relation with truncated values being saved into tables.

  sql/opt_range.cc
    1.134 05/04/18 05:21:41 sergefp@mysql.com +1 -1
    cp_buffer_from_ref now has THD* parameter

  mysql-test/t/update.test
    1.19 05/04/18 05:21:41 sergefp@mysql.com +12 -0
    Testcase for BUG#9103

  mysql-test/r/update.result
    1.22 05/04/18 05:21:40 sergefp@mysql.com +14 -0
    Testcase for BUG#9103

ChangeSet
  1.2193 05/04/17 12:48:33 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0-build
  into mysql.com:/space/my/mysql-4.1-build

  support-files/MacOSX/Makefile.am
    1.6 05/04/17 12:48:29 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.743 05/04/17 12:44:59 lenz@mysql.com +1 -0
  - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
    already (and that's the Makefile that acutally creates it)

  support-files/MacOSX/Makefile.am
    1.4.1.1 05/04/17 12:44:56 lenz@mysql.com +1 -2
    - removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
      already (and that's the Makefile that acutally creates it)

ChangeSet
  1.2185.3.6 05/04/17 02:05:09 sergefp@mysql.com +3 -0
  Fix for BUG#9348: when computing union of two intervals set lower bound to 
  minimum of lower bounds of two joined intervals.

  sql/opt_range.cc
    1.133 05/04/17 02:05:06 sergefp@mysql.com +1 -0
    Fix for BUG#9348: when computing union of two intervals set lower bound to 
    minimum of lower bounds of two joined intervals.

  mysql-test/t/range.test
    1.24 05/04/17 02:05:06 sergefp@mysql.com +21 -0
    Testcase for BUG#9348

  mysql-test/r/range.result
    1.33 05/04/17 02:05:06 sergefp@mysql.com +19 -0
    Testcase for BUG#9348

ChangeSet
  1.2189.2.1 05/04/16 23:35:39 sergefp@mysql.com +3 -0
  Fix for BUG#9439:
  Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
  (this is the final cset with proper tests)

  sql/sql_show.cc
    1.198 05/04/16 23:35:37 sergefp@mysql.com +2 -2
    Fix for BUG#9439:
    Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)

  mysql-test/t/show_check.test
    1.42 05/04/16 23:35:37 sergefp@mysql.com +11 -0
    Testcase for BUG#9439

  mysql-test/r/show_check.result
    1.62 05/04/16 23:35:36 sergefp@mysql.com +21 -0
    Testcase for BUG#9439

ChangeSet
  1.2185.3.5 05/04/16 04:12:30 monty@mishka.local +2 -0
  Ensure that all privilege tables are created in MyISAM

  scripts/mysql_fix_privilege_tables.sql
    1.12 05/04/16 04:12:22 monty@mishka.local +2 -0
    Ensure that all privilege tables are created in MyISAM

  scripts/mysql_create_system_tables.sh
    1.21 05/04/16 04:12:22 monty@mishka.local +1 -0
    Ensure that all privilege tables are created in MyISAM

ChangeSet
  1.2185.3.4 05/04/16 03:40:33 monty@mishka.local +3 -0
  Fixed core dump with long timezone names
  Don't abort on bootstrap if a wrong --default-storage-engine is specified

  sql/set_var.cc
    1.164 05/04/16 03:40:27 monty@mishka.local +2 -2
    Indentaion change

  sql/mysqld.cc
    1.567.1.6 05/04/16 03:40:27 monty@mishka.local +17 -9
    Fixed core dump with long timezone names
    Don't abort on bootstrap if a wrong --default-storage-engine is specified
    Don't print strange messages if one sends 'kill' to a mysqld --bootstrap

  sql/handler.cc
    1.162 05/04/16 03:40:26 monty@mishka.local +2 -7
    Combined code

ChangeSet
  1.2187 05/04/16 00:10:35 serg@serg.mylan +2 -0
  merged

  sql/sql_yacc.yy
    1.382 05/04/16 00:10:29 serg@serg.mylan +0 -1
    merged

  sql/sql_lex.cc
    1.144 05/04/16 00:10:29 serg@serg.mylan +0 -1
    ul

ChangeSet
  1.2185.3.3 05/04/15 11:52:58 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-9833
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/mysqld.cc
    1.567.1.5 05/04/15 11:52:57 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2185.2.1 05/04/15 19:26:38 ingo@mysql.com +1 -0
  Bug#9487 - myisampack segmentation violation and bus error
  Fixed some casts for 64-bit systems.
  Fixed a possible buffer overflow.

  myisam/myisampack.c
    1.38 05/04/15 19:25:32 ingo@mysql.com +16 -3
    Bug#9487 - myisampack segmentation violation and bus error
    Added or changed proper casts for the argument of flush_buffer().
    Added a check for the counterstrike of the trick to have
    file_buffer.end some bytes below the real end of the buffer.

ChangeSet
  1.1346.1.742 05/04/15 19:20:15 serg@serg.mylan +2 -0
  BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
  don't set lex->lock_option=TL_READ in the parser for SELECT

  sql/sql_yacc.yy
    1.145.1.90 05/04/15 19:20:12 serg@serg.mylan +0 -1
    BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
    don't set lex->lock_option=TL_READ in the parser for SELECT

  sql/sql_lex.cc
    1.32.1.9 05/04/15 19:20:12 serg@serg.mylan +1 -0
    BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
    don't set lex->lock_option=TL_READ in the parser for SELECT

ChangeSet
  1.2185.1.2 05/04/15 16:14:08 mskold@mysql.com +1 -0
  Bug #9839  Column with AUTOINC contains -1 Value on node stop, post review fix

  sql/ha_ndbcluster.cc
    1.141 05/04/15 16:13:57 mskold@mysql.com +18 -5
    Bug #9839  Column with AUTOINC contains -1 Value on node stop, post review fix

ChangeSet
  1.2185.1.1 05/04/15 15:52:07 mskold@mysql.com +1 -0
  Bug #9839  Column with AUTOINC contains -1 Value on node stop

  sql/ha_ndbcluster.cc
    1.140 05/04/15 15:48:40 mskold@mysql.com +5 -0
    Bug #9839  Column with AUTOINC contains -1 Value on node stop

ChangeSet
  1.2180.3.1 05/04/14 17:22:18 jimw@mysql.com +1 -0
  Fix mysql.server.sh to use shell functions as replacement
  for LSB init functions when they aren't available. (Bug #9852)

  support-files/mysql.server.sh
    1.38 05/04/14 17:22:16 jimw@mysql.com +8 -2
    Use shell function instead of less portable alias command
    to create replacements for LSB functions, and also use
    argument in our replacements.

ChangeSet
  1.2184.1.1 05/04/14 21:31:22 serg@serg.mylan +3 -0
  merged

  sql/sql_delete.cc
    1.134 05/04/14 21:31:16 serg@serg.mylan +2 -5
    merged

ChangeSet
  1.2185 05/04/14 22:27:15 heikki@hundin.mysql.fi +1 -0
  fil0fil.c:
    Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped

  innobase/fil/fil0fil.c
    1.51 05/04/14 22:27:01 heikki@hundin.mysql.fi +51 -19
    Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped

  mysql-test/t/innodb.test
    1.66 05/04/14 21:19:52 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/r/innodb.result
    1.96 05/04/14 21:19:52 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.825.1 05/04/14 18:14:54 serg@serg.mylan +3 -0
  TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
  bug#8151

  sql/sql_delete.cc
    1.74.1.36 05/04/14 18:14:50 serg@serg.mylan +6 -2
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

  mysql-test/t/innodb.test
    1.28.1.27 05/04/14 18:14:50 serg@serg.mylan +1 -0
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

  mysql-test/r/innodb.result
    1.40.1.40 05/04/14 18:14:50 serg@serg.mylan +1 -0
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

ChangeSet
  1.2175.1.3 05/04/14 13:43:07 joreland@mysql.com +3 -0
  BUG#9891 - ndb lcp
  
  Crash if ACC_CONTOPREQ was sent while ACC_LCPCONF was in job buffer
    if ACC_LCPCONF would have arrived eariler (before TUP_LCPSTARTED)
    operations could lockup. 
    But would be restarted on next LCP
  
  -- LQH
  1) Better check for LCP started that will also return true
     if ACC or TUP already has completed
      
  2) Remove incorrect if statement that prevented operations to
     be started if ACC has completed
  
  -- ACC
  Make sure all ACC_CONTOPCONF are sent before releasing lcp record
    i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)
  
  Check for == 4 also when sending ACC_CONTOPCONF

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.49.1.1 05/04/14 13:43:05 joreland@mysql.com +25 -41
    1) Better check for LCP started that will also return true
       if ACC or TUP already has completed
    
    2) Remove incorrect if statement that prevented operations to
       be started if ACC has completed

  ndb/src/kernel/blocks/dblqh/Dblqh.hpp
    1.26 05/04/14 13:43:05 joreland@mysql.com +1 -2
    Remove LCP_STARTED state

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.30 05/04/14 13:43:05 joreland@mysql.com +18 -2
    Make sure all ACC_CONTOPCONF are sent before releasing lcp record
      i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)
    
    Check for == 4 also when sending ACC_CONTOPCONF

ChangeSet
  1.2181.2.2 05/04/14 16:26:39 ramil@mysql.com +1 -0
  Merge mysql.com:/usr/home/ram/work/mysql-4.0
  into mysql.com:/usr/home/ram/work/mysql-4.1

  client/mysqltest.c
    1.160 05/04/14 16:26:35 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.824.1 05/04/14 11:13:08 ramil@mysql.com +1 -0
  In order not to conflict with a Linux kernel header
  set_bit replaced with internal_set_bit,
  clear_bit replaced with internal_clear_bit.

  client/mysqltest.c
    1.77.1.46 05/04/14 11:13:05 ramil@mysql.com +13 -13
    In order not to conflict with a Linux kernel header
    set_bit replaced with internal_set_bit,
    clear_bit replaced with internal_clear_bit.

ChangeSet
  1.2180.2.1 05/04/13 18:25:31 jimw@mysql.com +3 -0
  Check that the default storage engine is really available, and
  refuse to start up if it is not. (Bug #9815)

  sql/mysqld.cc
    1.567.3.1 05/04/13 18:25:28 jimw@mysql.com +12 -0
    Abort startup if the specified default storage engine is
    not available.

  sql/handler.h
    1.137 05/04/13 18:25:28 jimw@mysql.com +1 -0
    Declare ha_storage_engine_is_enabled()

  sql/handler.cc
    1.161 05/04/13 18:25:28 jimw@mysql.com +14 -0
    Add ha_storage_engine_is_enabled function.

ChangeSet
  1.2180.1.1 05/04/13 15:43:29 jimw@mysql.com +1 -0
  Don't allow the server to start up when an invalid user is
  specified via --user or in configuration. (Bug #9833)

  sql/mysqld.cc
    1.567.1.4 05/04/13 15:43:26 jimw@mysql.com +1 -0
    Actually die if we an invalid user is specified.

ChangeSet
  1.2181 05/04/14 01:39:24 petr@mysql.com +1 -0
  post review fix

  mysys/default.c
    1.47.1.2 05/04/14 01:39:22 petr@mysql.com +18 -9
    cleanup + check for the last line in the file in "!include" directive processing

ChangeSet
  1.2172.1.6 05/04/13 19:51:55 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0-build
  into mysql.com:/space/my/mysql-4.1-build

  support-files/mysql.spec.sh
    1.92 05/04/13 19:51:54 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.739 05/04/13 19:50:54 lenz@mysql.com +1 -0
  - fixed a date for a changelog entry  in the RPM spec file (s/Mar/Apr/) - RPM complains about wrongly
    ordered entries.

  support-files/mysql.spec.sh
    1.61.1.28 05/04/13 19:50:52 lenz@mysql.com +1 -1
    - fixed a date for a changelog entry (s/Mar/Apr/) - RPM complains about wrongly ordered entries.

ChangeSet
  1.2180 05/04/13 20:21:28 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE

  sql/ha_innodb.cc
    1.190 05/04/13 20:19:24 heikki@hundin.mysql.fi +2 -1
    Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE

ChangeSet
  1.2172.1.5 05/04/13 19:18:22 lenz@mysql.com +2 -0
  - removed more build tools that are now maintained seperately

  BitKeeper/deleted/.del-Do-hpux-depot~d69e0b7c7f19d3
    1.2 05/04/13 19:11:34 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-hpux-depot

  BitKeeper/deleted/.del-Do-solaris-pkg~43f194aa28e68532
    1.6 05/04/13 19:11:31 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-solaris-pkg

ChangeSet
  1.2172.1.4 05/04/13 19:07:06 lenz@mysql.com +5 -0
  Merge mysql.com:/space/my/mysql-4.0-build
  into mysql.com:/space/my/mysql-4.1-build

  BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03
    1.24 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec
    1.11 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8
    1.12 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3
    1.112 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a
    1.28 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03
    1.23 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Merge rename: Build-tools/mysql-copyright -> BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03

  BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec
    1.10 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Merge rename: Build-tools/mysql-copyright-2 -> BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec

  BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8
    1.11 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Merge rename: Build-tools/Do-pkg -> BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8

  BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3
    1.111 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Merge rename: Build-tools/Do-compile -> BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3

  BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a
    1.27 05/04/13 19:07:04 lenz@mysql.com +0 -0
    Merge rename: Build-tools/Bootstrap -> BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a

ChangeSet
  1.1346.1.738 05/04/13 19:05:31 lenz@mysql.com +16 -0
  - Cleanup: removed obsolete build tools (build toolchain is now maintained sepearately)

ChangeSet
  1.2172.1.3 05/04/13 19:05:05 lenz@mysql.com +1 -0
  - bumped up version number to 4.1.12 (4.1.11 has been released already)

  configure.in
    1.361 05/04/13 19:05:00 lenz@mysql.com +2 -2
    - bumped up version number to 4.1.12 (4.1.11 has been released already)

  BitKeeper/deleted/.del-mysql-copyright-2~e73ec01547206fec
    1.5.1.4 05/04/13 19:01:35 lenz@mysql.com +0 -0
    Delete: Build-tools/mysql-copyright-2

  BitKeeper/deleted/.del-mysql-copyright~56fc330ae63cfe03
    1.8.1.11 05/04/13 19:01:33 lenz@mysql.com +0 -0
    Delete: Build-tools/mysql-copyright

  BitKeeper/deleted/.del-Do-compile~d1a6d7e535befea3
    1.74.1.17 05/04/13 19:00:43 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-compile

  BitKeeper/deleted/.del-my_md5sum~4680250631e4fd9
    1.5 05/04/13 19:00:36 lenz@mysql.com +0 -0
    Delete: Build-tools/my_md5sum

  BitKeeper/deleted/.del-Do-win-build~cb5c5e1df8b3de6
    1.4 05/04/13 18:59:44 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-win-build

  BitKeeper/deleted/.del-Do-create-perl-rpms~1f946e7d8560b3d0
    1.3 05/04/13 18:40:20 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-create-perl-rpms

  BitKeeper/deleted/.del-newest~2dd91db13f2ea308
    1.3 05/04/13 18:39:53 lenz@mysql.com +0 -0
    Delete: Build-tools/newest

  BitKeeper/deleted/.del-Do-patch-file~a2e87df5f75fd496
    1.11 05/04/13 18:39:22 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-patch-file

  BitKeeper/deleted/.del-Do-linux-build~b3b941454648a285
    1.5 05/04/13 18:38:49 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-linux-build

  BitKeeper/deleted/.del-Do-local-patch-file~b86e1bfa3b7c13d3
    1.3 05/04/13 18:38:37 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-local-patch-file

  BitKeeper/deleted/.del-Do-all-build-steps~bb7d38f34728ac06
    1.38 05/04/13 18:38:11 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-all-build-steps

  BitKeeper/deleted/.del-cvs-sanity-check~a3c58acf37f27cee
    1.3 05/04/13 18:37:55 lenz@mysql.com +0 -0
    Delete: Build-tools/cvs-sanity-check

ChangeSet
  1.2172.1.2 05/04/13 18:29:23 lenz@mysql.com +3 -0
  More changes to reflect the removal of manual.texi from the sources:
  
  - Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
  - Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly
  
  The fill_help_tables.sql stub will be replaced with the approriate content when building the
  official source distribution via Bootstrap - it's now autogenerated on the documentation server
  and will be copied into place before packing up the source distribution.

  support-files/mysql.spec.sh
    1.91 05/04/13 18:29:18 lenz@mysql.com +1 -1
    - fixed a typo

  scripts/Makefile.am
    1.41 05/04/13 18:29:18 lenz@mysql.com +1 -6
    - removed fill_help_tables.sh and the creation of fill_help_tables.sql from the Makefile
      (fill_help_tables.sql is now generated on the documentation server and will be added to
      the offical source distribution during the Bootstrap

  BitKeeper/deleted/.del-Do-rpm~c0ef3ebafbf53117
    1.32 05/04/13 18:08:08 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-rpm

  BitKeeper/deleted/.del-logger.pm~9234101b5b668373
    1.5 05/04/13 18:08:07 lenz@mysql.com +0 -0
    Delete: Build-tools/logger.pm

  BitKeeper/deleted/.del-Do-pkg~5079e47cde0baad8
    1.6.1.2 05/04/13 18:08:07 lenz@mysql.com +0 -0
    Delete: Build-tools/Do-pkg

  BitKeeper/deleted/.del-Bootstrap~bfc426bd800ccc3a
    1.8.1.23 05/04/13 18:08:07 lenz@mysql.com +0 -0
    Delete: Build-tools/Bootstrap

ChangeSet
  1.2179 05/04/13 09:02:12 jimw@mysql.com +1 -0
  Fix ctype_ucs_binlog test when ucs2 not available

  mysql-test/t/ctype_ucs_binlog.test
    1.2 05/04/13 09:01:49 jimw@mysql.com +1 -0
    Require ucs support

ChangeSet
  1.2176.3.3 05/04/13 17:22:04 heikki@hundin.mysql.fi +1 -0
  fil0fil.c:
    At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes

  innobase/fil/fil0fil.c
    1.50 05/04/13 17:21:49 heikki@hundin.mysql.fi +2 -1
    At the shutdown, write the latest lsn only to the first pages of the ibdata files of the system tablespace, NOT to the .ibd files; writing to tens of thousands .ibd files can take minutes

  scripts/fill_help_tables.sql
    1.1 05/04/13 16:13:57 lenz@mysql.com +3 -0

  scripts/fill_help_tables.sql
    1.0 05/04/13 16:13:57 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.1-build/scripts/fill_help_tables.sql

ChangeSet
  1.2176.4.1 05/04/13 15:49:28 heikki@hundin.mysql.fi +1 -0
  row0sel.c:
    Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()

  innobase/row/row0sel.c
    1.68 05/04/13 15:49:11 heikki@hundin.mysql.fi +12 -12
    Do not test the value of err if the lock operation was skipped because innodb_logs_unsafe_for_binlog was TRUE; though this did not cause any bugs visible to the user, because err is inited to DB_SUCCESS at the start of the function row_search_for_mysql()

ChangeSet
  1.2176.3.1 05/04/13 14:08:54 mskold@mysql.com +3 -0
  Merge

  sql/ha_ndbcluster.cc
    1.139 05/04/13 14:08:50 mskold@mysql.com +0 -9
    Merge

  ndb/src/ndbapi/Ndb.cpp
    1.41 05/04/13 14:08:50 mskold@mysql.com +0 -22
    Merge

  sql/mysqld.cc
    1.567.1.3 05/04/13 14:05:50 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2176.2.1 05/04/13 13:40:53 pekka@mysql.com +2 -0
  ndb - bug#9865 fix error message

  ndb/src/ndbapi/ndberror.c
    1.22 05/04/13 13:39:26 pekka@mysql.com +2 -0
    error message

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.50 05/04/13 13:39:26 pekka@mysql.com +2 -2
    error message

ChangeSet
  1.2172.1.1 05/04/13 13:27:06 lenz@mysql.com +399 -0
  Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0)

  support-files/mysql.spec.sh
    1.90 05/04/13 13:26:57 lenz@mysql.com +0 -0
    Manual merge

  scripts/make_win_src_distribution.sh
    1.32 05/04/13 13:26:57 lenz@mysql.com +0 -1
    Manual merge

  Docs/Makefile.am
    1.52 05/04/13 13:26:57 lenz@mysql.com +0 -0
    Manual merge

ChangeSet
  1.2160.8.1 05/04/13 12:42:23 mskold@mysql.com +3 -0
  Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  sql/mysqld.cc
    1.567.2.1 05/04/13 12:42:07 mskold@mysql.com +1 -1
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  sql/ha_ndbcluster.cc
    1.136.2.1 05/04/13 12:42:07 mskold@mysql.com +22 -12
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  ndb/src/ndbapi/Ndb.cpp
    1.39.1.1 05/04/13 12:42:07 mskold@mysql.com +25 -17
    Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit

  BitKeeper/deleted/.del-zimbabwe.gif~478cfbaa6f5b066a
    1.4 05/04/13 12:25:14 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.txt~cd146d758c75e6ab
    1.3 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.pdf~978eeff094d4a57e
    1.3 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.gif~d58992747df26331
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.gif~532010647f1c98f7
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.eps~b9bab90d98a3de45
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-yemen.gif~f0d4b9daecbbab9
    1.4 05/04/13 12:25:13 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5
    1.4 05/04/13 12:25:12 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-vietnam.gif~b8a7befce71994b1
    1.4 05/04/13 12:25:12 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d
    1.4 05/04/13 12:25:12 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1
    1.4 05/04/13 12:25:12 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-uzbekistan.gif~ca70f72fc4bca763
    1.4 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.txt~2792ba8db79f0a39
    1.5 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.pdf~ed44efa3b0c6f6ed
    1.3 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.gif~7c94951adc03bf9a
    1.4 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.gif~278102a819343b97
    1.5 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.eps~64e6c5fe46d1929d
    1.6 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-uruguay.gif~17d468a8b3affba4
    1.4 05/04/13 12:25:11 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-united-states-of-america.gif~3817309e55e1f332
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.txt~e4c1066096a8b1b3
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.pdf~d3b480f6acf3b56a
    1.3 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.gif~d167f4bf9179141d
    1.5 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.gif~847cd0f7333e72ac
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.eps~f450a951bf5c4dc9
    1.5 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-uganda.gif~45b3e3b539f02aee
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-tuvalu.gif~3f85331ac0890213
    1.4 05/04/13 12:25:10 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkmenistan.gif~7679a96df08d950a
    1.4 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.txt~bc65755bf8a2a21
    1.3 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.pdf~287742544b50b431
    1.3 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.gif~cb55d42965e9f824
    1.6 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a
    1.4 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.eps~6e9ebd6992e53d70
    1.6 05/04/13 12:25:09 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-trinidad-and-tobago.gif~dfa47192f1bc025
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-tonga.gif~87fef29eef8c57fd
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-togo.gif~485e7cec93f5410a
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-thailand.gif~263675b09165b835
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-texi2html~74632fe370dcec73
    1.12 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-tanzania.gif~3fbe0bc01bcc3247
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-tajikistan.gif~4e42abdd2be16ed8
    1.4 05/04/13 12:25:08 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.txt~d0a19c41a1ed3861
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.pdf~5ff5a019d8237d3c
    1.3 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.gif~b5f1796ed3c458e4
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.gif~295c56859e5f5e
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.eps~cc2ecaf6122443f
    1.6 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.txt~e09c851d69c407a6
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.pdf~ec02533fefb5071d
    1.3 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.gif~dabb711999e3126d
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.gif~37312e2f4537a7e3
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.eps~7811f8473ff72b6e
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.txt~b6d9f06fa227065d
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.pdf~4afd5afe76bd9172
    1.3 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49
    1.4 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.gif~8653c24f7bac88dc
    1.5 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.eps~4c24b952feb3ab
    1.6 05/04/13 12:25:07 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-swaziland.gif~88decc065b4034b5
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-suriname.gif~54de84a4ef71a82
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sudan.gif~6c5d2540c31b8c27
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sri-lanka.gif~ef59edd8115e2afa
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.txt~4b3da48f41bfa958
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.pdf~a25de45d2ded91ed
    1.3 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.gif~7217c59c507d153c
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.gif~345db1228c3a5477
    1.5 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.eps~a798dd1293a30b7c
    1.5 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.txt~93c9adabe5ac3339
    1.5 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.pdf~24496add674f1d6
    1.3 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.gif~f0fe17a9495664c9
    1.5 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.gif~1311c2eada860e9d
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.eps~9c944ac52a247665
    1.6 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.txt~4674c3b1a39d79c9
    1.4 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.pdf~ef7f63c8153ef8d5
    1.3 05/04/13 12:25:06 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.gif~8ef88d69ba7c794
    1.5 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.gif~2aaea35c3bdd90b6
    1.4 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.eps~4f647997f3f26988
    1.5 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-somalia.gif~7c09bce9340f39ca
    1.4 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7
    1.4 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.txt~21996e7d83808d0f
    1.3 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.pdf~349905c733fcc8a
    1.3 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.gif~405038776bc7f2a1
    1.4 05/04/13 12:25:05 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.gif~353783f82c89c7c8
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.eps~f73ea56aafc02828
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovakia.gif~c3d054b17f9c8997
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.txt~21978a833ace2d2
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.pdf~77019ac12b0d44b0
    1.3 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.gif~e18bf77765b76d2f
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.gif~78f227e1f0129a
    1.5 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.eps~1efd8578def570d8
    1.5 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sierra-leone.gif~5c446a27d7e98d59
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-seychelles.gif~f0b489c8e84fef71
    1.4 05/04/13 12:25:04 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff
    1.4 05/04/13 12:25:03 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Users.texi~41da5f4c
    1.3 05/04/13 12:25:03 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63
    1.3 05/04/13 12:25:03 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9
    1.3 05/04/13 12:25:03 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8
    1.4 05/04/13 12:25:02 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615
    1.4 05/04/13 12:25:02 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb
    1.4 05/04/13 12:25:02 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-saint-lucia.gif~a43f5b43c241e500
    1.4 05/04/13 12:25:02 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-rwanda.gif~ba3a28fb5edc29f5
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc
    1.5 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013
    1.3 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.gif~300890a87b30d01e
    1.5 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.eps~653c84cd2a80b954
    1.6 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.txt~c716fe6568110738
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.pdf~322c2e57ce6ceed
    1.3 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.gif~8c5ad831482c31e3
    1.5 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.eps~d197860bb0edbd64
    1.5 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-qatar.gif~9fb4afe3352b17
    1.4 05/04/13 12:25:01 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.txt~b3286118e0bfcc3
    1.4 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.pdf~24587f586bc7534b
    1.3 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.gif~c7cc13bb1c6dfe9d
    1.5 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.gif~b6ec9ce2c88220f6
    1.4 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.eps~98b9150ce6a649b8
    1.5 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.txt~e484ca6c9feb9080
    1.4 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.pdf~e71f4eaa53f33cd
    1.3 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.gif~bcbc9ed9b75fcd3c
    1.5 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.gif~9d9673f2ea9d5129
    1.4 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.eps~8be27a5447e3a146
    1.5 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.txt~f42e0270d8e22325
    1.3 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.pdf~b7977a895a0f6a76
    1.3 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.gif~c80b5315738462af
    1.4 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.gif~6cf82c24f6baef53
    1.5 05/04/13 12:25:00 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.eps~64beb8e0853db8b2
    1.6 05/04/13 12:24:59 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-peru.gif~323d2810b25bcab3
    1.4 05/04/13 12:24:59 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-paraguay.gif~e7b5dd73d7727a1d
    1.4 05/04/13 12:24:59 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-papua-new-guinea.gif~884e9e27b55e51b9
    1.4 05/04/13 12:24:58 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-panama.gif~99595dd051a094f
    1.4 05/04/13 12:24:58 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-pakistan.gif~5ef5cc6b162666b8
    1.4 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-oman.gif~3a84654e80950b30
    1.4 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.txt~2844906ae717ea7a
    1.3 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.pdf~980b935627182fb9
    1.3 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.gif~752c4b4d29375874
    1.4 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.gif~1d881d2af6c4e413
    1.5 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.eps~b37c98d87edd8de
    1.5 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-north-korea.gif~770fd51d9360ae18
    1.4 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-nigeria.gif~f157c385bd632a48
    1.4 05/04/13 12:24:57 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-niger.gif~c26adaadb8150cee
    1.4 05/04/13 12:24:56 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-nicaragua.gif~37b8f7764ac4aea
    1.4 05/04/13 12:24:56 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.txt~f52fdd9690b63ac0
    1.3 05/04/13 12:24:56 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.pdf~ceb107c0ae812a14
    1.3 05/04/13 12:24:56 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.gif~77ea426c11bb3ab
    1.3 05/04/13 12:24:56 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.gif~1fbc54ab63225de7
    1.4 05/04/13 12:24:55 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.eps~861b5316178fcb08
    1.3 05/04/13 12:24:55 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.txt~214c2cbb9ac7db0a
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.pdf~4833162b30912e1
    1.3 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.gif~d788dc4e9afd2f8a
    1.5 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.gif~a1bee178928be339
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.eps~2012cff48c4d9368
    1.5 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-namibia.gif~f3b3b2c233c9031f
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d
    1.11 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-morocco.gif~45858306e12988e9
    1.4 05/04/13 12:24:54 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mongolia.gif~41633d1ced991c78
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-monaco.gif~d2a99ae34527d133
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-micronesia.gif~c46715026d7efe8e
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.txt~a776cf3478c85e68
    1.3 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325
    1.3 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.gif~a749e257ffeb6588
    1.5 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.eps~9186bd67f1a25a3f
    1.6 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mauritius.gif~498d6d0e323d7ef9
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166
    1.4 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41
    1.5 05/04/13 12:24:53 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.texi~af95f3e233925495
    1.882 05/04/13 12:24:51 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf
    1.8 05/04/13 12:24:46 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea
    1.4 05/04/13 12:24:45 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-mali.gif~845a23a66aaaef5
    1.4 05/04/13 12:24:45 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-maldives.gif~941bf5a2381b904c
    1.4 05/04/13 12:24:45 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-malaysia.gif~6f7c73227da2ed6
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-madagascar.gif~e95bd0c2aabb8ab8
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-macedonia.gif~bce0e1455919f41b
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-luxembourg.gif~7e4660faa840e7
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-lithuania.gif~88cec9a9fe920632
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-liechtenstein.gif~8d068c686c4c6e8
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-libya.gif~98259878434e0df2
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-liberia.gif~1dd584598bfe881b
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7
    1.4 05/04/13 12:24:44 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-lebanon.gif~2d27883e8fe0c647
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.txt~193a3991e0eddaf9
    1.3 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.pdf~25516993d39fa760
    1.3 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.gif~abbe57eb4438c6e8
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-laos.gif~f686f38cbff73598
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-kyrgyzstan.gif~6cbe9f09a93ea9e0
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-kiribati.gif~7f5bc99e8b7a6db
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3
    1.4 05/04/13 12:24:43 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277
    1.4 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-jordan.gif~4381349560430e61
    1.4 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.txt~114edadc3ac11a71
    1.5 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.pdf~40532606f6053145
    1.3 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.gif~4c6a663ab9a32af2
    1.4 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.gif~1c6f45454aa378b3
    1.5 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.eps~fe89aea87d627e85
    1.6 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-jamaica.gif~48999b84247ad492
    1.4 05/04/13 12:24:41 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.txt~428bb945a2576671
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.pdf~ae8671649b09cb96
    1.3 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.gif~c1d1d4c51841d831
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.gif~43074800bb72a037
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897
    1.6 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.txt~4430c078ea12b98e
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.gif~f503ea92490b42da
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.gif~60af491676720a39
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.eps~43ecb6f31dcfe2f3
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.txt~c8a9f56f150f1008
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.pdf~e459dd3a1de0f8c7
    1.3 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.gif~5e4633333643bee2
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.gif~3a5ffafd74c67fe
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.eps~9c52bfd977d47d1a
    1.5 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iraq.gif~a1646e6d65515d76
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iran.gif~2cb4e9c4657b5b33
    1.4 05/04/13 12:24:40 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.txt~cae5c380959a5460
    1.3 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.pdf~f14b2f53c85a43d
    1.3 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.gif~a096242096a7c7a
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.gif~2137016b86bc5d07
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.eps~ca7ee0a66154d34d
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.txt~dd6b3c03d0e35936
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.pdf~da00f08b9f794a92
    1.3 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.gif~902645739e3c6b75
    1.5 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.eps~9cc02c4e666e803
    1.5 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38
    1.5 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.pdf~918baeb6bf07fa97
    1.3 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.gif~74e09a15557c20e4
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.gif~373325ba9bcbdc72
    1.5 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.eps~a7d682f15e7be0ea
    1.6 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d
    1.4 05/04/13 12:24:39 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36
    1.4 05/04/13 12:24:38 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-guinea.gif~89df2e995fbc90d1
    1.4 05/04/13 12:24:38 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e
    1.4 05/04/13 12:24:38 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-guatemala.gif~4d43cb1c1dbeddc7
    1.4 05/04/13 12:24:38 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-grenada.gif~db9d209340558224
    1.4 05/04/13 12:24:38 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greenland.gif~44310f9e9180e0b
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.txt~5c5b5ddbb62811c9
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.pdf~e61ed027c4d629
    1.3 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.gif~d2a46be5950e4784
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.gif~c8fbf8252cc56212
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.eps~30dd253c6047f42f
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.pdf~b425328dc4073027
    1.3 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.gif~94507aceb6ea0298
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.eps~69bd9bdc60b3b71b
    1.6 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ghana.gif~9d71585fa3b223c0
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.txt~d73791b0314d5343
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.pdf~aca678db2fc30f2f
    1.3 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.gif~97dfeb0eb82cac6d
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.gif~7c2750867600a157
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.eps~8ec02ead1a75bbfb
    1.6 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-georgia.gif~3a9c93fa982b8c06
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-gambia.gif~8525f1597465137d
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-gabon.gif~5e5c7c8dc0902328
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.txt~fe93e7e98b8daec0
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.pdf~2f143b49353abb46
    1.3 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.gif~64aa78ca3e77be37
    1.4 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.gif~31e0b62070c6d14f
    1.5 05/04/13 12:24:37 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.eps~54769290ec25c3f8
    1.5 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.txt~de31f3046646f95
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.pdf~aab3e414da9754ab
    1.3 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.gif~3856b7c47a822250
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.gif~31a9c03ceac484df
    1.5 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.eps~ababe64096bc701e
    1.5 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-fiji.gif~3a082d54c888db61
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.pdf~152b980e58ddfe95
    1.3 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.gif~d5dbe214eadc22f9
    1.5 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.gif~95d6213246c5d512
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.eps~476ee9951ed567a6
    1.5 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-eritrea.gif~d27f5468ecf168a
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-equatorial-guinea.gif~e3d315d4eaf28a41
    1.4 05/04/13 12:24:36 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-el-salvador.gif~87bfdc4a1b16ca67
    1.4 05/04/13 12:24:35 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-egypt.gif~1abbeb9541c45762
    1.4 05/04/13 12:24:35 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-ecuador.gif~da0b80de595301f5
    1.4 05/04/13 12:24:35 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-dominican-republic.gif~a05fa19ee59566f
    1.4 05/04/13 12:24:35 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-dominica.gif~91c8fddd58385d66
    1.4 05/04/13 12:24:34 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a
    1.4 05/04/13 12:24:34 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.txt~9467854a287a11d3
    1.4 05/04/13 12:24:34 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.pdf~772f1f647f6675b4
    1.3 05/04/13 12:24:34 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.gif~794733445761c7d9
    1.5 05/04/13 12:24:34 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.gif~56d1cc99f435d046
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.eps~67c559554779943c
    1.5 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark-original-incorrect.gif~5d85710fb55de2c2
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.txt~f35c3417f35bb917
    1.5 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.pdf~6185b7b29cf21c20
    1.3 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.gif~3cdfb4447c89fb7a
    1.5 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.gif~12957b374194bb89
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7
    1.6 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cyprus.gif~fecfaf77f8153607
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.txt~55d9c2aaec850113
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.gif~d48555c97fa6e7b0
    1.4 05/04/13 12:24:33 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.eps~621866ebf8db9526
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cote-d-ivoire.gif~9adcb3eb5599012e
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.txt~fc47cc5846cde0c1
    1.3 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.pdf~ad1185a29a583cff
    1.3 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.gif~f10605fdf2aea8a
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.gif~e4f609b46043b612
    1.3 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.eps~3999b27ab2e876c5
    1.3 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-congo.gif~7737656d9939a718
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204
    1.4 05/04/13 12:24:32 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.txt~f2c436ae8409252
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.pdf~b3524c4313aeb4f4
    1.3 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.gif~f2aa06d0635b653f
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.gif~a6df3c22685c50fd
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.eps~e27e42602de3ded7
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.txt~c143167238e9db34
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.pdf~3ccf0b62c48e0eb8
    1.3 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.gif~9e2cb4d54d82d046
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.gif~5f7700a1414fba60
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.eps~6b4470792773d5f9
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-chad.gif~e6657243d593d2be
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-central-african-republic.gif~c0bf932afe983895
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cape-verde.gif~152189bcc5c245a2
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.txt~c877dedbb6500f48
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.pdf~7aa6ddfa4274a503
    1.3 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c
    1.4 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.gif~2b36f4f336fcbdd7
    1.5 05/04/13 12:24:31 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.eps~870d51433272b91e
    1.6 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-cambodia.gif~390be7f98e98ef0f
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-burundi.gif~77e447f736b5b8fe
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-burma.gif~ab554009f470a00b
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-burkina-faso.gif~f17ab1a7b4726205
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.txt~8d3854c355db697e
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.pdf~fdcd6f1b96d36f5b
    1.3 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.gif~859289ca21a394b
    1.5 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.gif~829eaaa78ea00bc4
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.eps~58ae212ad442ecb7
    1.5 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-brunei.gif~9d74fa8a8655bb8e
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.txt~82fed449c34f3150
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.gif~43080d754a1f66c3
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.gif~1cc3967b6293833b
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.eps~d11dc8c39b1b52ed
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bosnia-and-herzegovina.gif~4bfbcc12c26a97ed
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7
    1.4 05/04/13 12:24:30 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-benin.gif~e55efbc654304fc2
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.txt~1cc4ae60f07ea525
    1.3 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.pdf~d66d1f4d161dbfa7
    1.3 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.gif~a94aacc01a1443af
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.gif~47e115c2f692a300
    1.5 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.eps~10f1218e783cadb5
    1.6 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-belarus.gif~e8b45aa5f1ca2b6d
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-barbados.gif~2c0e969f87b19e31
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bangladesh.gif~a26e3ed0f95fe8b
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bahrein.gif~fb4f1be9efcd652a
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-bahamas.gif~55a7fa36a5710a19
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-azerbaijan.gif~98176e76cf690118
    1.4 05/04/13 12:24:29 lenz@mysql.com +0 -0
    Auto merged

  configure.in
    1.360 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.txt~eabda07c94bc3783
    1.5 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.pdf~88115eca98801ee1
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.gif~eda4c0df508b2796
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.gif~4b528a1b567629c1
    1.5 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65
    1.6 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.txt~88eae38ad0a29a9b
    1.5 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.pdf~e7a39134644c310c
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.gif~56f9808ee943fac
    1.5 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.eps~c3f5a8e36f6a6772
    1.6 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.txt~9b07e8896669b144
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.gif~d812f4ac738f93b5
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.gif~38bb7a3d6a564ecc
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.eps~643f5c261ebab928
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.txt~75de5b063d1a1560
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.pdf~83fcf14b727ae306
    1.3 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.gif~4fc28afb8cb08692
    1.5 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.gif~1818b07e221227
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.eps~79d033cbfba0697a
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-antigua-and-barbuda.gif~471679e823427c3d
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-antartica.gif~1a34b3a7409d5bf2
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-angola.gif~b366af754ac52de3
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-andorra.gif~400c9517f5a7268f
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-algeria.gif~70038752bd872102
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-albania.gif~920c18c5f3bd94f5
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59
    1.4 05/04/13 12:24:28 lenz@mysql.com +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.texi~af95f3e233925495
    1.881 05/04/13 12:24:26 lenz@mysql.com +0 -0
    Merge rename: Docs/manual.texi -> BitKeeper/deleted/.del-manual.texi~af95f3e233925495

  BitKeeper/deleted/.del-texi2html~74632fe370dcec73
    1.11 05/04/13 12:24:25 lenz@mysql.com +0 -0
    Merge rename: Docs/Support/texi2html -> BitKeeper/deleted/.del-texi2html~74632fe370dcec73

  BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d
    1.10 05/04/13 12:24:25 lenz@mysql.com +0 -0
    Merge rename: Docs/mysqld_error.txt -> BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d

  BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41
    1.4 05/04/13 12:24:24 lenz@mysql.com +0 -0
    Merge rename: Docs/manual_toc.html -> BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41

ChangeSet
  1.1346.1.737 05/04/13 11:51:38 lenz@mysql.com +443 -0
  - manual.texi will be replaced with a manual written in DocBook/XML. This ChangeSet removes all
    references to the .texi file and the build targets that depend on manual.texi as the input file.
  - added COPYING as a regular file instead of creating it during the build. This ensures that it's part
    of the sources when pulling from BK (it used to be extracted from the manual)
  - Removed a lot of cruft and unused/obsolete stuff from the Docs directory (e.g. Flags, Images)
  - added a dummy mysql.info placeholder file (the info file is still used as the source to extract
    various text files during the build). It will be replaced with a "real" file during the Bootstrap
    process to create the official source distribution - the placeholder just satisfies build dependencies.

  support-files/mysql.spec.sh
    1.61.1.27 05/04/13 11:51:31 lenz@mysql.com +5 -7
    - removed the MySQL manual files (html/ps/texi) from the MySQL-server RPM

  scripts/make_win_src_distribution.sh
    1.7.2.4 05/04/13 11:51:31 lenz@mysql.com +2 -5
    - Disabled adding the manual to the windows source distribution (manual.texi is gone, and so are the
      HTML and TXT targets)
    - removed Docs/Flags (obsolete) from the Windows source distribution

  configure.in
    1.191.1.133 05/04/13 11:51:30 lenz@mysql.com +1 -1
    - removed references to the Docs/Images subdirectory that has been removed

  Docs/Makefile.am
    1.38.1.13 05/04/13 11:51:30 lenz@mysql.com +5 -179
    - removed all targets that depended on manual.texi as the input file
      (in preparation for the switch to DocBook XML)
    - removed some other unused cruft no longer required or maintained elsewhere by now
    - don't create COPYING out of the mysql.info file (it's now part of the source tree)

ChangeSet
  1.2176.1.1 05/04/13 11:47:28 mleich@mysql.com +1 -0
  Minor improvements + new option needed for WL#2520 Upgrade/Downgrade Test Plan

  mysql-test/mysql-test-run.pl
    1.17 05/04/13 11:46:49 mleich@mysql.com +31 -6
    1. Improved description of option user=USER
    2. Bug fix 
       The storage place of the old, to be removed <test case>.reject file is the 'r' subdirectory of the test suite.
    3. New option "start-dirty" which is 
       - per functionality a "start-and-exit" without an initiation
       - a convenient method to (re)start an existing database. 
         So a following
              ./mysql-test-run.pl --extern ......
         will meet a server running with the default ports and sockets according to our test environment.
       This option is useful for analyzing bugs and  WL#2520 Upgrade/Downgrade Test Plan .

  COPYING
    1.1 05/04/13 11:16:03 lenz@mysql.com +352 -0

  COPYING
    1.0 05/04/13 11:16:03 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/COPYING

ChangeSet
  1.2175.1.2 05/04/13 09:54:40 joreland@mysql.com +2 -0
  BUG#9749 - ndb lock upgrade - more fixes...
  1) Make getNoParall into function instead of a procedure
  2) Check for multiple transactions in "upgrade's" parallell queue
  3) Set lock mode according to lock_owner's lockMode
  
  NOTE: Does still not handle lock upgrade in case of aborts correctly

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.29 05/04/13 09:54:37 joreland@mysql.com +33 -36
    1) Make getNoParall into function instead of a procedure
    2) Check for multiple transactions in "upgrade's" parallell queue
    3) Set lock mode according to lock_owner's lockMode

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.13 05/04/13 09:54:37 joreland@mysql.com +1 -3
    Make getNoParall into function instead of a procedure

ChangeSet
  1.2177 05/04/12 18:04:32 jimw@mysql.com +2 -0
  Remove references to result.es files

  scripts/make_binary_distribution.sh
    1.75 05/04/12 18:04:30 jimw@mysql.com +1 -1
    Remove references to result.es

  mysql-test/Makefile.am
    1.43 05/04/12 18:04:30 jimw@mysql.com +2 -2
    Remove reference to result.es

  BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d
    1.7.1.1 05/04/12 18:40:20 lenz@mysql.com +0 -0
    Delete: Docs/mysqld_error.txt

  BitKeeper/deleted/.del-mysql-19.gif~9be698e1b3cdb933
    1.4 05/04/12 18:38:57 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-19.gif

  BitKeeper/deleted/.del-mysql-18.gif~92e9fa428b0ef9f4
    1.4 05/04/12 18:38:57 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-18.gif

  BitKeeper/deleted/.del-mysql-17.gif~279e92aeb167d638
    1.4 05/04/12 18:38:57 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-17.gif

  BitKeeper/deleted/.del-html-fs.gif~340ae5ab17ccc178
    1.4 05/04/12 18:38:57 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/html-fs.gif

  BitKeeper/deleted/.del-mysql-16.gif~1c82d75dbe265ad0
    1.4 05/04/12 18:38:56 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-16.gif

  BitKeeper/deleted/.del-mysql-15.gif~e94b536482b5cfa8
    1.4 05/04/12 18:38:56 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-15.gif

  BitKeeper/deleted/.del-mysql-14.gif~c96ad71d33d46af
    1.4 05/04/12 18:38:56 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-14.gif

  BitKeeper/deleted/.del-mysql-13.gif~d1dabc02fd840107
    1.4 05/04/12 18:38:56 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-13.gif

  BitKeeper/deleted/.del-mysql-12.gif~c663ff60fd3190d9
    1.4 05/04/12 18:38:56 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-12.gif

  BitKeeper/deleted/.del-mysql-11.gif~302b17f6433e4621
    1.4 05/04/12 18:38:55 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-11.gif

  BitKeeper/deleted/.del-mysql-10.gif~6de012714bb03c8c
    1.4 05/04/12 18:38:55 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-10.gif

  BitKeeper/deleted/.del-mysql-09.gif~fcb0f421a0402990
    1.4 05/04/12 18:38:55 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-09.gif

  BitKeeper/deleted/.del-mysql-08.gif~174e5e218068b41a
    1.4 05/04/12 18:38:55 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-08.gif

  BitKeeper/deleted/.del-mysql-07.gif~a18aa4f41b706752
    1.4 05/04/12 18:38:55 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-07.gif

  BitKeeper/deleted/.del-mysql-06.gif~66f9a53d8df1e165
    1.4 05/04/12 18:38:54 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-06.gif

  BitKeeper/deleted/.del-mysql-05.gif~a45f115f526a6438
    1.4 05/04/12 18:38:54 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-05.gif

  BitKeeper/deleted/.del-mysql-04.gif~3695675c16a75042
    1.4 05/04/12 18:38:54 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-04.gif

  BitKeeper/deleted/.del-mysql-03.gif~cedb88c446a395b5
    1.4 05/04/12 18:38:54 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-03.gif

  BitKeeper/deleted/.del-mysql-02.gif~17509c4ab36c7561
    1.4 05/04/12 18:38:54 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-02.gif

  BitKeeper/deleted/.del-powered-by-MySQL-transparent.gif~ea566879e8ea5f02
    1.4 05/04/12 18:38:53 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/powered-by-MySQL-transparent.gif

  BitKeeper/deleted/.del-mysql-01.gif~c8ed2860e4f9e92e
    1.4 05/04/12 18:38:53 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-01.gif

  BitKeeper/deleted/.del-mysql_anim-06.gif~f59ee5dbe9c945b8
    1.4 05/04/12 18:38:52 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-06.gif

  BitKeeper/deleted/.del-mysql_anim-05.gif~f188d38557a8e8a
    1.4 05/04/12 18:38:52 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-05.gif

  BitKeeper/deleted/.del-mysql_anim-04.gif~afc01932a9c3f83b
    1.4 05/04/12 18:38:51 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-04.gif

  BitKeeper/deleted/.del-mysql_anim-03.gif~ce64bb66129a474c
    1.4 05/04/12 18:38:51 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-03.gif

  BitKeeper/deleted/.del-mysql_anim-02.gif~df8efb861614f32
    1.4 05/04/12 18:38:50 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-02.gif

  BitKeeper/deleted/.del-mysql_anim-01.gif~9fce1e01aba4866a
    1.4 05/04/12 18:38:50 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql_anim-01.gif

  BitKeeper/deleted/.del-mysql5.gif~af79b5f7dd8ddd44
    1.4 05/04/12 18:38:50 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql5.gif

  BitKeeper/deleted/.del-mysql-compatible.jpg~6e867955c3605510
    1.4 05/04/12 18:38:50 lenz@mysql.com +0 -0
    Delete: Docs/Images/Attic/mysql-compatible.jpg

  BitKeeper/deleted/.del-myodbc-br.texi~cea931066c24b744
    1.3 05/04/12 18:38:34 lenz@mysql.com +0 -0
    Delete: Docs/Translations/myodbc-br.texi

  BitKeeper/deleted/.del-MySQL-for-dummies~f6a19f3b67efa4c2
    1.3 05/04/12 18:38:29 lenz@mysql.com +0 -0
    Delete: Docs/To-be-included-in-the-manual/MySQL-for-dummies

  BitKeeper/deleted/.del-mysql-logo.gif~940b52eefc6abf85
    1.4 05/04/12 18:36:35 lenz@mysql.com +0 -0
    Delete: Docs/Images/mysql-logo.gif

  BitKeeper/deleted/.del-flag-background.pnm~77e3c9cb7b9213c5
    1.3 05/04/12 18:36:35 lenz@mysql.com +0 -0
    Delete: Docs/Images/flag-background.pnm

  BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc
    1.3 05/04/12 18:36:35 lenz@mysql.com +0 -0
    Delete: Docs/Images/Makefile.am

  BitKeeper/deleted/.del-empty.png~5017ba255c3d3833
    1.3 05/04/12 18:36:34 lenz@mysql.com +0 -0
    Delete: Docs/Images/empty.png

  BitKeeper/deleted/.del-uruguay.gif~17d468a8b3affba4
    1.2.1.1 05/04/12 18:30:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/uruguay.gif

  BitKeeper/deleted/.del-taiwan.gif~295c56859e5f5e
    1.2.1.1 05/04/12 18:30:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/taiwan.gif

  BitKeeper/deleted/.del-el-salvador.gif~87bfdc4a1b16ca67
    1.2.1.1 05/04/12 18:30:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/el-salvador.gif

  BitKeeper/deleted/.del-central-african-republic.gif~c0bf932afe983895
    1.2.1.1 05/04/12 18:30:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/central-african-republic.gif

  BitKeeper/deleted/.del-switzerland.gif~37312e2f4537a7e3
    1.2.1.1 05/04/12 18:30:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/switzerland.gif

  BitKeeper/deleted/.del-ghana.gif~9d71585fa3b223c0
    1.2.1.1 05/04/12 18:30:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/ghana.gif

  BitKeeper/deleted/.del-gabon.gif~5e5c7c8dc0902328
    1.2.1.1 05/04/12 18:30:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/gabon.gif

  BitKeeper/deleted/.del-brazil.gif~1cc3967b6293833b
    1.2.1.1 05/04/12 18:30:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/brazil.gif

  BitKeeper/deleted/.del-thailand.gif~263675b09165b835
    1.2.1.1 05/04/12 18:30:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/thailand.gif

  BitKeeper/deleted/.del-monaco.gif~d2a99ae34527d133
    1.2.1.1 05/04/12 18:30:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/monaco.gif

  BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5
    1.2.1.1 05/04/12 18:30:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/great-britain.gif

  BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a
    1.2.1.1 05/04/12 18:30:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/djibouti.gif

  BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec
    1.2.1.1 05/04/12 18:30:42 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/zambia.gif

  BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5
    1.2.1.1 05/04/12 18:30:42 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/vincent-and-grenadines.gif

  BitKeeper/deleted/.del-panama.gif~99595dd051a094f
    1.2.1.1 05/04/12 18:30:42 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/panama.gif

  BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204
    1.2.1.1 05/04/12 18:30:41 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/comoros.gif

  BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36
    1.2.1.1 05/04/12 18:30:40 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/tunisia.gif

  BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d
    1.2.1.1 05/04/12 18:30:39 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/venezuela.gif

  BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31
    1.2.1.1 05/04/12 18:30:38 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/zaire.gif

  BitKeeper/deleted/.del-mali.gif~845a23a66aaaef5
    1.2.1.1 05/04/12 18:30:38 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mali.gif

  BitKeeper/deleted/.del-grenada.gif~db9d209340558224
    1.2.1.1 05/04/12 18:30:38 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/grenada.gif

  BitKeeper/deleted/.del-finland.gif~3856b7c47a822250
    1.2.1.1 05/04/12 18:30:38 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/finland.gif

  BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff
    1.2.1.1 05/04/12 18:30:37 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/senegal.gif

  BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea
    1.2.1.1 05/04/12 18:30:37 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/malta.gif

  BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e
    1.2.1.1 05/04/12 18:30:37 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/guinea-bissau.gif

  BitKeeper/deleted/.del-cote-d-ivoire.gif~9adcb3eb5599012e
    1.2.1.1 05/04/12 18:30:37 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cote-d-ivoire.gif

  BitKeeper/deleted/.del-paraguay.gif~e7b5dd73d7727a1d
    1.2.1.1 05/04/12 18:30:36 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/paraguay.gif

  BitKeeper/deleted/.del-norway.gif~752c4b4d29375874
    1.2.1.1 05/04/12 18:30:36 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/norway.gif

  BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691
    1.2.1.1 05/04/12 18:30:36 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mozambique.gif

  BitKeeper/deleted/.del-morocco.gif~45858306e12988e9
    1.2.1.1 05/04/12 18:30:36 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/morocco.gif

  BitKeeper/deleted/.del-guinea.gif~89df2e995fbc90d1
    1.2.1.1 05/04/12 18:30:36 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/guinea.gif

  BitKeeper/deleted/.del-eritrea.gif~d27f5468ecf168a
    1.2.1.1 05/04/12 18:30:35 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/eritrea.gif

  BitKeeper/deleted/.del-china.gif~f2aa06d0635b653f
    1.2.1.1 05/04/12 18:30:35 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/china.gif

  BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244
    1.2.1.1 05/04/12 18:30:35 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cameroon.gif

  BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484
    1.2.1.1 05/04/12 18:30:35 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/botswana.gif

  BitKeeper/deleted/.del-lebanon.gif~2d27883e8fe0c647
    1.2.1.1 05/04/12 18:30:34 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/lebanon.gif

  BitKeeper/deleted/.del-iraq.gif~a1646e6d65515d76
    1.2.1.1 05/04/12 18:30:34 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/iraq.gif

  BitKeeper/deleted/.del-iran.gif~2cb4e9c4657b5b33
    1.2.1.1 05/04/12 18:30:34 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/iran.gif

  BitKeeper/deleted/.del-fiji.gif~3a082d54c888db61
    1.2.1.1 05/04/12 18:30:34 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/fiji.gif

  BitKeeper/deleted/.del-estonia.gif~95d6213246c5d512
    1.2.1.1 05/04/12 18:30:33 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/estonia.gif

  BitKeeper/deleted/.del-chile.gif~9e2cb4d54d82d046
    1.2.1.1 05/04/12 18:30:33 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/chile.gif

  BitKeeper/deleted/.del-israel.gif~60af491676720a39
    1.2.1.1 05/04/12 18:30:32 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/israel.gif

  BitKeeper/deleted/.del-belarus.gif~e8b45aa5f1ca2b6d
    1.2.1.1 05/04/12 18:30:32 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/belarus.gif

  BitKeeper/deleted/.del-south-korea.gif~1311c2eada860e9d
    1.2.1.1 05/04/12 18:30:31 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/south-korea.gif

  BitKeeper/deleted/.del-czech-republic.gif~12957b374194bb89
    1.2.1.1 05/04/12 18:30:31 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/czech-republic.gif

  BitKeeper/deleted/.del-chad.gif~e6657243d593d2be
    1.2.1.1 05/04/12 18:30:30 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/chad.gif

  BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c
    1.2.1.1 05/04/12 18:30:30 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/australia.gif

  BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a
    1.2.1.1 05/04/12 18:30:29 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/belize.gif

  BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167
    1.2.1.1 05/04/12 18:30:28 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/romania.gif

  BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048
    1.2.1.1 05/04/12 18:30:28 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/moldova.gif

  BitKeeper/deleted/.del-egypt.gif~1abbeb9541c45762
    1.2.1.1 05/04/12 18:30:28 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/egypt.gif

  BitKeeper/deleted/.del-suriname.gif~54de84a4ef71a82
    1.2.1.1 05/04/12 18:30:27 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/suriname.gif

  BitKeeper/deleted/.del-micronesia.gif~c46715026d7efe8e
    1.2.1.1 05/04/12 18:30:27 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/micronesia.gif

  BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7
    1.2.1.1 05/04/12 18:30:27 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/lesotho.gif

  BitKeeper/deleted/.del-bahrein.gif~fb4f1be9efcd652a
    1.2.1.1 05/04/12 18:30:27 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bahrein.gif

  BitKeeper/deleted/.del-south-africa.gif~2aaea35c3bdd90b6
    1.2.1.1 05/04/12 18:30:26 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/south-africa.gif

  BitKeeper/deleted/.del-netherlands.gif~a1bee178928be339
    1.2.1.1 05/04/12 18:30:26 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/netherlands.gif

  BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5
    1.2.1.1 05/04/12 18:30:26 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/nauru.gif

  BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36
    1.2.1.1 05/04/12 18:30:26 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/guyana.gif

  BitKeeper/deleted/.del-uzbekistan.gif~ca70f72fc4bca763
    1.2.1.1 05/04/12 18:30:25 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/uzbekistan.gif

  BitKeeper/deleted/.del-tajikistan.gif~4e42abdd2be16ed8
    1.2.1.1 05/04/12 18:30:25 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/tajikistan.gif

  BitKeeper/deleted/.del-liberia.gif~1dd584598bfe881b
    1.2.1.1 05/04/12 18:30:25 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/liberia.gif

  BitKeeper/deleted/.del-jamaica.gif~48999b84247ad492
    1.2.1.1 05/04/12 18:30:25 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/jamaica.gif

  BitKeeper/deleted/.del-dominican-republic.gif~a05fa19ee59566f
    1.2.1.1 05/04/12 18:30:25 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/dominican-republic.gif

  BitKeeper/deleted/.del-yugoslavia.gif~532010647f1c98f7
    1.2.1.1 05/04/12 18:30:24 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/yugoslavia.gif

  BitKeeper/deleted/.del-spain.gif~7217c59c507d153c
    1.2.1.1 05/04/12 18:30:24 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/spain.gif

  BitKeeper/deleted/.del-poland.gif~9d9673f2ea9d5129
    1.2.1.1 05/04/12 18:30:24 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/poland.gif

  BitKeeper/deleted/.del-liechtenstein.gif~8d068c686c4c6e8
    1.2.1.1 05/04/12 18:30:24 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/liechtenstein.gif

  BitKeeper/deleted/.del-pakistan.gif~5ef5cc6b162666b8
    1.2.1.1 05/04/12 18:30:23 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/pakistan.gif

  BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1
    1.2.1.1 05/04/12 18:30:23 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/croatia.gif

  BitKeeper/deleted/.del-libya.gif~98259878434e0df2
    1.2.1.1 05/04/12 18:30:22 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/libya.gif

  BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644
    1.2.1.1 05/04/12 18:30:22 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bermuda.gif

  BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08
    1.2.1.1 05/04/12 18:30:21 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cuba.gif

  BitKeeper/deleted/.del-oman.gif~3a84654e80950b30
    1.2.1.1 05/04/12 18:30:20 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/oman.gif

  BitKeeper/deleted/.del-georgia.gif~3a9c93fa982b8c06
    1.2.1.1 05/04/12 18:30:20 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/georgia.gif

  BitKeeper/deleted/.del-ecuador.gif~da0b80de595301f5
    1.2.1.1 05/04/12 18:30:20 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/ecuador.gif

  BitKeeper/deleted/.del-congo.gif~7737656d9939a718
    1.2.1.1 05/04/12 18:30:20 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/congo.gif

  BitKeeper/deleted/.del-kiribati.gif~7f5bc99e8b7a6db
    1.2.1.1 05/04/12 18:30:19 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/kiribati.gif

  BitKeeper/deleted/.del-germany.gif~97dfeb0eb82cac6d
    1.2.1.1 05/04/12 18:30:19 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/germany.gif

  BitKeeper/deleted/.del-burundi.gif~77e447f736b5b8fe
    1.2.1.1 05/04/12 18:30:19 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/burundi.gif

  BitKeeper/deleted/.del-argentina.gif~1818b07e221227
    1.2.1.1 05/04/12 18:30:19 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/argentina.gif

  BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7
    1.2.1.1 05/04/12 18:30:18 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/solomon-islands.gif

  BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615
    1.2.1.1 05/04/12 18:30:18 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sao-tome-and-principe.gif

  BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d
    1.2.1.1 05/04/12 18:30:18 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/haiti.gif

  BitKeeper/deleted/.del-greenland.gif~44310f9e9180e0b
    1.2.1.1 05/04/12 18:30:18 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/greenland.gif

  BitKeeper/deleted/.del-new-zealand.gif~1fbc54ab63225de7
    1.2.1.1 05/04/12 18:30:17 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/new-zealand.gif

  BitKeeper/deleted/.del-maldives.gif~941bf5a2381b904c
    1.2.1.1 05/04/12 18:30:17 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/maldives.gif

  BitKeeper/deleted/.del-equatorial-guinea.gif~e3d315d4eaf28a41
    1.2.1.1 05/04/12 18:30:17 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/equatorial-guinea.gif

  BitKeeper/deleted/.del-armenia.gif~d812f4ac738f93b5
    1.2.1.1 05/04/12 18:30:17 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/armenia.gif

  BitKeeper/deleted/.del-united-states-of-america.gif~3817309e55e1f332
    1.2.1.1 05/04/12 18:30:16 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/united-states-of-america.gif

  BitKeeper/deleted/.del-uganda.gif~45b3e3b539f02aee
    1.2.1.1 05/04/12 18:30:16 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/uganda.gif

  BitKeeper/deleted/.del-swaziland.gif~88decc065b4034b5
    1.2.1.1 05/04/12 18:30:16 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/swaziland.gif

  BitKeeper/deleted/.del-azerbaijan.gif~98176e76cf690118
    1.2.1.1 05/04/12 18:30:16 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/azerbaijan.gif

  BitKeeper/deleted/.del-cambodia.gif~390be7f98e98ef0f
    1.2.1.1 05/04/12 18:30:15 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cambodia.gif

  BitKeeper/deleted/.del-bahamas.gif~55a7fa36a5710a19
    1.2.1.1 05/04/12 18:30:15 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bahamas.gif

  BitKeeper/deleted/.del-slovakia.gif~c3d054b17f9c8997
    1.2.1.1 05/04/12 18:30:14 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/slovakia.gif

  BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701
    1.2.1.1 05/04/12 18:30:13 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/syria.gif

  BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da
    1.2.1.1 05/04/12 18:30:13 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/saint-kitts-and-nevis.gif

  BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a
    1.2.1.1 05/04/12 18:30:13 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/latvia.gif

  BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137
    1.2.1.1 05/04/12 18:30:13 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/colombia.gif

  BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5
    1.2.1.1 05/04/12 18:30:12 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sweden2.gif

  BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f
    1.2.1.1 05/04/12 18:30:12 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/russia.gif

  BitKeeper/deleted/.del-hungary.gif~74e09a15557c20e4
    1.2.1.1 05/04/12 18:30:12 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/hungary.gif

  BitKeeper/deleted/.del-cape-verde.gif~152189bcc5c245a2
    1.2.1.1 05/04/12 18:30:12 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cape-verde.gif

  BitKeeper/deleted/.del-namibia.gif~f3b3b2c233c9031f
    1.2.1.1 05/04/12 18:30:11 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/namibia.gif

  BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0
    1.2.1.1 05/04/12 18:30:11 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/kuwait.gif

  BitKeeper/deleted/.del-japan.gif~4c6a663ab9a32af2
    1.2.1.1 05/04/12 18:30:11 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/japan.gif

  BitKeeper/deleted/.del-barbados.gif~2c0e969f87b19e31
    1.2.1.1 05/04/12 18:30:11 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/barbados.gif

  BitKeeper/deleted/.del-north-korea.gif~770fd51d9360ae18
    1.2.1.1 05/04/12 18:30:10 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/north-korea.gif

  BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e
    1.2.1.1 05/04/12 18:30:10 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/iceland.gif

  BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c
    1.2.1.1 05/04/12 18:30:10 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/canada.gif

  BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7
    1.2.1.1 05/04/12 18:30:10 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bolivia.gif

  BitKeeper/deleted/.del-austria.gif~eda4c0df508b2796
    1.2.1.1 05/04/12 18:30:10 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/austria.gif

  BitKeeper/deleted/.del-portugal.gif~b6ec9ce2c88220f6
    1.2.1.1 05/04/12 18:30:09 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/portugal.gif

  BitKeeper/deleted/.del-philippines.gif~c80b5315738462af
    1.2.1.1 05/04/12 18:30:09 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/philippines.gif

  BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e
    1.2.1.1 05/04/12 18:30:09 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mexico.gif

  BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529
    1.2.1.1 05/04/12 18:30:09 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/honduras.gif

  BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8
    1.2.1.1 05/04/12 18:30:08 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/saudi-arabia.gif

  BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3
    1.2.1.1 05/04/12 18:30:08 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/kenya.gif

  BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb
    1.2.1.1 05/04/12 18:30:07 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/samoa.gif

  BitKeeper/deleted/.del-peru.gif~323d2810b25bcab3
    1.2.1.1 05/04/12 18:30:07 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/peru.gif

  BitKeeper/deleted/.del-greece.gif~c8fbf8252cc56212
    1.2.1.1 05/04/12 18:30:06 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/greece.gif

  BitKeeper/deleted/.del-burma.gif~ab554009f470a00b
    1.2.1.1 05/04/12 18:30:06 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/burma.gif

  BitKeeper/deleted/.del-tonga.gif~87fef29eef8c57fd
    1.2.1.1 05/04/12 18:30:05 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/tonga.gif

  BitKeeper/deleted/.del-burkina-faso.gif~f17ab1a7b4726205
    1.2.1.1 05/04/12 18:30:05 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/burkina-faso.gif

  BitKeeper/deleted/.del-antartica.gif~1a34b3a7409d5bf2
    1.2.1.1 05/04/12 18:30:04 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/antartica.gif

  BitKeeper/deleted/.del-usa.gif~7c94951adc03bf9a
    1.2.1.1 05/04/12 18:30:03 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/usa.gif

  BitKeeper/deleted/.del-lithuania.gif~88cec9a9fe920632
    1.2.1.1 05/04/12 18:30:03 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/lithuania.gif

  BitKeeper/deleted/.del-albania.gif~920c18c5f3bd94f5
    1.2.1.1 05/04/12 18:30:03 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/albania.gif

  BitKeeper/deleted/.del-slovenia.gif~405038776bc7f2a1
    1.2.1.1 05/04/12 18:30:02 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/slovenia.gif

  BitKeeper/deleted/.del-luxembourg.gif~7e4660faa840e7
    1.2.1.1 05/04/12 18:30:02 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/luxembourg.gif

  BitKeeper/deleted/.del-italy.gif~c1d1d4c51841d831
    1.2.1.1 05/04/12 18:30:02 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/italy.gif

  BitKeeper/deleted/.del-bosnia-and-herzegovina.gif~4bfbcc12c26a97ed
    1.2.1.1 05/04/12 18:30:02 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bosnia-and-herzegovina.gif

  BitKeeper/deleted/.del-singapore.gif~e18bf77765b76d2f
    1.2.1.1 05/04/12 18:30:01 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/singapore.gif

  BitKeeper/deleted/.del-laos.gif~f686f38cbff73598
    1.2.1.1 05/04/12 18:30:01 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/laos.gif

  BitKeeper/deleted/.del-angola.gif~b366af754ac52de3
    1.2.1.1 05/04/12 18:30:01 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/angola.gif

  BitKeeper/deleted/.del-sri-lanka.gif~ef59edd8115e2afa
    1.2.1.1 05/04/12 18:30:00 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sri-lanka.gif

  BitKeeper/deleted/.del-sierra-leone.gif~5c446a27d7e98d59
    1.2.1.1 05/04/12 18:30:00 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sierra-leone.gif

  BitKeeper/deleted/.del-kyrgyzstan.gif~6cbe9f09a93ea9e0
    1.2.1.1 05/04/12 18:30:00 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/kyrgyzstan.gif

  BitKeeper/deleted/.del-indonesia.gif~a096242096a7c7a
    1.2.1.1 05/04/12 18:30:00 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/indonesia.gif

  BitKeeper/deleted/.del-bulgaria.gif~829eaaa78ea00bc4
    1.2.1.1 05/04/12 18:30:00 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bulgaria.gif

  BitKeeper/deleted/.del-turkmenistan.gif~7679a96df08d950a
    1.2.1.1 05/04/12 18:29:59 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/turkmenistan.gif

  BitKeeper/deleted/.del-seychelles.gif~f0b489c8e84fef71
    1.2.1.1 05/04/12 18:29:59 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/seychelles.gif

  BitKeeper/deleted/.del-niger.gif~c26adaadb8150cee
    1.2.1.1 05/04/12 18:29:59 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/niger.gif

  BitKeeper/deleted/.del-ireland.gif~5e4633333643bee2
    1.2.1.1 05/04/12 18:29:59 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/ireland.gif

  BitKeeper/deleted/.del-mongolia.gif~41633d1ced991c78
    1.2.1.1 05/04/12 18:29:58 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mongolia.gif

  BitKeeper/deleted/.del-antigua-and-barbuda.gif~471679e823427c3d
    1.2.1.1 05/04/12 18:29:58 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/antigua-and-barbuda.gif

  BitKeeper/deleted/.del-ukraine.gif~847cd0f7333e72ac
    1.2.1.1 05/04/12 18:29:57 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/ukraine.gif

  BitKeeper/deleted/.del-denmark-original-incorrect.gif~5d85710fb55de2c2
    1.2.1.1 05/04/12 18:29:57 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/denmark-original-incorrect.gif

  BitKeeper/deleted/.del-tuvalu.gif~3f85331ac0890213
    1.2.1.1 05/04/12 18:29:56 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/tuvalu.gif

  BitKeeper/deleted/.del-guatemala.gif~4d43cb1c1dbeddc7
    1.2.1.1 05/04/12 18:29:55 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/guatemala.gif

  BitKeeper/deleted/.del-bangladesh.gif~a26e3ed0f95fe8b
    1.2.1.1 05/04/12 18:29:55 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bangladesh.gif

  BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7
    1.2.1.1 05/04/12 18:29:54 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/bhutan.gif

  BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a
    1.2.1.1 05/04/12 18:29:53 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/turkey.gif

  BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748
    1.2.1.1 05/04/12 18:29:52 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/united-arab-emirates.gif

  BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49
    1.2.1.1 05/04/12 18:29:52 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sweden.gif

  BitKeeper/deleted/.del-cyprus.gif~fecfaf77f8153607
    1.2.1.1 05/04/12 18:29:52 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/cyprus.gif

  BitKeeper/deleted/.del-somalia.gif~7c09bce9340f39ca
    1.2.1.1 05/04/12 18:29:51 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/somalia.gif

  BitKeeper/deleted/.del-saint-lucia.gif~a43f5b43c241e500
    1.2.1.1 05/04/12 18:29:51 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/saint-lucia.gif

  BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166
    1.2.1.1 05/04/12 18:29:51 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/marshall.gif

  BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59
    1.2.1.1 05/04/12 18:29:51 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/afghanistan.gif

  BitKeeper/deleted/.del-nicaragua.gif~37b8f7764ac4aea
    1.2.1.1 05/04/12 18:29:50 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/nicaragua.gif

  BitKeeper/deleted/.del-macedonia.gif~bce0e1455919f41b
    1.2.1.1 05/04/12 18:29:50 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/macedonia.gif

  BitKeeper/deleted/.del-brunei.gif~9d74fa8a8655bb8e
    1.2.1.1 05/04/12 18:29:50 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/brunei.gif

  BitKeeper/deleted/.del-algeria.gif~70038752bd872102
    1.2.1.1 05/04/12 18:29:50 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/algeria.gif

  BitKeeper/deleted/.del-qatar.gif~9fb4afe3352b17
    1.2.1.1 05/04/12 18:29:49 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/qatar.gif

  BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db
    1.2.1.1 05/04/12 18:29:49 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/nepal.gif

  BitKeeper/deleted/.del-madagascar.gif~e95bd0c2aabb8ab8
    1.2.1.1 05/04/12 18:29:49 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/madagascar.gif

  BitKeeper/deleted/.del-benin.gif~e55efbc654304fc2
    1.2.1.1 05/04/12 18:29:49 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/benin.gif

  BitKeeper/deleted/.del-togo.gif~485e7cec93f5410a
    1.2.1.1 05/04/12 18:29:48 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/togo.gif

  BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a
    1.2.1.1 05/04/12 18:29:48 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mauritania.gif

  BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca
    1.2.1.1 05/04/12 18:29:48 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/ethiopia.gif

  BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1
    1.2.1.1 05/04/12 18:29:47 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/vanuatu.gif

  BitKeeper/deleted/.del-malaysia.gif~6f7c73227da2ed6
    1.2.1.1 05/04/12 18:29:47 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/malaysia.gif

  BitKeeper/deleted/.del-yemen.gif~f0d4b9daecbbab9
    1.2.1.1 05/04/12 18:29:46 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/yemen.gif

  BitKeeper/deleted/.del-papua-new-guinea.gif~884e9e27b55e51b9
    1.2.1.1 05/04/12 18:29:46 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/papua-new-guinea.gif

  BitKeeper/deleted/.del-gambia.gif~8525f1597465137d
    1.2.1.1 05/04/12 18:29:46 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/gambia.gif

  BitKeeper/deleted/.del-france.gif~64aa78ca3e77be37
    1.2.1.1 05/04/12 18:29:46 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/france.gif

  BitKeeper/deleted/.del-costa-rica.gif~f10605fdf2aea8a
    1.2.1.1 05/04/12 18:29:46 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/costa-rica.gif

  BitKeeper/deleted/.del-jordan.gif~4381349560430e61
    1.2.1.1 05/04/12 18:29:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/jordan.gif

  BitKeeper/deleted/.del-belgium.gif~a94aacc01a1443af
    1.2.1.1 05/04/12 18:29:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/belgium.gif

  BitKeeper/deleted/.del-andorra.gif~400c9517f5a7268f
    1.2.1.1 05/04/12 18:29:45 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/andorra.gif

  BitKeeper/deleted/.del-zimbabwe.gif~478cfbaa6f5b066a
    1.2.1.1 05/04/12 18:29:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/zimbabwe.gif

  BitKeeper/deleted/.del-trinidad-and-tobago.gif~dfa47192f1bc025
    1.2.1.1 05/04/12 18:29:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/trinidad-and-tobago.gif

  BitKeeper/deleted/.del-denmark.gif~56d1cc99f435d046
    1.2.1.1 05/04/12 18:29:44 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/denmark.gif

  BitKeeper/deleted/.del-vietnam.gif~b8a7befce71994b1
    1.2.1.1 05/04/12 18:29:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/vietnam.gif

  BitKeeper/deleted/.del-nigeria.gif~f157c385bd632a48
    1.2.1.1 05/04/12 18:29:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/nigeria.gif

  BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2
    1.2.1.1 05/04/12 18:29:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/malawi.gif

  BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277
    1.2.1.1 05/04/12 18:29:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/kazakhstan.gif

  BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765
    1.2.1.1 05/04/12 18:29:43 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/india.gif

  BitKeeper/deleted/.del-rwanda.gif~ba3a28fb5edc29f5
    1.2.1.1 05/04/12 18:29:42 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/rwanda.gif

  BitKeeper/deleted/.del-dominica.gif~91c8fddd58385d66
    1.2.1.1 05/04/12 18:29:42 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/dominica.gif

  BitKeeper/deleted/.del-tanzania.gif~3fbe0bc01bcc3247
    1.2.1.1 05/04/12 18:29:41 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/tanzania.gif

  BitKeeper/deleted/.del-sudan.gif~6c5d2540c31b8c27
    1.2.1.1 05/04/12 18:29:41 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/sudan.gif

  BitKeeper/deleted/.del-mauritius.gif~498d6d0e323d7ef9
    1.2.1.1 05/04/12 18:29:41 lenz@mysql.com +0 -0
    Delete: Docs/Raw-Flags/mauritius.gif

  BitKeeper/deleted/.del-taiwan.txt~d0a19c41a1ed3861
    1.3.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/taiwan.txt

  BitKeeper/deleted/.del-taiwan.pdf~5ff5a019d8237d3c
    1.1.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/taiwan.pdf

  BitKeeper/deleted/.del-taiwan.gif~b5f1796ed3c458e4
    1.3.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/taiwan.gif

  BitKeeper/deleted/.del-taiwan.eps~cc2ecaf6122443f
    1.4.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/taiwan.eps

  BitKeeper/deleted/.del-switzerland.txt~e09c851d69c407a6
    1.2.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/switzerland.txt

  BitKeeper/deleted/.del-switzerland.pdf~ec02533fefb5071d
    1.1.1.1 05/04/12 18:29:22 lenz@mysql.com +0 -0
    Delete: Docs/Flags/switzerland.pdf

  BitKeeper/deleted/.del-switzerland.gif~dabb711999e3126d
    1.3.1.1 05/04/12 18:29:21 lenz@mysql.com +0 -0
    Delete: Docs/Flags/switzerland.gif

  BitKeeper/deleted/.del-switzerland.eps~7811f8473ff72b6e
    1.3.1.1 05/04/12 18:29:21 lenz@mysql.com +0 -0
    Delete: Docs/Flags/switzerland.eps

  BitKeeper/deleted/.del-brazil.txt~82fed449c34f3150
    1.2.1.1 05/04/12 18:29:21 lenz@mysql.com +0 -0
    Delete: Docs/Flags/brazil.txt

  BitKeeper/deleted/.del-brazil.gif~43080d754a1f66c3
    1.2.1.1 05/04/12 18:29:21 lenz@mysql.com +0 -0
    Delete: Docs/Flags/brazil.gif

  BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2
    1.3.1.1 05/04/12 18:29:20 lenz@mysql.com +0 -0
    Delete: Docs/Flags/great-britain.txt

  BitKeeper/deleted/.del-brazil.eps~d11dc8c39b1b52ed
    1.2.1.1 05/04/12 18:29:20 lenz@mysql.com +0 -0
    Delete: Docs/Flags/brazil.eps

  BitKeeper/deleted/.del-great-britain.pdf~b425328dc4073027
    1.1.1.1 05/04/12 18:29:19 lenz@mysql.com +0 -0
    Delete: Docs/Flags/great-britain.pdf

  BitKeeper/deleted/.del-great-britain.gif~94507aceb6ea0298
    1.3.1.1 05/04/12 18:29:19 lenz@mysql.com +0 -0
    Delete: Docs/Flags/great-britain.gif

  BitKeeper/deleted/.del-great-britain.eps~69bd9bdc60b3b71b
    1.4.1.1 05/04/12 18:29:19 lenz@mysql.com +0 -0
    Delete: Docs/Flags/great-britain.eps

  BitKeeper/deleted/.del-finland.txt~de31f3046646f95
    1.2.1.1 05/04/12 18:29:18 lenz@mysql.com +0 -0
    Delete: Docs/Flags/finland.txt

  BitKeeper/deleted/.del-finland.pdf~aab3e414da9754ab
    1.1.1.1 05/04/12 18:29:18 lenz@mysql.com +0 -0
    Delete: Docs/Flags/finland.pdf

  BitKeeper/deleted/.del-finland.gif~31a9c03ceac484df
    1.3.1.1 05/04/12 18:29:18 lenz@mysql.com +0 -0
    Delete: Docs/Flags/finland.gif

  BitKeeper/deleted/.del-finland.eps~ababe64096bc701e
    1.3.1.1 05/04/12 18:29:18 lenz@mysql.com +0 -0
    Delete: Docs/Flags/finland.eps

  BitKeeper/deleted/.del-norway.txt~2844906ae717ea7a
    1.1.1.1 05/04/12 18:29:17 lenz@mysql.com +0 -0
    Delete: Docs/Flags/norway.txt

  BitKeeper/deleted/.del-norway.pdf~980b935627182fb9
    1.1.1.1 05/04/12 18:29:17 lenz@mysql.com +0 -0
    Delete: Docs/Flags/norway.pdf

  BitKeeper/deleted/.del-norway.gif~1d881d2af6c4e413
    1.3.1.1 05/04/12 18:29:17 lenz@mysql.com +0 -0
    Delete: Docs/Flags/norway.gif

  BitKeeper/deleted/.del-norway.eps~b37c98d87edd8de
    1.3.1.1 05/04/12 18:29:17 lenz@mysql.com +0 -0
    Delete: Docs/Flags/norway.eps

  BitKeeper/deleted/.del-china.txt~f2c436ae8409252
    1.2.1.1 05/04/12 18:29:17 lenz@mysql.com +0 -0
    Delete: Docs/Flags/china.txt

  BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74
    1.2.1.1 05/04/12 18:29:16 lenz@mysql.com +0 -0
    Delete: Docs/Flags/estonia.txt

  BitKeeper/deleted/.del-estonia.pdf~152b980e58ddfe95
    1.1.1.1 05/04/12 18:29:16 lenz@mysql.com +0 -0
    Delete: Docs/Flags/estonia.pdf

  BitKeeper/deleted/.del-china.pdf~b3524c4313aeb4f4
    1.1.1.1 05/04/12 18:29:16 lenz@mysql.com +0 -0
    Delete: Docs/Flags/china.pdf

  BitKeeper/deleted/.del-china.gif~a6df3c22685c50fd
    1.3.1.1 05/04/12 18:29:16 lenz@mysql.com +0 -0
    Delete: Docs/Flags/china.gif

  BitKeeper/deleted/.del-china.eps~e27e42602de3ded7
    1.3.1.1 05/04/12 18:29:16 lenz@mysql.com +0 -0
    Delete: Docs/Flags/china.eps

  BitKeeper/deleted/.del-estonia.gif~d5dbe214eadc22f9
    1.3.1.1 05/04/12 18:29:15 lenz@mysql.com +0 -0
    Delete: Docs/Flags/estonia.gif

  BitKeeper/deleted/.del-estonia.eps~476ee9951ed567a6
    1.3.1.1 05/04/12 18:29:15 lenz@mysql.com +0 -0
    Delete: Docs/Flags/estonia.eps

  BitKeeper/deleted/.del-chile.txt~c143167238e9db34
    1.2.1.1 05/04/12 18:29:15 lenz@mysql.com +0 -0
    Delete: Docs/Flags/chile.txt

  BitKeeper/deleted/.del-chile.pdf~3ccf0b62c48e0eb8
    1.1.1.1 05/04/12 18:29:15 lenz@mysql.com +0 -0
    Delete: Docs/Flags/chile.pdf

  BitKeeper/deleted/.del-chile.gif~5f7700a1414fba60
    1.3.1.1 05/04/12 18:29:15 lenz@mysql.com +0 -0
    Delete: Docs/Flags/chile.gif

  BitKeeper/deleted/.del-israel.txt~4430c078ea12b98e
    1.3.1.1 05/04/12 18:29:14 lenz@mysql.com +0 -0
    Delete: Docs/Flags/israel.txt

  BitKeeper/deleted/.del-israel.gif~f503ea92490b42da
    1.2.1.1 05/04/12 18:29:14 lenz@mysql.com +0 -0
    Delete: Docs/Flags/israel.gif

  BitKeeper/deleted/.del-israel.eps~43ecb6f31dcfe2f3
    1.3.1.1 05/04/12 18:29:14 lenz@mysql.com +0 -0
    Delete: Docs/Flags/israel.eps

  BitKeeper/deleted/.del-chile.eps~6b4470792773d5f9
    1.3.1.1 05/04/12 18:29:14 lenz@mysql.com +0 -0
    Delete: Docs/Flags/chile.eps

  BitKeeper/deleted/.del-czech-republic.txt~f35c3417f35bb917
    1.3.1.1 05/04/12 18:29:13 lenz@mysql.com +0 -0
    Delete: Docs/Flags/czech-republic.txt

  BitKeeper/deleted/.del-czech-republic.pdf~6185b7b29cf21c20
    1.1.1.1 05/04/12 18:29:13 lenz@mysql.com +0 -0
    Delete: Docs/Flags/czech-republic.pdf

  BitKeeper/deleted/.del-czech-republic.gif~3cdfb4447c89fb7a
    1.3.1.1 05/04/12 18:29:13 lenz@mysql.com +0 -0
    Delete: Docs/Flags/czech-republic.gif

  BitKeeper/deleted/.del-south-korea.txt~93c9adabe5ac3339
    1.3.1.1 05/04/12 18:29:12 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-korea.txt

  BitKeeper/deleted/.del-south-korea.pdf~24496add674f1d6
    1.1.1.1 05/04/12 18:29:12 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-korea.pdf

  BitKeeper/deleted/.del-south-korea.gif~f0fe17a9495664c9
    1.3.1.1 05/04/12 18:29:12 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-korea.gif

  BitKeeper/deleted/.del-south-korea.eps~9c944ac52a247665
    1.4.1.1 05/04/12 18:29:12 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-korea.eps

  BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7
    1.4.1.1 05/04/12 18:29:12 lenz@mysql.com +0 -0
    Delete: Docs/Flags/czech-republic.eps

  BitKeeper/deleted/.del-romania.txt~c716fe6568110738
    1.2.1.1 05/04/12 18:29:11 lenz@mysql.com +0 -0
    Delete: Docs/Flags/romania.txt

  BitKeeper/deleted/.del-australia.txt~88eae38ad0a29a9b
    1.3.1.1 05/04/12 18:29:11 lenz@mysql.com +0 -0
    Delete: Docs/Flags/australia.txt

  BitKeeper/deleted/.del-australia.pdf~e7a39134644c310c
    1.1.1.1 05/04/12 18:29:11 lenz@mysql.com +0 -0
    Delete: Docs/Flags/australia.pdf

  BitKeeper/deleted/.del-australia.gif~56f9808ee943fac
    1.3.1.1 05/04/12 18:29:11 lenz@mysql.com +0 -0
    Delete: Docs/Flags/australia.gif

  BitKeeper/deleted/.del-australia.eps~c3f5a8e36f6a6772
    1.4.1.1 05/04/12 18:29:11 lenz@mysql.com +0 -0
    Delete: Docs/Flags/australia.eps

  BitKeeper/deleted/.del-south-africa.txt~4674c3b1a39d79c9
    1.2.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-africa.txt

  BitKeeper/deleted/.del-south-africa.pdf~ef7f63c8153ef8d5
    1.1.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-africa.pdf

  BitKeeper/deleted/.del-south-africa.gif~8ef88d69ba7c794
    1.3.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-africa.gif

  BitKeeper/deleted/.del-romania.pdf~322c2e57ce6ceed
    1.1.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/romania.pdf

  BitKeeper/deleted/.del-romania.gif~8c5ad831482c31e3
    1.3.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/romania.gif

  BitKeeper/deleted/.del-romania.eps~d197860bb0edbd64
    1.3.1.1 05/04/12 18:29:10 lenz@mysql.com +0 -0
    Delete: Docs/Flags/romania.eps

  BitKeeper/deleted/.del-south-africa.eps~4f647997f3f26988
    1.3.1.1 05/04/12 18:29:09 lenz@mysql.com +0 -0
    Delete: Docs/Flags/south-africa.eps

  BitKeeper/deleted/.del-netherlands.txt~214c2cbb9ac7db0a
    1.2.1.1 05/04/12 18:29:09 lenz@mysql.com +0 -0
    Delete: Docs/Flags/netherlands.txt

  BitKeeper/deleted/.del-netherlands.pdf~4833162b30912e1
    1.1.1.1 05/04/12 18:29:09 lenz@mysql.com +0 -0
    Delete: Docs/Flags/netherlands.pdf

  BitKeeper/deleted/.del-netherlands.gif~d788dc4e9afd2f8a
    1.3.1.1 05/04/12 18:29:09 lenz@mysql.com +0 -0
    Delete: Docs/Flags/netherlands.gif

  BitKeeper/deleted/.del-netherlands.eps~2012cff48c4d9368
    1.3.1.1 05/04/12 18:29:09 lenz@mysql.com +0 -0
    Delete: Docs/Flags/netherlands.eps

  BitKeeper/deleted/.del-yugoslavia.txt~cd146d758c75e6ab
    1.1.1.1 05/04/12 18:29:08 lenz@mysql.com +0 -0
    Delete: Docs/Flags/yugoslavia.txt

  BitKeeper/deleted/.del-yugoslavia.pdf~978eeff094d4a57e
    1.1.1.1 05/04/12 18:29:08 lenz@mysql.com +0 -0
    Delete: Docs/Flags/yugoslavia.pdf

  BitKeeper/deleted/.del-yugoslavia.gif~d58992747df26331
    1.2.1.1 05/04/12 18:29:07 lenz@mysql.com +0 -0
    Delete: Docs/Flags/yugoslavia.gif

  BitKeeper/deleted/.del-yugoslavia.eps~b9bab90d98a3de45
    1.2.1.1 05/04/12 18:29:07 lenz@mysql.com +0 -0
    Delete: Docs/Flags/yugoslavia.eps

  BitKeeper/deleted/.del-spain.txt~4b3da48f41bfa958
    1.2.1.1 05/04/12 18:29:06 lenz@mysql.com +0 -0
    Delete: Docs/Flags/spain.txt

  BitKeeper/deleted/.del-spain.pdf~a25de45d2ded91ed
    1.1.1.1 05/04/12 18:29:06 lenz@mysql.com +0 -0
    Delete: Docs/Flags/spain.pdf

  BitKeeper/deleted/.del-spain.gif~345db1228c3a5477
    1.3.1.1 05/04/12 18:29:06 lenz@mysql.com +0 -0
    Delete: Docs/Flags/spain.gif

  BitKeeper/deleted/.del-spain.eps~a798dd1293a30b7c
    1.3.1.1 05/04/12 18:29:06 lenz@mysql.com +0 -0
    Delete: Docs/Flags/spain.eps

  BitKeeper/deleted/.del-poland.txt~e484ca6c9feb9080
    1.2.1.1 05/04/12 18:29:05 lenz@mysql.com +0 -0
    Delete: Docs/Flags/poland.txt

  BitKeeper/deleted/.del-poland.pdf~e71f4eaa53f33cd
    1.1.1.1 05/04/12 18:29:05 lenz@mysql.com +0 -0
    Delete: Docs/Flags/poland.pdf

  BitKeeper/deleted/.del-poland.gif~bcbc9ed9b75fcd3c
    1.3.1.1 05/04/12 18:29:05 lenz@mysql.com +0 -0
    Delete: Docs/Flags/poland.gif

  BitKeeper/deleted/.del-poland.eps~8be27a5447e3a146
    1.3.1.1 05/04/12 18:29:05 lenz@mysql.com +0 -0
    Delete: Docs/Flags/poland.eps

  BitKeeper/deleted/.del-croatia.txt~55d9c2aaec850113
    1.2.1.1 05/04/12 18:29:05 lenz@mysql.com +0 -0
    Delete: Docs/Flags/croatia.txt

  BitKeeper/deleted/.del-germany.txt~d73791b0314d5343
    1.3.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/germany.txt

  BitKeeper/deleted/.del-germany.pdf~aca678db2fc30f2f
    1.1.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/germany.pdf

  BitKeeper/deleted/.del-germany.gif~7c2750867600a157
    1.3.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/germany.gif

  BitKeeper/deleted/.del-germany.eps~8ec02ead1a75bbfb
    1.4.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/germany.eps

  BitKeeper/deleted/.del-croatia.gif~d48555c97fa6e7b0
    1.2.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/croatia.gif

  BitKeeper/deleted/.del-croatia.eps~621866ebf8db9526
    1.2.1.1 05/04/12 18:29:04 lenz@mysql.com +0 -0
    Delete: Docs/Flags/croatia.eps

  BitKeeper/deleted/.del-new-zealand.txt~f52fdd9690b63ac0
    1.1.1.1 05/04/12 18:29:03 lenz@mysql.com +0 -0
    Delete: Docs/Flags/new-zealand.txt

  BitKeeper/deleted/.del-argentina.txt~75de5b063d1a1560
    1.1.1.1 05/04/12 18:29:03 lenz@mysql.com +0 -0
    Delete: Docs/Flags/argentina.txt

  BitKeeper/deleted/.del-argentina.pdf~83fcf14b727ae306
    1.1.1.1 05/04/12 18:29:03 lenz@mysql.com +0 -0
    Delete: Docs/Flags/argentina.pdf

  BitKeeper/deleted/.del-argentina.gif~4fc28afb8cb08692
    1.3.1.1 05/04/12 18:29:03 lenz@mysql.com +0 -0
    Delete: Docs/Flags/argentina.gif

  BitKeeper/deleted/.del-argentina.eps~79d033cbfba0697a
    1.2.1.1 05/04/12 18:29:03 lenz@mysql.com +0 -0
    Delete: Docs/Flags/argentina.eps

  BitKeeper/deleted/.del-new-zealand.pdf~ceb107c0ae812a14
    1.1.1.1 05/04/12 18:29:02 lenz@mysql.com +0 -0
    Delete: Docs/Flags/new-zealand.pdf

  BitKeeper/deleted/.del-new-zealand.gif~77ea426c11bb3ab
    1.1.1.1 05/04/12 18:29:02 lenz@mysql.com +0 -0
    Delete: Docs/Flags/new-zealand.gif

  BitKeeper/deleted/.del-new-zealand.eps~861b5316178fcb08
    1.1.1.1 05/04/12 18:29:02 lenz@mysql.com +0 -0
    Delete: Docs/Flags/new-zealand.eps

  BitKeeper/deleted/.del-armenia.txt~9b07e8896669b144
    1.1.1.1 05/04/12 18:29:02 lenz@mysql.com +0 -0
    Delete: Docs/Flags/armenia.txt

  BitKeeper/deleted/.del-armenia.gif~38bb7a3d6a564ecc
    1.1.1.1 05/04/12 18:29:02 lenz@mysql.com +0 -0
    Delete: Docs/Flags/armenia.gif

  BitKeeper/deleted/.del-latvia.txt~193a3991e0eddaf9
    1.1.1.1 05/04/12 18:29:01 lenz@mysql.com +0 -0
    Delete: Docs/Flags/latvia.txt

  BitKeeper/deleted/.del-armenia.eps~643f5c261ebab928
    1.1.1.1 05/04/12 18:29:01 lenz@mysql.com +0 -0
    Delete: Docs/Flags/armenia.eps

  BitKeeper/deleted/.del-latvia.pdf~25516993d39fa760
    1.1.1.1 05/04/12 18:29:00 lenz@mysql.com +0 -0
    Delete: Docs/Flags/latvia.pdf

  BitKeeper/deleted/.del-latvia.gif~abbe57eb4438c6e8
    1.2.1.1 05/04/12 18:29:00 lenz@mysql.com +0 -0
    Delete: Docs/Flags/latvia.gif

  BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc
    1.3.1.1 05/04/12 18:28:59 lenz@mysql.com +0 -0
    Delete: Docs/Flags/russia.txt

  BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07
    1.2.1.1 05/04/12 18:28:59 lenz@mysql.com +0 -0
    Delete: Docs/Flags/latvia.eps

  BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013
    1.1.1.1 05/04/12 18:28:58 lenz@mysql.com +0 -0
    Delete: Docs/Flags/russia.pdf

  BitKeeper/deleted/.del-russia.gif~300890a87b30d01e
    1.3.1.1 05/04/12 18:28:58 lenz@mysql.com +0 -0
    Delete: Docs/Flags/russia.gif

  BitKeeper/deleted/.del-russia.eps~653c84cd2a80b954
    1.4.1.1 05/04/12 18:28:58 lenz@mysql.com +0 -0
    Delete: Docs/Flags/russia.eps

  BitKeeper/deleted/.del-japan.txt~114edadc3ac11a71
    1.3.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/japan.txt

  BitKeeper/deleted/.del-japan.pdf~40532606f6053145
    1.1.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/japan.pdf

  BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38
    1.3.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/hungary.txt

  BitKeeper/deleted/.del-hungary.pdf~918baeb6bf07fa97
    1.1.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/hungary.pdf

  BitKeeper/deleted/.del-hungary.gif~373325ba9bcbdc72
    1.3.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/hungary.gif

  BitKeeper/deleted/.del-hungary.eps~a7d682f15e7be0ea
    1.4.1.1 05/04/12 18:28:57 lenz@mysql.com +0 -0
    Delete: Docs/Flags/hungary.eps

  BitKeeper/deleted/.del-japan.gif~1c6f45454aa378b3
    1.3.1.1 05/04/12 18:28:56 lenz@mysql.com +0 -0
    Delete: Docs/Flags/japan.gif

  BitKeeper/deleted/.del-japan.eps~fe89aea87d627e85
    1.4.1.1 05/04/12 18:28:56 lenz@mysql.com +0 -0
    Delete: Docs/Flags/japan.eps

  BitKeeper/deleted/.del-iceland.txt~dd6b3c03d0e35936
    1.2.1.1 05/04/12 18:28:56 lenz@mysql.com +0 -0
    Delete: Docs/Flags/iceland.txt

  BitKeeper/deleted/.del-iceland.pdf~da00f08b9f794a92
    1.1.1.1 05/04/12 18:28:56 lenz@mysql.com +0 -0
    Delete: Docs/Flags/iceland.pdf

  BitKeeper/deleted/.del-iceland.gif~902645739e3c6b75
    1.3.1.1 05/04/12 18:28:56 lenz@mysql.com +0 -0
    Delete: Docs/Flags/iceland.gif

  BitKeeper/deleted/.del-iceland.eps~9cc02c4e666e803
    1.3.1.1 05/04/12 18:28:55 lenz@mysql.com +0 -0
    Delete: Docs/Flags/iceland.eps

  BitKeeper/deleted/.del-canada.txt~c877dedbb6500f48
    1.3.1.1 05/04/12 18:28:55 lenz@mysql.com +0 -0
    Delete: Docs/Flags/canada.txt

  BitKeeper/deleted/.del-canada.pdf~7aa6ddfa4274a503
    1.1.1.1 05/04/12 18:28:55 lenz@mysql.com +0 -0
    Delete: Docs/Flags/canada.pdf

  BitKeeper/deleted/.del-canada.gif~2b36f4f336fcbdd7
    1.3.1.1 05/04/12 18:28:55 lenz@mysql.com +0 -0
    Delete: Docs/Flags/canada.gif

  BitKeeper/deleted/.del-canada.eps~870d51433272b91e
    1.4.1.1 05/04/12 18:28:55 lenz@mysql.com +0 -0
    Delete: Docs/Flags/canada.eps

  BitKeeper/deleted/.del-mexico.txt~a776cf3478c85e68
    1.1.1.1 05/04/12 18:28:54 lenz@mysql.com +0 -0
    Delete: Docs/Flags/mexico.txt

  BitKeeper/deleted/.del-austria.txt~eabda07c94bc3783
    1.3.1.1 05/04/12 18:28:54 lenz@mysql.com +0 -0
    Delete: Docs/Flags/austria.txt

  BitKeeper/deleted/.del-austria.pdf~88115eca98801ee1
    1.1.1.1 05/04/12 18:28:54 lenz@mysql.com +0 -0
    Delete: Docs/Flags/austria.pdf

  BitKeeper/deleted/.del-austria.gif~4b528a1b567629c1
    1.3.1.1 05/04/12 18:28:54 lenz@mysql.com +0 -0
    Delete: Docs/Flags/austria.gif

  BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65
    1.4.1.1 05/04/12 18:28:54 lenz@mysql.com +0 -0
    Delete: Docs/Flags/austria.eps

  BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325
    1.1.1.1 05/04/12 18:28:53 lenz@mysql.com +0 -0
    Delete: Docs/Flags/mexico.pdf

  BitKeeper/deleted/.del-mexico.gif~a749e257ffeb6588
    1.3.1.1 05/04/12 18:28:53 lenz@mysql.com +0 -0
    Delete: Docs/Flags/mexico.gif

  BitKeeper/deleted/.del-portugal.txt~b3286118e0bfcc3
    1.2.1.1 05/04/12 18:28:52 lenz@mysql.com +0 -0
    Delete: Docs/Flags/portugal.txt

  BitKeeper/deleted/.del-portugal.pdf~24587f586bc7534b
    1.1.1.1 05/04/12 18:28:52 lenz@mysql.com +0 -0
    Delete: Docs/Flags/portugal.pdf

  BitKeeper/deleted/.del-portugal.gif~c7cc13bb1c6dfe9d
    1.3.1.1 05/04/12 18:28:52 lenz@mysql.com +0 -0
    Delete: Docs/Flags/portugal.gif

  BitKeeper/deleted/.del-mexico.eps~9186bd67f1a25a3f
    1.4.1.1 05/04/12 18:28:52 lenz@mysql.com +0 -0
    Delete: Docs/Flags/mexico.eps

  BitKeeper/deleted/.del-portugal.eps~98b9150ce6a649b8
    1.3.1.1 05/04/12 18:28:51 lenz@mysql.com +0 -0
    Delete: Docs/Flags/portugal.eps

  BitKeeper/deleted/.del-philippines.txt~f42e0270d8e22325
    1.1.1.1 05/04/12 18:28:51 lenz@mysql.com +0 -0
    Delete: Docs/Flags/philippines.txt

  BitKeeper/deleted/.del-philippines.pdf~b7977a895a0f6a76
    1.1.1.1 05/04/12 18:28:51 lenz@mysql.com +0 -0
    Delete: Docs/Flags/philippines.pdf

  BitKeeper/deleted/.del-philippines.gif~6cf82c24f6baef53
    1.3.1.1 05/04/12 18:28:51 lenz@mysql.com +0 -0
    Delete: Docs/Flags/philippines.gif

  BitKeeper/deleted/.del-philippines.eps~64beb8e0853db8b2
    1.4.1.1 05/04/12 18:28:51 lenz@mysql.com +0 -0
    Delete: Docs/Flags/philippines.eps

  BitKeeper/deleted/.del-usa.txt~2792ba8db79f0a39
    1.3.1.1 05/04/12 18:28:50 lenz@mysql.com +0 -0
    Delete: Docs/Flags/usa.txt

  BitKeeper/deleted/.del-greece.txt~5c5b5ddbb62811c9
    1.2.1.1 05/04/12 18:28:50 lenz@mysql.com +0 -0
    Delete: Docs/Flags/greece.txt

  BitKeeper/deleted/.del-greece.pdf~e61ed027c4d629
    1.1.1.1 05/04/12 18:28:50 lenz@mysql.com +0 -0
    Delete: Docs/Flags/greece.pdf

  BitKeeper/deleted/.del-greece.gif~d2a46be5950e4784
    1.3.1.1 05/04/12 18:28:50 lenz@mysql.com +0 -0
    Delete: Docs/Flags/greece.gif

  BitKeeper/deleted/.del-greece.eps~30dd253c6047f42f
    1.3.1.1 05/04/12 18:28:50 lenz@mysql.com +0 -0
    Delete: Docs/Flags/greece.eps

  BitKeeper/deleted/.del-usa.pdf~ed44efa3b0c6f6ed
    1.1.1.1 05/04/12 18:28:49 lenz@mysql.com +0 -0
    Delete: Docs/Flags/usa.pdf

  BitKeeper/deleted/.del-usa.gif~278102a819343b97
    1.3.1.1 05/04/12 18:28:49 lenz@mysql.com +0 -0
    Delete: Docs/Flags/usa.gif

  BitKeeper/deleted/.del-usa.eps~64e6c5fe46d1929d
    1.4.1.1 05/04/12 18:28:49 lenz@mysql.com +0 -0
    Delete: Docs/Flags/usa.eps

  BitKeeper/deleted/.del-slovenia.txt~21996e7d83808d0f
    1.1.1.1 05/04/12 18:28:49 lenz@mysql.com +0 -0
    Delete: Docs/Flags/slovenia.txt

  BitKeeper/deleted/.del-slovenia.pdf~349905c733fcc8a
    1.1.1.1 05/04/12 18:28:49 lenz@mysql.com +0 -0
    Delete: Docs/Flags/slovenia.pdf

  BitKeeper/deleted/.del-slovenia.gif~353783f82c89c7c8
    1.2.1.1 05/04/12 18:28:48 lenz@mysql.com +0 -0
    Delete: Docs/Flags/slovenia.gif

  BitKeeper/deleted/.del-slovenia.eps~f73ea56aafc02828
    1.2.1.1 05/04/12 18:28:48 lenz@mysql.com +0 -0
    Delete: Docs/Flags/slovenia.eps

  BitKeeper/deleted/.del-italy.txt~428bb945a2576671
    1.3.1.1 05/04/12 18:28:48 lenz@mysql.com +0 -0
    Delete: Docs/Flags/italy.txt

  BitKeeper/deleted/.del-italy.pdf~ae8671649b09cb96
    1.1.1.1 05/04/12 18:28:48 lenz@mysql.com +0 -0
    Delete: Docs/Flags/italy.pdf

  BitKeeper/deleted/.del-italy.gif~43074800bb72a037
    1.3.1.1 05/04/12 18:28:48 lenz@mysql.com +0 -0
    Delete: Docs/Flags/italy.gif

  BitKeeper/deleted/.del-singapore.txt~21978a833ace2d2
    1.2.1.1 05/04/12 18:28:47 lenz@mysql.com +0 -0
    Delete: Docs/Flags/singapore.txt

  BitKeeper/deleted/.del-singapore.pdf~77019ac12b0d44b0
    1.1.1.1 05/04/12 18:28:47 lenz@mysql.com +0 -0
    Delete: Docs/Flags/singapore.pdf

  BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897
    1.4.1.1 05/04/12 18:28:47 lenz@mysql.com +0 -0
    Delete: Docs/Flags/italy.eps

  BitKeeper/deleted/.del-singapore.gif~78f227e1f0129a
    1.3.1.1 05/04/12 18:28:46 lenz@mysql.com +0 -0
    Delete: Docs/Flags/singapore.gif

  BitKeeper/deleted/.del-singapore.eps~1efd8578def570d8
    1.3.1.1 05/04/12 18:28:46 lenz@mysql.com +0 -0
    Delete: Docs/Flags/singapore.eps

  BitKeeper/deleted/.del-bulgaria.txt~8d3854c355db697e
    1.2.1.1 05/04/12 18:28:46 lenz@mysql.com +0 -0
    Delete: Docs/Flags/bulgaria.txt

  BitKeeper/deleted/.del-bulgaria.pdf~fdcd6f1b96d36f5b
    1.1.1.1 05/04/12 18:28:46 lenz@mysql.com +0 -0
    Delete: Docs/Flags/bulgaria.pdf

  BitKeeper/deleted/.del-bulgaria.gif~859289ca21a394b
    1.3.1.1 05/04/12 18:28:46 lenz@mysql.com +0 -0
    Delete: Docs/Flags/bulgaria.gif

  BitKeeper/deleted/.del-indonesia.txt~cae5c380959a5460
    1.1.1.1 05/04/12 18:28:45 lenz@mysql.com +0 -0
    Delete: Docs/Flags/indonesia.txt

  BitKeeper/deleted/.del-indonesia.pdf~f14b2f53c85a43d
    1.1.1.1 05/04/12 18:28:45 lenz@mysql.com +0 -0
    Delete: Docs/Flags/indonesia.pdf

  BitKeeper/deleted/.del-indonesia.gif~2137016b86bc5d07
    1.2.1.1 05/04/12 18:28:45 lenz@mysql.com +0 -0
    Delete: Docs/Flags/indonesia.gif

  BitKeeper/deleted/.del-indonesia.eps~ca7ee0a66154d34d
    1.2.1.1 05/04/12 18:28:45 lenz@mysql.com +0 -0
    Delete: Docs/Flags/indonesia.eps

  BitKeeper/deleted/.del-bulgaria.eps~58ae212ad442ecb7
    1.3.1.1 05/04/12 18:28:45 lenz@mysql.com +0 -0
    Delete: Docs/Flags/bulgaria.eps

  BitKeeper/deleted/.del-ukraine.txt~e4c1066096a8b1b3
    1.2.1.1 05/04/12 18:28:44 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ukraine.txt

  BitKeeper/deleted/.del-ireland.txt~c8a9f56f150f1008
    1.2.1.1 05/04/12 18:28:44 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ireland.txt

  BitKeeper/deleted/.del-ireland.pdf~e459dd3a1de0f8c7
    1.1.1.1 05/04/12 18:28:44 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ireland.pdf

  BitKeeper/deleted/.del-ireland.gif~3a5ffafd74c67fe
    1.3.1.1 05/04/12 18:28:44 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ireland.gif

  BitKeeper/deleted/.del-ireland.eps~9c52bfd977d47d1a
    1.3.1.1 05/04/12 18:28:44 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ireland.eps

  BitKeeper/deleted/.del-ukraine.pdf~d3b480f6acf3b56a
    1.1.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ukraine.pdf

  BitKeeper/deleted/.del-ukraine.gif~d167f4bf9179141d
    1.3.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ukraine.gif

  BitKeeper/deleted/.del-ukraine.eps~f450a951bf5c4dc9
    1.3.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/ukraine.eps

  BitKeeper/deleted/.del-turkey.txt~bc65755bf8a2a21
    1.1.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/turkey.txt

  BitKeeper/deleted/.del-turkey.pdf~287742544b50b431
    1.1.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/turkey.pdf

  BitKeeper/deleted/.del-turkey.gif~cb55d42965e9f824
    1.4.1.1 05/04/12 18:28:43 lenz@mysql.com +0 -0
    Delete: Docs/Flags/turkey.gif

  BitKeeper/deleted/.del-turkey.eps~6e9ebd6992e53d70
    1.4.1.1 05/04/12 18:28:42 lenz@mysql.com +0 -0
    Delete: Docs/Flags/turkey.eps

  BitKeeper/deleted/.del-sweden.txt~b6d9f06fa227065d
    1.3.1.1 05/04/12 18:28:42 lenz@mysql.com +0 -0
    Delete: Docs/Flags/sweden.txt

  BitKeeper/deleted/.del-sweden.pdf~4afd5afe76bd9172
    1.1.1.1 05/04/12 18:28:42 lenz@mysql.com +0 -0
    Delete: Docs/Flags/sweden.pdf

  BitKeeper/deleted/.del-sweden.gif~8653c24f7bac88dc
    1.3.1.1 05/04/12 18:28:42 lenz@mysql.com +0 -0
    Delete: Docs/Flags/sweden.gif

  BitKeeper/deleted/.del-sweden.eps~4c24b952feb3ab
    1.4.1.1 05/04/12 18:28:42 lenz@mysql.com +0 -0
    Delete: Docs/Flags/sweden.eps

  BitKeeper/deleted/.del-france.txt~fe93e7e98b8daec0
    1.2.1.1 05/04/12 18:28:41 lenz@mysql.com +0 -0
    Delete: Docs/Flags/france.txt

  BitKeeper/deleted/.del-france.pdf~2f143b49353abb46
    1.1.1.1 05/04/12 18:28:40 lenz@mysql.com +0 -0
    Delete: Docs/Flags/france.pdf

  BitKeeper/deleted/.del-france.gif~31e0b62070c6d14f
    1.3.1.1 05/04/12 18:28:39 lenz@mysql.com +0 -0
    Delete: Docs/Flags/france.gif

  BitKeeper/deleted/.del-france.eps~54769290ec25c3f8
    1.3.1.1 05/04/12 18:28:39 lenz@mysql.com +0 -0
    Delete: Docs/Flags/france.eps

  BitKeeper/deleted/.del-costa-rica.txt~fc47cc5846cde0c1
    1.1.1.1 05/04/12 18:28:39 lenz@mysql.com +0 -0
    Delete: Docs/Flags/costa-rica.txt

  BitKeeper/deleted/.del-costa-rica.pdf~ad1185a29a583cff
    1.1.1.1 05/04/12 18:28:39 lenz@mysql.com +0 -0
    Delete: Docs/Flags/costa-rica.pdf

  BitKeeper/deleted/.del-costa-rica.gif~e4f609b46043b612
    1.1.1.1 05/04/12 18:28:39 lenz@mysql.com +0 -0
    Delete: Docs/Flags/costa-rica.gif

  BitKeeper/deleted/.del-costa-rica.eps~3999b27ab2e876c5
    1.1.1.1 05/04/12 18:28:38 lenz@mysql.com +0 -0
    Delete: Docs/Flags/costa-rica.eps

  BitKeeper/deleted/.del-belgium.txt~1cc4ae60f07ea525
    1.1.1.1 05/04/12 18:28:38 lenz@mysql.com +0 -0
    Delete: Docs/Flags/belgium.txt

  BitKeeper/deleted/.del-belgium.pdf~d66d1f4d161dbfa7
    1.1.1.1 05/04/12 18:28:38 lenz@mysql.com +0 -0
    Delete: Docs/Flags/belgium.pdf

  BitKeeper/deleted/.del-belgium.gif~47e115c2f692a300
    1.3.1.1 05/04/12 18:28:38 lenz@mysql.com +0 -0
    Delete: Docs/Flags/belgium.gif

  BitKeeper/deleted/.del-belgium.eps~10f1218e783cadb5
    1.4.1.1 05/04/12 18:28:38 lenz@mysql.com +0 -0
    Delete: Docs/Flags/belgium.eps

  BitKeeper/deleted/.del-denmark.txt~9467854a287a11d3
    1.2.1.1 05/04/12 18:28:37 lenz@mysql.com +0 -0
    Delete: Docs/Flags/denmark.txt

  BitKeeper/deleted/.del-denmark.pdf~772f1f647f6675b4
    1.1.1.1 05/04/12 18:28:37 lenz@mysql.com +0 -0
    Delete: Docs/Flags/denmark.pdf

  BitKeeper/deleted/.del-denmark.gif~794733445761c7d9
    1.3.1.1 05/04/12 18:28:37 lenz@mysql.com +0 -0
    Delete: Docs/Flags/denmark.gif

  BitKeeper/deleted/.del-denmark.eps~67c559554779943c
    1.3.1.1 05/04/12 18:28:37 lenz@mysql.com +0 -0
    Delete: Docs/Flags/denmark.eps

  BitKeeper/deleted/.del-generate-mirror-listing.pl~2fa98b042dd757cf
    1.3 05/04/12 18:12:43 lenz@mysql.com +0 -0
    Delete: Docs/Support/generate-mirror-listing.pl

  BitKeeper/deleted/.del-update-reserved-words.pl~e51012acfd971cd6
    1.7 05/04/12 18:11:06 lenz@mysql.com +0 -0
    Delete: Docs/Support/update-reserved-words.pl

  BitKeeper/deleted/.del-texinfo.tex~9c6fd67011bc5409
    1.4 05/04/12 18:10:06 lenz@mysql.com +0 -0
    Delete: Docs/Support/texinfo.tex

  BitKeeper/deleted/.del-texi2html~74632fe370dcec73
    1.6.1.4 05/04/12 18:10:06 lenz@mysql.com +0 -0
    Delete: Docs/Support/texi2html

  BitKeeper/deleted/.del-mirrors.texi~391546915de6c399
    1.28 05/04/12 18:08:48 lenz@mysql.com +0 -0
    Delete: Docs/mirrors.texi

  BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63
    1.1.1.1 05/04/12 18:07:03 lenz@mysql.com +0 -0
    Delete: Docs/section.Testimonials.texi

  BitKeeper/deleted/.del-section.Users.texi~41da5f4c
    1.1.1.1 05/04/12 18:06:59 lenz@mysql.com +0 -0
    Delete: Docs/section.Users.texi

  BitKeeper/deleted/.del-reservedwords.texi~3d8f82fd477ffdd3
    1.3 05/04/12 18:05:24 lenz@mysql.com +0 -0
    Delete: Docs/reservedwords.texi

  BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9
    1.1.1.1 05/04/12 18:05:09 lenz@mysql.com +0 -0
    Delete: Docs/section.Infolinks.texi

  BitKeeper/deleted/.del-manual-license-spanish.texi~b90a305f6c3755da
    1.3 05/04/12 18:04:30 lenz@mysql.com +0 -0
    Delete: Docs/manual-license-spanish.texi

  BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf
    1.6.1.1 05/04/12 18:03:49 lenz@mysql.com +0 -0
    Delete: Docs/manual.ja.texi

  BitKeeper/deleted/.del-manual.de.texi~68483e0cb1187601
    1.15 05/04/12 18:02:46 lenz@mysql.com +0 -0
    Delete: Docs/manual.de.texi

  BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41
    1.1.1.1 05/04/12 17:59:32 lenz@mysql.com +0 -0
    Delete: Docs/manual_toc.html

  BitKeeper/deleted/.del-manual.texi~af95f3e233925495
    1.862.1.379 05/04/12 17:57:45 lenz@mysql.com +0 -0
    Delete: Docs/manual.texi

  Docs/mysql.info
    1.1 05/04/12 17:54:37 lenz@mysql.com +27 -0

  Docs/mysql.info
    1.0 05/04/12 17:54:37 lenz@mysql.com +0 -0
    BitKeeper file /space/my/mysql-4.0-build/Docs/mysql.info

ChangeSet
  1.2175.1.1 05/04/12 17:54:34 joreland@mysql.com +3 -0
  bug#9749 - ndb lock upgrade
    handle more cases...

  ndb/test/ndbapi/testOperations.cpp
    1.10 05/04/12 17:54:32 joreland@mysql.com +60 -12
    bug#9749 - ndb lock upgrade
      

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.28 05/04/12 17:54:32 joreland@mysql.com +142 -1
    bug#9749 - ndb lock upgrade
      

  ndb/src/kernel/blocks/dbacc/Dbacc.hpp
    1.12 05/04/12 17:54:32 joreland@mysql.com +2 -0
    bug#9749 - ndb lock upgrade
      

ChangeSet
  1.2176 05/04/12 16:12:34 marko@hundin.mysql.fi +6 -0
  InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE
  if foreign_key_checks=0. (Bug #9802)

  sql/ha_innodb.cc
    1.189 05/04/12 16:12:27 marko@hundin.mysql.fi +4 -0
    ha_innobase::rename_table(): Clear trx->check_foreign if necessary.

  innobase/row/row0mysql.c
    1.90 05/04/12 16:12:27 marko@hundin.mysql.fi +3 -5
    row_table_add_foreign_constraints(), row_rename_table_for_mysql():
    Pass trx->check_foreigns to dict_load_foreigns()

  innobase/include/dict0load.h
    1.6 05/04/12 16:12:27 marko@hundin.mysql.fi +2 -1
    dict_load_foreigns(): Add flag check_types.
    If the flag is FALSE, differences in character sets will be ignored.

  innobase/include/dict0dict.h
    1.31 05/04/12 16:12:27 marko@hundin.mysql.fi +2 -1
    dict_foreign_add_to_cache(): Add flag check_types.
    If the flag is FALSE, differences in character sets will be ignored.

  innobase/dict/dict0load.c
    1.32 05/04/12 16:12:27 marko@hundin.mysql.fi +7 -8
    dict_load_foreign(), dict_load_foreigns(): Add flag check_types.
    If the flag is FALSE, differences in character sets will be ignored.

  innobase/dict/dict0dict.c
    1.63 05/04/12 16:12:27 marko@hundin.mysql.fi +16 -3
    dict_foreign_add_to_cache(): Add flag check_types.
    If the flag is FALSE, ignore character set mismatch.

ChangeSet
  1.2165.4.2 05/04/12 13:56:24 joreland@mysql.com +1 -0
  bug#9757 - ndb - post review
    use DBUG_RETURN

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.58 05/04/12 13:56:22 joreland@mysql.com +1 -2
    bug#9757 - ndb
      use DBUG_RETURN

ChangeSet
  1.2165.4.1 05/04/12 13:36:43 joreland@mysql.com +4 -0
  bug#9757 - ndb
    Impl. stupid mgm lock against shutting down 2 nodes simultaniously
    Add some more dump

  ndb/src/mgmsrv/MgmtSrvr.hpp
    1.24 05/04/12 13:36:40 joreland@mysql.com +1 -1
    call handleStopReply on nfCompleteRep instead

  ndb/src/mgmsrv/MgmtSrvr.cpp
    1.57 05/04/12 13:36:40 joreland@mysql.com +9 -4
    call handleStopReply on nfCompleteRep instead

  ndb/src/kernel/main.cpp
    1.41 05/04/12 13:36:40 joreland@mysql.com +2 -0
    enable critical and warnings in out file

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
    1.21 05/04/12 13:36:40 joreland@mysql.com +45 -0
    Impl. 2 new dump 
    1) to query nf handling state
    2) that impl. sending of arbitrary signal...
       to be used with extreme care

ChangeSet
  1.2174 05/04/11 22:36:07 serg@serg.mylan +2 -0
  backport kill.test fix from 5.0

  mysql-test/t/kill.test
    1.8 05/04/11 22:36:01 serg@serg.mylan +1 -1
    backport kill.test fix from 5.0

  mysql-test/r/kill.result
    1.5 05/04/11 22:36:01 serg@serg.mylan +1 -1
    backport kill.test fix from 5.0

ChangeSet
  1.2165.3.1 05/04/11 20:04:50 serg@serg.mylan +3 -0
  don't check record's checksum in REPAIR

  myisam/myisamdef.h
    1.78 05/04/11 20:04:43 serg@serg.mylan +1 -1
    new parameter for _mi_rec_check().

  myisam/mi_dynrec.c
    1.37 05/04/11 20:04:43 serg@serg.mylan +4 -7
    new parameter for _mi_rec_check().

  myisam/mi_check.c
    1.145 05/04/11 20:04:42 serg@serg.mylan +5 -2
    don't check record's checksum in REPAIR

ChangeSet
  1.2172 05/04/11 17:37:49 gbichot@quadita2.mysql.com +2 -0
  In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
  In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
  

  configure.in
    1.359 05/04/11 17:31:08 gbichot@quadita2.mysql.com +0 -1
    Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
    because config.status may later need this file (if it does not find it
    it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )

  sql/share/Makefile.am
    1.24 05/04/11 17:30:09 gbichot@quadita2.mysql.com +1 -1
    using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
    all-local is the standard way to add something to all: (thanks Konstantin)

ChangeSet
  1.2165.1.9 05/04/11 16:46:03 gbichot@quadita2.mysql.com +1 -0
  Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
  if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
  is not supposed to do any binlogging (it is done by the caller).

  sql/sql_table.cc
    1.278 05/04/11 16:45:55 gbichot@quadita2.mysql.com +2 -0
    When optimizing a table, if we fall back to mysql_alter_table()
    (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
    is not supposed to do any binlogging (it is done by the caller).

ChangeSet
  1.2165.1.8 05/04/11 10:44:48 dlenev@brandersnatch.localdomain +1 -0
  Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
  function" into 4.1 tree.

  sql/item_create.cc
    1.72 05/04/11 10:44:45 dlenev@mysql.com +1 -1
    Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
    function" into 4.1 tree.

ChangeSet
  1.2165.1.7 05/04/11 09:53:54 dlenev@mysql.com +3 -0
  Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
  into mysql.com:/home/dlenev/src/mysql-4.1-merges

  mysql-test/t/query_cache.test
    1.39.1.1 05/04/11 09:53:50 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.52.1.1 05/04/11 09:53:50 dlenev@mysql.com +0 -0
    Auto merged

  sql/item_create.cc
    1.71 05/04/11 09:53:50 dlenev@mysql.com +0 -0
    Auto merged

  mysql-test/t/query_cache.test
    1.16.4.2 05/04/11 09:53:50 dlenev@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

  mysql-test/r/query_cache.result
    1.15.4.2 05/04/11 09:53:50 dlenev@mysql.com +0 -0
    Turn off EOLN_NATIVE flag

ChangeSet
  1.1346.1.736 05/04/11 00:30:23 dlenev@mysql.com +3 -0
  Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
  function".
  
  We should not cache queries using CURRENT_USER() function as we do it
  for some other functions, e.g. USER() function.

  sql/item_create.cc
    1.15.1.14 05/04/11 00:30:21 dlenev@mysql.com +1 -0
    create_func_current_user():
      We should not cache queries which use CURRENT_USER() function.

  mysql-test/t/query_cache.test
    1.16.4.1 05/04/11 00:30:21 dlenev@mysql.com +1 -0
    Let us test that queries with CURRENT_USER() function are not cached.

  mysql-test/r/query_cache.result
    1.15.4.1 05/04/11 00:30:21 dlenev@mysql.com +2 -0
    Let us test that queries with CURRENT_USER() function are not cached.

ChangeSet
  1.2165.1.6 05/04/10 12:40:33 bar@mysql.com +5 -0
  ctype_collate.result, ctype_collate.test, union.result, union.test:
    fixing tests accordingly
  item.cc:
    Allow mixing non-binary collation and binary collation
    even if coercibility is the same. 
    For easier 4.0 -> 4.1 migrating.

  mysql-test/r/ctype_collate.result
    1.29 05/04/10 12:40:19 bar@mysql.com +13 -0
    fixing tests accordingly

  mysql-test/t/ctype_collate.test
    1.18 05/04/10 12:40:17 bar@mysql.com +12 -0
    fixing tests accordingly

  mysql-test/r/union.result
    1.89 05/04/10 12:40:13 bar@mysql.com +1 -1
    fixing tests accordingly

  mysql-test/t/union.test
    1.83 05/04/10 12:40:05 bar@mysql.com +1 -1
    fixing tests accordingly

  sql/item.cc
    1.198 05/04/10 12:39:17 bar@mysql.com +10 -1
    Allow mixing non-binary collation and binary collation
    even if coercibility is the same. 
    For easier 4.0 -> 4.1 migrating.

ChangeSet
  1.2165.2.2 05/04/09 00:21:51 acurtis@xiphis.org +1 -0
  Fix typos in Bug#6776

  sql/sql_udf.cc
    1.42 05/04/09 00:21:36 acurtis@xiphis.org +2 -2
    Fix typos

ChangeSet
  1.2165.2.1 05/04/08 21:40:50 acurtis@xiphis.org +2 -0
  Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
  into xiphis.org:/var/db/bk/work-acurtis/bug6776.1

  BitKeeper/etc/logging_ok
    1.377 05/04/08 21:40:48 acurtis@xiphis.org +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_udf.cc
    1.41 05/04/08 21:40:39 acurtis@xiphis.org +0 -0
    Auto merged

ChangeSet
  1.2168 05/04/08 06:32:48 reggie@mdk10.(none) +1 -0
  Bug #9665  After registering MySQL service and starting with shared mem, cannot stop
  
  Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server

ChangeSet
  1.2160.7.1 05/04/08 16:04:37 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11

  configure.in
    1.358 05/04/08 16:04:34 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2165.1.2 05/04/08 14:16:57 joreland@mysql.com +1 -0
  Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.27 05/04/08 14:16:55 joreland@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2152.2.4 05/04/08 14:15:37 joreland@mysql.com +1 -0
  bug#9749 - ndb 
    test case for case 9749, ndb lock upgrade via NDBAPI

  ndb/test/ndbapi/testOperations.cpp
    1.9 05/04/08 14:15:34 joreland@mysql.com +93 -0
    bug#9749 - test case for case 9749

ChangeSet
  1.2156.9.1 05/04/08 14:13:02 ingo@mysql.com +4 -0
  Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
  Since 4.1 keys are compared with trailing spaces. 
  Thus, a "x " key can be inserted between a couple of "x" keys.
  The existing code did not take this into account. Though the
  comments in the code claimed it did.

  mysql-test/t/myisam.test
    1.36 05/04/08 14:12:19 ingo@mysql.com +10 -0
    Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
    The test case.

  mysql-test/r/myisam.result
    1.48 05/04/08 14:12:19 ingo@mysql.com +8 -0
    Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
    The test result.

  myisam/mi_write.c
    1.48 05/04/08 14:12:19 ingo@mysql.com +24 -2
    Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
    Fixed a function comment.

  myisam/mi_search.c
    1.50 05/04/08 14:12:19 ingo@mysql.com +43 -8
    Bug#9188 - Corruption Can't open file: 'table.MYI' (errno: 145)
    Fixed some function comments.
    In the case when we insert a different key between two identical keys,
    the difference must be additional spaces. In this case the prefix is 
    the same as that of the new key instead of the (zero) remaining length.

ChangeSet
  1.2152.25.1 05/04/08 13:56:48 joerg@mysql.com +4 -0
  Add missing parts for the "Cybozu" custom build, to avoid future manual patches.

  BUILD/compile-pentium-cybozu
    1.1 05/04/08 13:56:05 joerg@mysql.com +9 -0

  strings/ctype-utf8.c
    1.84 05/04/08 13:56:05 joerg@mysql.com +1 -1
    Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.

  mysys/charset-def.c
    1.10 05/04/08 13:56:05 joerg@mysql.com +2 -2
    Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.

  configure.in
    1.356.1.1 05/04/08 13:56:05 joerg@mysql.com +17 -10
    Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
    However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
    In order to do custom builds without manual patches, this value gets special handling in 'configure'.
    Also, when it is given, the CPP symbol enabling the additional code is set.

  BUILD/compile-pentium-cybozu
    1.0 05/04/08 13:56:05 joerg@mysql.com +0 -0
    BitKeeper file /M41/clone-4.1.11/BUILD/compile-pentium-cybozu

  sql/mysqld.cc
    1.567.1.2 05/04/08 06:32:40 reggie@mdk10.(none) +0 -9
    removed the code that set the shared memory connect event since this also being done in kill_server

ChangeSet
  1.2160.5.5 05/04/08 11:38:40 mskold@mysql.com +2 -0
  Added more tests for auto_increment

  mysql-test/t/ndb_basic.test
    1.24 05/04/08 11:38:20 mskold@mysql.com +2 -0
    Added more tests for auto_increment

  mysql-test/r/ndb_basic.result
    1.24 05/04/08 11:38:20 mskold@mysql.com +30 -0
    Added more tests for auto_increment

ChangeSet
  1.2166 05/04/08 00:16:02 reggie@mdk10.(none) +1 -0
  Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
  
  The shared memory connect event was not being set in kill_server.
  This caused the thread that is handling shared memory connections to never
  exit.

  sql/mysqld.cc
    1.567.1.1 05/04/08 00:14:20 reggie@mdk10.(none) +12 -0
    Added code to set the shared memory connect event upon server termination

ChangeSet
  1.2165 05/04/07 20:21:17 msvensson@neptunus.(none) +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/mysql-4.1

  sql/ha_ndbcluster.cc
    1.138 05/04/07 20:21:16 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2160.5.4 05/04/07 20:08:01 mskold@mysql.com +1 -0
  Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix

  sql/ha_ndbcluster.cc
    1.136.1.2 05/04/07 20:07:44 mskold@mysql.com +4 -1
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix

ChangeSet
  1.2160.6.1 05/04/07 17:44:09 mskold@mysql.com +4 -0
  Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage

  sql/ha_ndbcluster.cc
    1.136.1.1 05/04/07 17:43:51 mskold@mysql.com +6 -1
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage

  ndb/src/ndbapi/Ndb.cpp
    1.40 05/04/07 17:43:51 mskold@mysql.com +22 -14
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage

  mysql-test/t/ndb_basic.test
    1.23 05/04/07 17:43:51 mskold@mysql.com +25 -0
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage

  mysql-test/r/ndb_basic.result
    1.23 05/04/07 17:43:51 mskold@mysql.com +30 -0
    Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage

ChangeSet
  1.2160.5.2 05/04/07 17:47:37 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-bug8877

  sql/sql_select.cc
    1.394 05/04/07 17:47:36 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2152.23.3 05/04/07 17:44:48 sergefp@mysql.com +1 -0
  Post-review fixes: local variable renamed

  sql/sql_select.cc
    1.391.1.3 05/04/07 17:43:59 sergefp@mysql.com +5 -5
    Post-review fixes: local variable renamed

ChangeSet
  1.2160.5.1 05/04/07 12:12:03 mskold@mysql.com +1 -0
  Added missing DBUG_RETURNs

  ndb/src/ndbapi/NdbDictionaryImpl.cpp
    1.50 05/04/07 12:11:40 mskold@mysql.com +2 -2
    Added missing DBUG_RETURNs

ChangeSet
  1.2160.1.10 05/04/07 12:16:41 marko@hundin.mysql.fi +4 -0
  InnoDB: Prevent ALTER TABLE ... ENGINE=...
  if there are foreign key constraints on the table. (Bug #5574)

  sql/sql_table.cc
    1.277 05/04/07 12:16:34 marko@hundin.mysql.fi +4 -0
    Check handler::can_switch_engines() before switching storage engines

  sql/handler.h
    1.136 05/04/07 12:16:34 marko@hundin.mysql.fi +2 -0
    Add method can_switch_engines()

  sql/ha_innodb.h
    1.79 05/04/07 12:16:34 marko@hundin.mysql.fi +1 -0
    Add method can_switch_engines()

  sql/ha_innodb.cc
    1.188 05/04/07 12:16:34 marko@hundin.mysql.fi +26 -0
    Add method can_switch_engines()

ChangeSet
  1.2160.1.9 05/04/06 11:02:20 jimw@mysql.com +2 -0
  Merge mysql.com:/home/jimw/my/mysql-4.0-clean
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  mysys/my_rename.c
    1.7 05/04/06 11:02:19 jimw@mysql.com +0 -1
    Auto merged

  client/mysqlcheck.c
    1.46 05/04/06 11:02:19 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2160.4.2 05/04/06 16:52:41 monty@mysql.com +3 -0
  Small fixes done while reviewing pushed code

  sql/share/english/errmsg.txt
    1.147 05/04/06 16:52:37 monty@mysql.com +1 -1
    Don't extend the possible length of error message too much for common errors are MySQL 4.0 clients has a limit of 200 characters

  mysql-test/t/innodb-replace.test
    1.2 05/04/06 16:52:37 monty@mysql.com +4 -0
    Added proper cleanup for test

  mysql-test/r/innodb-replace.result
    1.2 05/04/06 16:52:37 monty@mysql.com +1 -0
    Added proper cleanup for test

ChangeSet
  1.2160.4.1 05/04/06 15:53:32 monty@mysql.com +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/my/mysql-4.1

  sql/mysqld.cc
    1.568 05/04/06 15:53:30 monty@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2152.24.1 05/04/06 15:52:32 monty@mysql.com +1 -0
  Fixed that create_time is set properly for cached threads

  sql/mysqld.cc
    1.565.2.1 05/04/06 15:52:26 monty@mysql.com +1 -0
    Fixed that create_time is set properly for cached threads

ChangeSet
  1.2160.1.8 05/04/06 15:09:15 marko@hundin.mysql.fi +3 -0
  InnoDB: Avoid test suite failures caused by a locking conflict
  between two server instances at server shutdown/startup.
  This conflict on advisory locks appears to be the result of a bug
  in the operating system; these locks should be released when the
  files are closed, but somehow that does not always happen
  immediately in Linux.  (Bug #9381)

  innobase/srv/srv0start.c
    1.78 05/04/06 15:09:09 marko@hundin.mysql.fi +5 -0
    open_or_create_data_files(): Open the first data file with
    OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
    instance of the MySQL server.

  innobase/os/os0file.c
    1.100 05/04/06 15:09:09 marko@hundin.mysql.fi +23 -4
    os_file_lock(): Do not close the file on failure, but let the
    callers do that.
    os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
    os_file_lock() fails, keep retrying for 100 seconds.

  innobase/include/os0file.h
    1.33 05/04/06 15:09:08 marko@hundin.mysql.fi +2 -0
    Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1

ChangeSet
  1.2156.8.1 05/04/06 12:20:55 kent@mysql.com +4 -0
  Makefile.am:
    Include the Perl version of mysql-test-run
  rpl_rewrite_db.test, rpl_rewrite_db.result:
    Added missing database cleanup
  mysql-test-run.pl:
    Embedded result files no longer needed

  mysql-test/Makefile.am
    1.42 05/04/06 12:20:20 kent@mysql.com +10 -5
    Include the Perl version of mysql-test-run

  mysql-test/t/rpl_rewrite_db.test
    1.3 05/04/06 12:13:59 kent@mysql.com +3 -0
    Added missing database cleanup

  mysql-test/r/rpl_rewrite_db.result
    1.3 05/04/06 12:13:58 kent@mysql.com +1 -0
    Added missing database cleanup

ChangeSet
  1.2160.3.1 05/04/06 15:12:44 bar@mysql.com +2 -0
  Minor clean-ups for the previous commit.

  strings/ctype-mb.c
    1.39 05/04/06 15:12:35 bar@mysql.com +1 -1
    Don't return an error if we reached end of line.

  sql/field.cc
    1.215 05/04/06 15:12:35 bar@mysql.com +4 -4
    Use a separate variable. Otherwise "error" value gets lost
    after well_formed_length call.

ChangeSet
  1.2160.1.5 05/04/06 14:14:13 gluh@mysql.com +1 -0
  Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286

  sql/sql_yacc.yy
    1.381 05/04/06 14:14:09 gluh@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2160.2.1 05/04/06 14:13:06 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  BitKeeper/etc/logging_ok
    1.376 05/04/06 14:13:05 gluh@mysql.com +1 -0
    Logging to logging@openlogging.org accepted

  sql/sql_yacc.yy
    1.379.1.1 05/04/06 14:11:08 gluh@mysql.com +39 -27
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  mysql-test/t/user_var.test
    1.20 05/04/06 14:11:08 gluh@mysql.com +8 -0
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

  mysql-test/r/user_var.result
    1.27 05/04/06 14:11:08 gluh@mysql.com +4 -0
    Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables

ChangeSet
  1.2160.1.4 05/04/06 10:27:40 heikki@hundin.mysql.fi +4 -0
  row0sel.c, btr0pcur.c, btr0pcur.ic, btr0pcur.h:
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/row/row0sel.c
    1.67 05/04/06 10:27:08 heikki@hundin.mysql.fi +4 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/btr/btr0pcur.c
    1.10 05/04/06 10:26:29 heikki@hundin.mysql.fi +9 -1
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/include/btr0pcur.ic
    1.6 05/04/06 10:26:13 heikki@hundin.mysql.fi +10 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

  innobase/include/btr0pcur.h
    1.6 05/04/06 10:26:02 heikki@hundin.mysql.fi +4 -0
    Add diagnostic code to track assertion failure in ut_a(cursor->old_stored == BTR_PCUR_OLD_STORED); the failure happened in OPTIMIZE TABLE, and in 4.0.24 in some other context

ChangeSet
  1.2160.1.3 05/04/06 11:53:15 bar@mysql.com +12 -0
  Adding a new parameter for well_formed_length to 
  return error. We'll use it for better warnign reporting.

  strings/ctype-ujis.c
    1.62 05/04/06 11:53:09 bar@mysql.com +11 -2
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-ucs2.c
    1.38 05/04/06 11:53:09 bar@mysql.com +3 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-sjis.c
    1.76 05/04/06 11:53:09 bar@mysql.com +4 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-simple.c
    1.63 05/04/06 11:53:08 bar@mysql.com +3 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-mb.c
    1.38 05/04/06 11:53:08 bar@mysql.com +6 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  strings/ctype-big5.c
    1.72 05/04/06 11:53:08 bar@mysql.com +5 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  sql/sql_yacc.yy
    1.380 05/04/06 11:53:08 bar@mysql.com +2 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  sql/field.cc
    1.214 05/04/06 11:53:08 bar@mysql.com +8 -7
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbOperationSearch.cpp
    1.9 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbOperationDefine.cpp
    1.15 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  ndb/src/ndbapi/NdbIndexOperation.cpp
    1.14 05/04/06 11:53:08 bar@mysql.com +3 -1
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

  include/m_ctype.h
    1.103 05/04/06 11:53:08 bar@mysql.com +6 -3
    Adding a new parameter for well_formed_length to 
    return error. We'll use it for better warnign reporting.

ChangeSet
  1.2156.7.1 05/04/05 19:44:39 serg@serg.mylan +1 -0
  merged

  BitKeeper/triggers/post-commit
    1.33 05/04/05 19:44:33 serg@serg.mylan +1 -1
    merged

ChangeSet
  1.1346.823.2 05/04/05 15:16:15 serg@serg.mylan +1 -0
  add changeset key to the bk commit mail

  BitKeeper/triggers/post-commit
    1.19.1.15 05/04/05 15:16:12 serg@serg.mylan +3 -0
    add changeset key to the bk commit mail

ChangeSet
  1.2160.1.1 05/04/05 13:14:03 pekka@mysql.com +6 -0
  ndb - csc#4847 release scan op early to save memory

ChangeSet
  1.2156.6.1 05/04/05 13:01:16 msvensson@neptunus.(none) +1 -0
  Fix swedish error message

  sql/share/swedish/errmsg.txt
    1.133 05/04/05 13:01:13 msvensson@neptunus.(none) +1 -1
    Fix length of swedish error message for "unknown table"

  ndb/tools/desc.cpp
    1.13 05/04/05 13:00:35 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbScanOperation.cpp
    1.50 05/04/05 13:00:34 pekka@mysql.com +14 -7
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbResultSet.cpp
    1.8 05/04/05 13:00:33 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/src/ndbapi/NdbConnection.cpp
    1.34 05/04/05 13:00:33 pekka@mysql.com +31 -0
    release scan op of hupped trans at scan close to save memory

  ndb/include/ndbapi/NdbScanOperation.hpp
    1.20 05/04/05 13:00:33 pekka@mysql.com +1 -1
    release scan op of hupped trans at scan close to save memory

  ndb/include/ndbapi/NdbConnection.hpp
    1.24 05/04/05 13:00:33 pekka@mysql.com +1 -0
    release scan op of hupped trans at scan close to save memory

ChangeSet
  1.1346.1.733 05/04/05 13:15:04 jani@ua141d10.elisa.omakaista.fi +1 -0
  A fix for Netware.

  mysys/my_rename.c
    1.5.1.1 05/04/05 13:15:02 jani@ua141d10.elisa.omakaista.fi +1 -1
    A fix for Netware.

ChangeSet
  1.2156.1.9 05/04/05 11:35:03 heikki@hundin.mysql.fi +1 -0
  dict0dict.c:
    Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

  innobase/dict/dict0dict.c
    1.62 05/04/05 11:34:50 heikki@hundin.mysql.fi +3 -0
    Add a note that ENUM in new tables cannot reference ENUM in old tables, in FOREIGN KEY constraints

ChangeSet
  1.2159 05/04/05 09:06:57 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  sql/mysqld.cc
    1.567 05/04/05 09:06:55 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2156.1.8 05/04/04 18:29:18 jimw@mysql.com +2 -0
  Merge new tests

  mysql-test/t/join_outer.test
    1.18 05/04/04 18:29:15 jimw@mysql.com +0 -2
    Merge

  mysql-test/r/join_outer.result
    1.34 05/04/04 18:29:15 jimw@mysql.com +0 -0
    Update results

ChangeSet
  1.2156.1.6 05/04/04 18:26:39 jimw@mysql.com +2 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8866
  into mysql.com:/home/jimw/my/mysql-4.1-clean

  sql-common/client.c
    1.84 05/04/04 18:26:38 jimw@mysql.com +0 -0
    Auto merged

  client/mysqltest.c
    1.159 05/04/04 18:26:38 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2152.23.2 05/04/05 03:34:39 sergefp@mysql.com +1 -0
  Removed extra comment

  sql/sql_select.cc
    1.391.1.2 05/04/05 03:34:36 sergefp@mysql.com +0 -1
    Removed extra comment

ChangeSet
  1.2152.23.1 05/04/05 02:42:23 sergefp@mysql.com +2 -0
  Fix for BUG#8877: Implementation of 
  "Early NULL-values filtering for ref access" (attempt2+post-review fixes)
  1. update_ref_and_keys() accumulates info about null-rejecting
  predicates in in KEY_FIELD::null_rejecting, add_key_part saves
  these to KEYUSE.
  2. create_ref_for_key copies them to TABLE_REF.
  3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond of
  appropiate JOIN_TAB members.
  
  Includes code cleanups: 
  * add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
  passed to it)
  * add_key_fields() params: JOIN_TAB *stat removed (wasn't used)

  sql/sql_select.h
    1.73 05/04/05 02:42:20 sergefp@mysql.com +10 -0
    Fix for BUG#8877: Implementation of 
    "Early NULL-values filtering for ref access" (attempt2)

  sql/sql_select.cc
    1.391.1.1 05/04/05 02:42:20 sergefp@mysql.com +152 -12
    Fix for BUG#8877: Implementation of 
    "Early NULL-values filtering for ref access"
    1. update_ref_and_keys() accumulates info about null-rejecting
    predicates in in KEY_FIELD::null_rejecting, add_key_part saves
    these to KEYUSE.
    2. create_ref_for_key copies them to TABLE_REF.
    3. add_not_null_conds adds "x IS NOT NULL" to join_tab->select_cond
    of appropiate JOIN_TAB members.
    
    Includes code cleanups: 
    * add_key_field() params: s/COND/Item_func/ (as only Item_funcs are
    passed to it)
    * add_key_fields() params: JOIN_TAB *stat removed (wasn't used)

ChangeSet
  1.2158 05/04/04 19:00:40 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  sql/share/english/errmsg.txt
    1.146 05/04/04 19:00:38 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2156.4.2 05/04/04 19:41:52 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

  sql/ha_innodb.cc
    1.187 05/04/04 19:41:36 heikki@hundin.mysql.fi +7 -6
    Correct the fix of Bug #9526 : InnoDB must use its own internal type info for old tables, so that old ENUMs and SETs still are (incorrectly) seen as char strings; we do not dare to allow InnoDB sometimes to see the type as an integer type for those old tables

ChangeSet
  1.2156.4.1 05/04/04 19:27:28 heikki@hundin.mysql.fi +1 -0
  ha_innodb.cc:
    Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

  sql/ha_innodb.cc
    1.186 05/04/04 19:26:49 heikki@hundin.mysql.fi +35 -17
    Fix bug #9526 in InnoDB: the internal type of an ENUM or SET is an unsigned integer type, not a character string

ChangeSet
  1.2156.3.4 05/04/04 17:09:53 msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
  into neptunus.(none):/home/msvensson/mysql/bug6762

  sql/ha_ndbcluster.cc
    1.137 05/04/04 17:09:52 msvensson@neptunus.(none) +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.16 05/04/04 16:09:10 kent@mysql.com +0 -1
    Embedded result files no longer needed

ChangeSet
  1.2156.3.3 05/04/04 17:55:12 bar@mysql.com +2 -0
  ctype_uca.result:
    fixing test results accordingly.
  ctype-uca.c:
    It appeared that in traditional Spanish collation
    'RR' is not equal to 'R', as Unicode and Mimer state.
    We'll go Oracle and IBM way instead:
    No special rules to 'RR'.

  mysql-test/r/ctype_uca.result
    1.13 05/04/04 17:54:45 bar@mysql.com +2 -2
    fixing test results accordingly.

  strings/ctype-uca.c
    1.30 05/04/04 17:53:50 bar@mysql.com +1 -2
    It appeared that in traditional Spanish collation
    'RR' is not equal to 'R', as Unicode and Mimer state.
    We'll go Oracle and IBM way instead:
    No special rules to 'RR'.

ChangeSet
  1.2152.22.1 05/04/04 12:26:05 msvensson@neptunus.(none) +5 -0
  BUG#6762 ALTER TABLE gives weird results and error message
    - Better error message when table definition has changed

  sql/ha_ndbcluster.cc
    1.135.1.1 05/04/04 12:26:02 msvensson@neptunus.(none) +28 -2
    When error 284 is returned from NDB a check must be made to see what the error really means.
     - if table does not exists any more, return 709 -> No such table exists
     - if table still exists, table has most likely been altered and table id and version has 
       changed, print  hardcoded  errormessage indicating that transaction should retried
      (this error message should be translated to a langauge dependent error message in 5.0)
      
    Remove mapping from 284 to HA_ERR_NO_SUCH_TABLE

  mysql-test/t/ndb_multi.test
    1.2 05/04/04 12:26:02 msvensson@neptunus.(none) +2 -0
    Safety, drop tables in second server as well

  mysql-test/t/ndb_alter_table.test
    1.18 05/04/04 12:26:02 msvensson@neptunus.(none) +1 -1
    New error message and code when table definition has changed.

  mysql-test/r/ndb_multi.result
    1.2 05/04/04 12:26:02 msvensson@neptunus.(none) +1 -0
    Safety, drop tables in second server as well

  mysql-test/r/ndb_alter_table.result
    1.20 05/04/04 12:26:02 msvensson@neptunus.(none) +1 -1
    New error message and code when table definition has changed.

ChangeSet
  1.2156.3.2 05/04/03 10:05:01 dlenev@mysql.com +4 -0
  Manual merge of fix for bug #8894 "TIMESTAMP values scrambled/misaligned
  when using --new" into 4.1 tree.

  sql/field.h
    1.126 05/04/03 10:04:59 dlenev@mysql.com +0 -0
    Manual merge.

  sql/field.cc
    1.213 05/04/03 10:04:59 dlenev@mysql.com +0 -4
    Manual merge.

  mysql-test/t/type_timestamp.test
    1.23 05/04/03 10:04:59 dlenev@mysql.com +0 -13
    Manual merge.

  mysql-test/r/type_timestamp.result
    1.25 05/04/03 10:04:59 dlenev@mysql.com +0 -9
    Manual merge.

ChangeSet
  1.2152.21.2 05/04/02 21:36:50 serg@serg.mylan +1 -0
  results updated

  mysql-test/r/drop.result
    1.22 05/04/02 21:36:44 serg@serg.mylan +2 -2
    results updated

ChangeSet
  1.2152.21.1 05/04/02 20:28:58 serg@serg.mylan +6 -0
  merged

  sql/sql_table.cc
    1.276 05/04/02 20:28:51 serg@serg.mylan +2 -3
    merged

  sql/share/ukrainian/errmsg.txt
    1.93 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  sql/share/russian/errmsg.txt
    1.127 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  sql/share/english/errmsg.txt
    1.144.1.1 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

  mysql-test/t/drop.test
    1.18 05/04/02 20:20:16 serg@serg.mylan +0 -1
    Auto merged

  mysql-test/r/drop.result
    1.21 05/04/02 20:20:16 serg@serg.mylan +0 -0
    Auto merged

ChangeSet
  1.1346.823.1 05/04/02 20:13:19 serg@serg.mylan +6 -0
  bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names
  sql/sql_table.cc: print an error with a function that respects width modifiers (%.64s)

  sql/sql_table.cc
    1.112.16.1 05/04/02 20:13:16 serg@serg.mylan +2 -1
    print an error with a function that respects width modifiers (%.64s)

  sql/share/ukrainian/errmsg.txt
    1.11.1.15 05/04/02 20:13:16 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/russian/errmsg.txt
    1.45.1.16 05/04/02 20:13:15 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  sql/share/english/errmsg.txt
    1.51.1.23 05/04/02 20:13:15 serg@serg.mylan +1 -1
    allow longer "table names" as DROP TABLE puts a list here

  mysql-test/t/drop.test
    1.10.1.2 05/04/02 20:13:15 serg@serg.mylan +23 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

  mysql-test/r/drop.result
    1.10.1.2 05/04/02 20:13:15 serg@serg.mylan +14 -0
    bug#3891 - DROP TABLE many-unexistent-tables, was printing an error with %s instead of table names

ChangeSet
  1.2156.1.3 05/04/01 19:00:14 jimw@mysql.com +3 -0
  Clean up merge of fix for Bug #9468.

  sql/sql_parse.cc
    1.432 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Reset server status after a single statement in a multistatement
    query is handled in embedded server so it is not logged twice to
    the slow query log.

  mysql-test/t/skip_name_resolve.test
    1.2 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Disable test with embedded server

  mysql-test/t/lowercase_table_grant.test
    1.2 05/04/01 19:00:11 jimw@mysql.com +3 -0
    Disable test with embedded server

ChangeSet
  1.2156.1.2 05/04/01 16:43:35 jimw@mysql.com +18 -0
  Merge embedded-server testing changes.

  mysql-test/t/ps_1general.test
    1.14 05/04/01 16:43:33 jimw@mysql.com +1 -2
    Merge changes

  mysql-test/mysql-test-run.sh
    1.248 05/04/01 16:43:33 jimw@mysql.com +6 -0
    Merge changes

  sql/sql_select.cc
    1.393 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/variables.test
    1.46 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/user_var.test
    1.19 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/type_float.test
    1.18 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/show_check.test
    1.41 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/select.test
    1.35 05/04/01 16:41:50 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/mysqldump.test
    1.28 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/grant2.test
    1.11 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/ctype_ucs.test
    1.21 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/variables.result
    1.58 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/user_var.result
    1.26 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_float.result
    1.31 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/type_blob.result
    1.45 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/select.result
    1.51 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ps_1general.result
    1.19 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_ucs.result
    1.23 05/04/01 16:41:49 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2156.2.1 05/04/01 16:09:20 jimw@mysql.com +1 -0
  Fix handling of max_allowed_packet and net_buffer_length in
  embedded server when a size suffix (K, M, G) is added. (Bug #9472)

  sql/mysqld.cc
    1.565.1.1 05/04/01 16:09:18 jimw@mysql.com +3 -10
    Instead of (re)parsing max_allowed_packet and net_buffer_length
    for the embedded server, just set the global variables to what
    is set in global_system_variables within get_options().

ChangeSet
  1.2055.478.14 05/04/01 09:13:20 jimw@mysql.com +2 -0
  Fix the new ps_grant test to clean itself up properly.

  mysql-test/t/ps_grant.test
    1.2 05/04/01 09:13:17 jimw@mysql.com +0 -1
    Fix cleanup of test

  mysql-test/r/ps_grant.result
    1.2 05/04/01 09:13:17 jimw@mysql.com +0 -1
    Update results

ChangeSet
  1.2152.20.1 05/04/01 18:56:45 joerg@mysql.com +15 -0
  Merge changesets constituting 4.1.10a back into main tree, including release label.

  sql/share/english/errmsg.txt
    1.145 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  sql/mysqld.cc
    1.566 05/04/01 18:56:42 joerg@mysql.com +0 -9
    No change to main source when integrating 4.1.10a.

  sql/mysql_priv.h
    1.344 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  scripts/mysql_create_system_tables.sh
    1.20 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  myisam/mi_create.c
    1.44 05/04/01 18:56:42 joerg@mysql.com +0 -7
    No change to main source when integrating 4.1.10a.

  configure.in
    1.357 05/04/01 18:56:42 joerg@mysql.com +0 -1
    No change to main source when integrating 4.1.10a.

  support-files/mysql.spec.sh
    1.89 05/04/01 18:52:00 joerg@mysql.com +0 -8
    Auto merged

  sql/table.cc
    1.127 05/04/01 18:50:36 joerg@mysql.com +0 -5
    Auto merged

  sql/sql_udf.cc
    1.40 05/04/01 18:50:35 joerg@mysql.com +0 -45
    Auto merged

  sql/ha_myisam.cc
    1.155 05/04/01 18:48:27 joerg@mysql.com +0 -11
    Auto merged

  mysys/mf_tempfile.c
    1.24 05/04/01 18:46:34 joerg@mysql.com +0 -4
    Auto merged

  myisammrg/myrg_create.c
    1.10 05/04/01 18:46:34 joerg@mysql.com +0 -1
    Auto merged

  merge/mrg_create.c
    1.8 05/04/01 18:45:03 joerg@mysql.com +0 -1
    Auto merged

  isam/create.c
    1.12 05/04/01 18:45:03 joerg@mysql.com +0 -3
    Auto merged

  include/my_global.h
    1.81 05/04/01 18:45:03 joerg@mysql.com +0 -3
    Auto merged

ChangeSet
  1.2055.498.7 05/04/01 18:38:19 joerg@mysql.com +5 -0
  Last minor things to finish MySQL 4.1.10a:
  - some wordings,
  - RPM packaging improvements.

  support-files/mysql.spec.sh
    1.86.1.1 05/04/01 18:38:16 joerg@mysql.com +8 -2
    Fix date formatting, add missing change descriptions.

  sql/sql_udf.cc
    1.37.2.3 05/04/01 18:38:16 joerg@mysql.com +6 -6
    Fix an erroneous takeover of 4.0 wording.

  sql/mysqld.cc
    1.548.2.3 05/04/01 18:38:15 joerg@mysql.com +2 -2
    Correct a message text; align variable order with other versions.

  scripts/mysql_create_system_tables.sh
    1.17.2.1 05/04/01 18:38:15 joerg@mysql.com +1 -3
    Security change: Reduce the risk caused by predefined anonymous logins.

  configure.in
    1.350.1.1 05/04/01 18:38:15 joerg@mysql.com +1 -1
    Set the version string.

