ChangeSet
  1.2476 05/11/29 11:52:58 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-14216
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item.cc
    1.230 05/11/29 11:52:56 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2473.1.1 05/11/29 12:15:48 gluh@eagle.intranet.mysql.r18.ru +1 -0
  Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
    added SSL_library_init()

  vio/viosslfactories.c
    1.17 05/11/29 12:15:00 gluh@mysql.com +10 -11
    Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
      added SSL_library_init()

ChangeSet
  1.2474 05/11/29 09:21:57 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b10446

  sql/item.cc
    1.228.1.2 05/11/29 09:21:49 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2471.1.1 05/11/28 15:07:20 knielsen@mysql.com +2 -0
  Minor Win32 compile fixes for 4.1.16 release.

  include/config-win.h
    1.56 05/11/28 14:56:53 knielsen@mysql.com +4 -4
    Win32 compile fix: quote multi-line macros with do { ... } while(0) to follow earlier changes in my_global.h.

  sql/log_event.cc
    1.187 05/11/28 14:55:35 knielsen@mysql.com +1 -1
    Add missing cast needed for Win32 compilation.

ChangeSet
  1.2462.13.1 05/11/26 19:36:11 serg@serg.mylan +3 -0
  followup for for the bug#5686

  mysql-test/t/fulltext.test
    1.76 05/11/26 19:35:59 serg@serg.mylan +1 -0
    followup for for the bug#5686

  mysql-test/r/fulltext.result
    1.77 05/11/26 19:35:59 serg@serg.mylan +3 -0
    followup for for the bug#5686

  myisam/ft_parser.c
    1.46 05/11/26 19:35:59 serg@serg.mylan +3 -1
    followup for for the bug#5686

ChangeSet
  1.2469.1.5 05/11/25 13:25:31 konstantin@mysql.com +5 -0
  A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
  CREATE TABLE and PS/SP": make sure that 'typelib' object for
  ENUM values and 'Item_string' object for DEFAULT clause are 
  created in the statement memory root.

  sql/table.cc
    1.132 05/11/25 13:25:25 konstantin@mysql.com +3 -3
    Change typelib() function to require MEM_ROOT.

  sql/sql_table.cc
    1.307 05/11/25 13:25:25 konstantin@mysql.com +25 -4
    Supply the statement memory root to use in typelib() and
    safe_charset_converter() functions to ensure that objects 
    created during the first execution of CREATE TABLE statement
    are allocated in persistent memory of the statement.

  sql/mysql_priv.h
    1.370 05/11/25 13:25:25 konstantin@mysql.com +1 -1
    typelib() function declaration has been changed.

  mysql-test/t/ps.test
    1.44 05/11/25 13:25:25 konstantin@mysql.com +29 -0
    A test case for Bug#14410 "Crash in Enum or Set type in CREATE 
    TABLE and PS/SP"

  mysql-test/r/ps.result
    1.43 05/11/25 13:25:25 konstantin@mysql.com +19 -0
    Test results has been fixed (Bug#14410)

ChangeSet
  1.2469.1.3 05/11/25 10:41:22 mskold@mysql.com +2 -0
  Updated expected error

  mysql-test/t/ndb_alter_table.test
    1.26 05/11/25 10:40:44 mskold@mysql.com +1 -1
    Updated expected error

  mysql-test/r/ndb_alter_table.result
    1.24 05/11/25 10:40:44 mskold@mysql.com +1 -1
    Updated expected error

ChangeSet
  1.2462.12.1 05/11/24 19:16:51 evgen@moonbone.local +3 -0
  Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
  crash
  
  resolve_const_item() substitutes item which will evaluate to constant with
  equvalent constant item, basing on the item's result type. In this case
  subselect was resolved as constant, and resolve_const_item() was substituting
  it's result's Item_caches to Item_null. Later Item_cache's function was called
  for Item_null object, which caused server crash.
  
  resolve_const_item() now substitutes constants for items with 
  result_type == ROW_RESULT only for Item_rows.

  mysql-test/r/select.result
    1.71 05/11/24 19:15:05 evgen@moonbone.local +8 -0
    Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash

  mysql-test/t/select.test
    1.54 05/11/24 19:14:52 evgen@moonbone.local +11 -0
    Test case for bug #14482 Wrongly applied optimization in resolve_const_item() caused crash
    

  sql/item.cc
    1.228.2.1 05/11/24 19:13:37 evgen@moonbone.local +12 -3
    Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused
    crash
    
    resolve_const_item() now applies optimization for items with
    result_type == ROW_RESULT only to Item_rows.

ChangeSet
  1.2469.1.2 05/11/24 16:21:49 mskold@mysql.com +1 -0
  Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

  sql/ha_ndbcluster.cc
    1.176 05/11/24 16:21:43 mskold@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2467.2.1 05/11/24 16:21:07 mskold@mysql.com +1 -0
  Moved check of wrong schema version earlier

  sql/ha_ndbcluster.cc
    1.174.1.1 05/11/24 16:20:46 mskold@mysql.com +8 -6
    Moved check of wrong schema version earlier

ChangeSet
  1.2462.11.1 05/11/22 19:58:58 joerg@mysql.com +1 -0
  support-files/mysql.spec.sh   
  Fix a possible problem on RPM un-install. bug#15145

  support-files/mysql.spec.sh
    1.111 05/11/22 19:58:54 joerg@mysql.com +17 -12
    Extend the file existence check for "init.d/mysql" on un-install
    to also guard the call to "insserv"/"chkconfig".
    bug#15145, br#5369 / 5586, csc#7129

ChangeSet
  1.2466.2.1 05/11/21 17:26:31 bar@mysql.com +5 -0
    Bug#10446 Illegal mix of collations:
  item_strfunc.h, item_strfunc.cc, item.cc:
    Try to convert a const item into destination 
    character set. If conversion happens without
    data loss, then cache the converted value
    and return it during val_str().
    Otherwise, if conversion loses data, return
    Illeral mix of collations error, as it happened
    previously.
  ctype_recoding.result, ctype_recoding.test:
    Fixing tests accordingly.

  mysql-test/r/ctype_recoding.result
    1.25 05/11/21 17:23:50 bar@mysql.com +8 -1
    Fixing tests accordingly.

  mysql-test/t/ctype_recoding.test
    1.21 05/11/21 17:23:41 bar@mysql.com +9 -2
    Fixing tests accordingly.

  sql/item_strfunc.cc
    1.238 05/11/21 17:23:08 bar@mysql.com +2 -0
    Return cached value when it's possible.

  sql/item_strfunc.h
    1.99 05/11/21 17:22:56 bar@mysql.com +32 -2

  sql/item.cc
    1.228.1.1 05/11/21 17:20:38 bar@mysql.com +2 -10
    Bug#10446 Illegal mix of collations
    Try to convert a const item into destination 
    character set. If conversion happens without
    data loss, then cache the converted value
    and return it during val_str().
    Otherwise, if conversion loses data, return
    Illeral mix of collations error, as it happened
    previously.

ChangeSet
  1.2467.1.1 05/11/21 16:09:26 gluh@eagle.intranet.mysql.r18.ru +4 -0
  Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

  vio/viossl.c
    1.28 05/11/21 16:08:39 gluh@mysql.com +0 -19
    Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

  vio/vio_priv.h
    1.5 05/11/21 16:08:39 gluh@mysql.com +0 -1
    Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

  vio/vio.c
    1.25 05/11/21 16:08:39 gluh@mysql.com +1 -1
    Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

  sql-common/client.c
    1.88 05/11/21 16:08:39 gluh@mysql.com +5 -1
    Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled

ChangeSet
  1.2468 05/11/21 12:28:36 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.175 05/11/21 12:28:33 msvensson@neptunus.(none) +0 -0
    Auto merged

ChangeSet
  1.2466.1.1 05/11/21 12:27:58 msvensson@neptunus.(none) +5 -0
  Bug #14514  	Creating table with packed key fails silently
   - Backport from 5.0

  sql/handler.cc
    1.171 05/11/21 12:27:55 msvensson@neptunus.(none) +1 -1
    Use new bit for create from engine

  sql/ha_ndbcluster.cc
    1.173.1.1 05/11/21 12:27:55 msvensson@neptunus.(none) +1 -1
    Use new bitmask for table_options to detect if create from engine

  mysql-test/t/ndb_basic.test
    1.27 05/11/21 12:27:55 msvensson@neptunus.(none) +8 -0
    Add test case for bug14514

  mysql-test/r/ndb_basic.result
    1.25 05/11/21 12:27:55 msvensson@neptunus.(none) +4 -0
    Add test result

  include/my_base.h
    1.65 05/11/21 12:27:55 msvensson@neptunus.(none) +1 -1
    Rename HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE, ie. it's a bit in the table_options variable

ChangeSet
  1.2466 05/11/19 12:58:22 kent@mysql.com +1 -0
  configure.in:
    Corrected "include/readline" link for "make distcheck"

  configure.in
    1.399 05/11/19 12:57:19 kent@mysql.com +2 -2
    Corrected "include/readline" linke for "make distcheck"

ChangeSet
  1.2465 05/11/19 11:11:09 kent@mysql.com +1 -0
  Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck

  configure.in
    1.398 05/11/19 11:11:06 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2462.1.17 05/11/18 12:20:22 mskold@mysql.com +1 -0
  Disabled --ps-protocol during autodiscover test

  mysql-test/t/ndb_alter_table.test
    1.25 05/11/18 12:20:02 mskold@mysql.com +2 -0
    Disabled --ps-protocol during autodiscover test

ChangeSet
  1.2462.1.14 05/11/17 10:59:21 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-12640
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  configure.in
    1.395.1.4 05/11/17 10:59:19 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2456.3.1 05/11/17 12:45:23 mskold@mysql.com +3 -0
  Fixed incorrectly use if table with wrong schema version

  sql/ha_ndbcluster.cc
    1.174 05/11/17 12:44:10 mskold@mysql.com +39 -5
    Fixed incorrectly use if table with wrong schema version

  mysql-test/t/ndb_alter_table.test
    1.24 05/11/17 12:44:10 mskold@mysql.com +2 -0
    Fixed incorrectly use if table with wrong schema version

  mysql-test/r/ndb_alter_table.result
    1.23 05/11/17 12:44:10 mskold@mysql.com +1 -2
    Fixed incorrectly use if table with wrong schema version

ChangeSet
  1.2462.10.1 05/11/16 21:17:38 sasha@asksasha.com +2 -0
  fixed the race condition in the test case for BUG#7947

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.12 05/11/16 21:17:34 sasha@asksasha.com +5 -3
    fixed the race condition in the test case for BUG#7947

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.12 05/11/16 21:17:34 sasha@asksasha.com +5 -3
    fixed the race condition in the test case for BUG#7947

ChangeSet
  1.2456.1.2 05/11/16 11:52:09 pekka@mysql.com +4 -0
  ndb - bug#14007 4.1 [re-commit for LenZ merge]

  ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
    1.8 05/11/16 11:50:24 pekka@mysql.com +22 -1
    bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]

  ndb/include/kernel/AttributeDescriptor.hpp
    1.2 05/11/16 11:50:24 pekka@mysql.com +9 -0
    bug#14007 4.1 need getSizeInBytes [re-commit]

  mysql-test/t/ndb_charset.test
    1.6 05/11/16 11:50:24 pekka@mysql.com +11 -8
    bug#14007 test [re-commit]

  mysql-test/r/ndb_charset.result
    1.4 05/11/16 11:50:24 pekka@mysql.com +16 -6
    bug#14007 test [re-commit]

ChangeSet
  1.2462.1.9 05/11/16 19:47:03 stewart@mysql.com +2 -0
  WL#2779 ndb_size.pl
  
  Add display of minimum requirements for various cluster parameters
  e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc
  
  and the memory usage because of them.

  ndb/tools/ndb_size.tmpl
    1.3 05/11/16 19:47:00 stewart@mysql.com +40 -0
    display parameters

  ndb/tools/ndb_size.pl
    1.4 05/11/16 19:47:00 stewart@mysql.com +56 -1
    Computer minimum parameter settings (MaxNoOfTables, Attributes, Indexes, Triggers) and the memory usage because of these settings.

ChangeSet
  1.2462.1.8 05/11/16 18:26:30 stewart@mysql.com +2 -0
  WL#2779 ndb_size.pl
  
  fix some small bugs, slightly improve output, add --help

  ndb/tools/ndb_size.tmpl
    1.2 05/11/16 18:23:14 stewart@mysql.com +3 -3
    A NAME and A HREF to tables from the main list

  ndb/tools/ndb_size.pl
    1.3 05/11/16 18:23:11 stewart@mysql.com +19 -11
    Provide --help and --usage.
    
    Fix some bugs related to quoting table names.

ChangeSet
  1.2462.1.6 05/11/15 13:38:06 sasha@asksasha.com +4 -0
  merged in the test case for BUG#7947

  mysql-test/t/mix_innodb_myisam_binlog.test
    1.11 05/11/15 11:09:39 sasha@asksasha.com +27 -1
    merged in the test case for BUG#7947

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.11 05/11/15 11:09:39 sasha@asksasha.com +48 -0
    merged in the test case for BUG#7947

  BitKeeper/deleted/.del-rpl_bug7947.test~20613cfdc560a16c
    1.3 05/11/15 11:08:20 sasha@asksasha.com +0 -0
    Delete: mysql-test/t/rpl_bug7947.test

  BitKeeper/deleted/.del-rpl_bug7947.result~1b40af7545a6c692
    1.3 05/11/15 11:08:20 sasha@asksasha.com +0 -0
    Delete: mysql-test/r/rpl_bug7947.result

ChangeSet
  1.2462.5.4 05/11/15 18:09:40 ingo@mysql.com +7 -0
  Merge mysql.com:/home/mydev/mysql-4.0-4000
  into  mysql.com:/home/mydev/mysql-4.1-4100

  sql/sql_table.cc
    1.306 05/11/15 18:09:36 ingo@mysql.com +1 -1
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Manual merge.

  sql/sql_handler.cc
    1.63 05/11/15 18:09:36 ingo@mysql.com +0 -0
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Manual merge.

  mysql-test/t/handler.test
    1.23 05/11/15 18:09:36 ingo@mysql.com +0 -1
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Manual merge.

  sql/sql_class.cc
    1.203 05/11/15 18:02:31 ingo@mysql.com +0 -0
    Auto merged

  sql/sql_base.cc
    1.260 05/11/15 18:02:31 ingo@mysql.com +0 -0
    Auto merged

  sql/mysql_priv.h
    1.369 05/11/15 18:02:31 ingo@mysql.com +0 -0
    Auto merged

  mysql-test/r/handler.result
    1.23 05/11/15 18:02:31 ingo@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2462.5.3 05/11/15 18:01:30 ingo@mysql.com +1 -0
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  After merge fix.

  mysql-test/r/myisam.result
    1.57 05/11/15 18:01:26 ingo@mysql.com +1 -1
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    After merge fix.

ChangeSet
  1.2462.8.1 05/11/15 18:14:53 bell@sanja.is.com.ua +2 -0
  Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138)

  mysql-test/t/analyze.test
    1.6 05/11/15 18:14:51 bell@sanja.is.com.ua +9 -0
    Test suite for BUG#13673

  mysql-test/r/analyze.result
    1.3 05/11/15 18:14:50 bell@sanja.is.com.ua +7 -0
    Test suite for BUG#13673

ChangeSet
  1.2462.5.2 05/11/15 16:07:05 ingo@mysql.com +3 -0
  Merge mysql.com:/home/mydev/mysql-4.0-bug14616
  into  mysql.com:/home/mydev/mysql-4.1-4100

  sql/sql_select.cc
    1.444 05/11/15 16:07:02 ingo@mysql.com +0 -1
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    Manual merge.

  mysql-test/t/myisam.test
    1.44 05/11/15 16:07:02 ingo@mysql.com +1 -1
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    Manual merge.

  mysql-test/r/myisam.result
    1.56 05/11/15 16:07:01 ingo@mysql.com +1 -1
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    Manual merge.

ChangeSet
  1.2462.7.1 05/11/14 16:36:06 bar@mysql.com +4 -0
    Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES
  ps_grant.result:
    Fixing result order.
  grant.result:
    Adding test case,
    fixing result order.
  grant.test:
    Adding test case.
  sql_acl.cc:
    Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
    This problem was previously fixed by Ingo in 5.0.
    This patch is basically a backport of the same changes into 4.1.

  mysql-test/r/ps_grant.result
    1.6 05/11/14 16:35:10 bar@mysql.com +3 -3
    Fixing result order.

  mysql-test/r/grant.result
    1.39 05/11/14 16:34:59 bar@mysql.com +24 -3
    Adding test case,
    fixing result order.

  mysql-test/t/grant.test
    1.32 05/11/14 16:34:53 bar@mysql.com +12 -0
    Adding test case.

  sql/sql_acl.cc
    1.170 05/11/14 16:33:52 bar@mysql.com +48 -47
    Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES
    Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
    This problem was previously fixed by Ingo in 5.0.
    This patch is basically a backport of the same changes into 4.1.

ChangeSet
  1.2462.4.2 05/11/14 01:59:15 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Corrected search for 'mysqlimport' executable

  mysql-test/mysql-test-run.pl
    1.51 05/11/14 01:58:39 kent@mysql.com +2 -1
    Corrected search for 'mysqlimport' executable

ChangeSet
  1.2462.5.1 05/11/12 11:25:14 svoj@mysql.com +3 -0
  Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8

  mysql-test/t/fulltext.test
    1.75 05/11/12 11:24:58 svoj@mysql.com +6 -0
    Test case for bug#5686.

  mysql-test/r/fulltext.result
    1.76 05/11/12 11:24:58 svoj@mysql.com +4 -0
    Test case for bug#5686.

  myisam/ft_parser.c
    1.45 05/11/12 11:24:58 svoj@mysql.com +3 -1
    word->len calculation correction.

ChangeSet
  1.2462.3.6 05/11/11 15:23:04 jimw@mysql.com +1 -0
  Update out-of-date URLs in 'help' text of mysql client. (Bug #14801)

  client/mysql.cc
    1.215 05/11/11 15:23:01 jimw@mysql.com +7 -3
    Update text, URLs in mysql client 'help' text

ChangeSet
  1.2462.4.1 05/11/10 15:12:22 guilhem@mysql.com +3 -0
  Declaring some class members public for BUG#12377:
  "Item_date_add_interval needs to have the int_type member as Public".
  As explained in the bug report, this change is is to help http://search.cpan.org/~philips/DBIx-MyParse-0.20/
  So please keep those members public.

  sql/item_timefunc.h
    1.55 05/11/10 15:12:18 guilhem@mysql.com +4 -4
    declaring some class members public for BUG#12377

  sql/item_strfunc.h
    1.98 05/11/10 15:12:18 guilhem@mysql.com +1 -1
    declaring some class members public for BUG#12377

  sql/item_func.h
    1.127 05/11/10 15:12:18 guilhem@mysql.com +2 -2
    declaring some class members public for BUG#12377

ChangeSet
  1.2462.3.3 05/11/09 09:34:46 sergefp@mysql.com +3 -0
  BUG#14480: post-fix: use the default field value from CREATE list too. 

  sql/sql_table.cc
    1.305 05/11/09 09:34:41 sergefp@mysql.com +1 -0
    BUG#14480: post-fix: use the default field value from CREATE list too. 

  mysql-test/t/create.test
    1.62 05/11/09 09:34:41 sergefp@mysql.com +7 -0
    BUG#14480: post-fix: use the default field value from CREATE list too. 

  mysql-test/r/create.result
    1.88 05/11/09 09:34:41 sergefp@mysql.com +11 -0
    BUG#14480: post-fix: use the default field value from CREATE list too. 

ChangeSet
  1.2462.1.5 05/11/07 20:51:30 sasha@asksasha.com +3 -0
  changed select release_lock() to do release_lock() to avoid having to compare the 
  non-deterministic result in the test case for BUG#7947
  the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
  in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS

  mysql-test/t/rpl_bug7947.test
    1.2 05/11/07 20:51:23 sasha@asksasha.com +1 -1
    changed select release_lock() to do release_lock() to avoid having to compare the 
    non-deterministic result

  mysql-test/r/rpl_bug7947.result
    1.2 05/11/07 20:51:23 sasha@asksasha.com +1 -3
    changed select release_lock() to do release_lock() to avoid having to compare the 
    non-deterministic result

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.10 05/11/07 20:51:23 sasha@asksasha.com +1 -0
    DO RELEASE_LOCK() was supposed to be there from the very start

ChangeSet
  1.2462.1.4 05/11/07 15:10:48 sasha@asksasha.com +1 -0
  Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947

  sql/item_func.cc
    1.259 05/11/07 15:10:42 sasha@asksasha.com +0 -0
    Auto merged

ChangeSet
  1.2456.2.1 05/11/07 15:09:35 sasha@asksasha.com +3 -0
  fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of
  transaction while holding the lock. Also test to make sure other binlogging issues
  reported in the bug have been addressed.

  mysql-test/t/rpl_bug7947.test
    1.1 05/11/07 15:01:29 sasha@asksasha.com +22 -0
    New BitKeeper file ``mysql-test/t/rpl_bug7947.test''

  mysql-test/r/rpl_bug7947.result
    1.1 05/11/07 15:01:29 sasha@asksasha.com +48 -0
    New BitKeeper file ``mysql-test/r/rpl_bug7947.result''

  sql/item_func.cc
    1.257.1.1 05/11/07 15:01:29 sasha@asksasha.com +1 -1
    fix for BUG#7947

  mysql-test/t/rpl_bug7947.test
    1.0 05/11/07 15:01:29 sasha@asksasha.com +0 -0
    BitKeeper file /reiser-data/mysql-dev/mysql-4.1-bug7947/mysql-test/t/rpl_bug7947.test

  mysql-test/r/rpl_bug7947.result
    1.0 05/11/07 15:01:29 sasha@asksasha.com +0 -0
    BitKeeper file /reiser-data/mysql-dev/mysql-4.1-bug7947/mysql-test/r/rpl_bug7947.result

ChangeSet
  1.1346.1.828 05/11/07 12:16:49 ingo@mysql.com +3 -0
  Bug#14616 - Freshly imported table returns error 124 when using LIMIT
  Initialized usable_keys from table->keys_in_use instead of ~0
  in test_if_skip_sort_order(). It was possible that a disabled
  index was used for sorting.

  sql/sql_select.cc
    1.152.1.142 05/11/07 12:16:47 ingo@mysql.com +6 -2
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    Initialized usable_keys from table->keys_in_use instead of ~0
    in test_if_skip_sort_order(). It was possible that a disabled
    index was used for sorting.

  mysql-test/t/myisam.test
    1.7.1.20 05/11/07 12:16:47 ingo@mysql.com +12 -0
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    The test case.

  mysql-test/r/myisam.result
    1.10.1.21 05/11/07 12:16:47 ingo@mysql.com +10 -0
    Bug#14616 - Freshly imported table returns error 124 when using LIMIT
    The test result.

ChangeSet
  1.2456.1.1 05/11/07 09:23:43 sergefp@mysql.com +3 -0
  BUG#14480, attempt2: In CREATE ... SELECT ..., don't count the same field twice
  when calculating table->null_fields.

  sql/sql_table.cc
    1.304 05/11/07 09:22:59 sergefp@mysql.com +8 -1
    BUG#14480: For CREATE ... SELECT ... a field list passed to mysql_prepare_table() contains
    instances of create_field for both create-list and select-list. mysql_prepare_table() 
    matches elements that refer to the same field, and joins them together. When the "join"  
    is performed, both of create_field structures has already been counted in "null_fields". 
    
    This fix makes sure that "null_fields" contains the correct value after two create_field 
    structures have been joined. 

  mysql-test/t/create.test
    1.61 05/11/07 09:22:59 sergefp@mysql.com +63 -1
    Testcase for BUG#14480

  mysql-test/r/create.result
    1.87 05/11/07 09:22:59 sergefp@mysql.com +67 -1
    Testcase for BUG#14480

ChangeSet
  1.2462.2.2 05/11/06 02:11:12 petr@mysql.com +3 -0
  Fix Bug#14672 Bug in deletion

  sql/examples/ha_tina.cc
    1.10 05/11/06 02:11:00 petr@mysql.com +2 -1
    Add O_APPEND flag to my_open. We should always add rows to the end of file

  mysql-test/t/csv.test
    1.4 05/11/06 02:11:00 petr@mysql.com +19 -0
    Add test for a bug

  mysql-test/r/csv.result
    1.3 05/11/06 02:11:00 petr@mysql.com +27 -0
    correct result file

ChangeSet
  1.2462.2.1 05/11/05 15:08:15 petr@mysql.com +3 -0
  Fix Bug#13894 Server crashes on update of CSV table

  sql/examples/ha_tina.cc
    1.9 05/11/05 15:07:59 petr@mysql.com +9 -10
    sort function should return reverted values for chains to be sorted in
    the right orded. don't do a strange memmove

  mysql-test/t/csv.test
    1.3 05/11/05 15:07:59 petr@mysql.com +18 -0
    Add test for a bug

  mysql-test/r/csv.result
    1.2 05/11/05 15:07:59 petr@mysql.com +20 -0
    update result file

ChangeSet
  1.2462.1.2 05/11/05 01:44:35 kent@mysql.com +1 -0
  mysql.spec.sh:
    Always use bundled zlib

  support-files/mysql.spec.sh
    1.110 05/11/05 01:43:36 kent@mysql.com +1 -0
    Always use bundled zlib

ChangeSet
  1.2462.1.1 05/11/04 16:17:43 petr@mysql.com +1 -0
  fix --ansi --pedantic compilation failure

  sql/spatial.h
    1.14 05/11/04 16:17:29 petr@mysql.com +2 -2
    fix --ansi --pedantic compilation failure

ChangeSet
  1.2463 05/11/04 01:15:35 kent@mysql.com +3 -0
  Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck

  mysql-test/Makefile.am
    1.50 05/11/04 01:15:31 kent@mysql.com +0 -0
    Auto merged

  configure.in
    1.397 05/11/04 01:15:31 kent@mysql.com +0 -0
    Auto merged

  Makefile.am
    1.74 05/11/04 01:15:30 kent@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.861.1 05/11/03 18:24:12 ingo@mysql.com +7 -0
  Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  Version for 4.0.
  It fixes two problems:
  1. The cause of the bug was that we did not check the table version for
     the HANDLER ... READ commands. We did not notice when a table was
     replaced by a new one. This can happen during ALTER TABLE, REPAIR
     TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
     for this problem "the primary bug fix".
  2. mysql_ha_flush() was not always called with a locked LOCK_open.
     Though the function comment clearly said it must.
     I changed the code so that the locking is done when required. I call
     the fix for this problem "the secondary fix".

  sql/sql_table.cc
    1.112.16.7 05/11/03 18:24:00 ingo@mysql.com +3 -3
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Changed function calls for the secondary fix.

  sql/sql_handler.cc
    1.19.1.28 05/11/03 18:24:00 ingo@mysql.com +45 -4
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    The first two diffs make the primary bug fix.
    The rest is for the secondary fix.

  sql/sql_class.cc
    1.71.1.42 05/11/03 18:24:00 ingo@mysql.com +1 -1
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Changed a function call for the secondary fix.

  sql/sql_base.cc
    1.117.1.76 05/11/03 18:24:00 ingo@mysql.com +4 -3
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Changed function calls for the secondary fix.

  sql/mysql_priv.h
    1.150.16.1 05/11/03 18:24:00 ingo@mysql.com +2 -1
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    Changed a definition for the secondary fix.

  mysql-test/t/handler.test
    1.7.1.10 05/11/03 18:24:00 ingo@mysql.com +29 -0
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    The test case.

  mysql-test/r/handler.result
    1.7.1.10 05/11/03 18:24:00 ingo@mysql.com +18 -0
    Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
    The test result.

ChangeSet
  1.2462 05/11/03 13:02:05 jani@ua141d10.elisa.omakaista.fi +2 -0
  Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.258 05/11/03 13:02:02 jani@ua141d10.elisa.omakaista.fi +1 -2
    Merged from 4.0

  Makefile.am
    1.72.1.2 05/11/03 13:02:02 jani@ua141d10.elisa.omakaista.fi +2 -6
    Merged from 4.0

ChangeSet
  1.1346.1.827 05/11/03 11:47:54 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added test-force to Makefile.

  Makefile.am
    1.40.1.15 05/11/03 11:47:52 jani@ua141d10.elisa.omakaista.fi +4 -0
    Added test-force to Makefile.

ChangeSet
  1.1346.1.826 05/11/03 11:19:06 jani@ua141d10.elisa.omakaista.fi +1 -0
  Added new build script for pentium64.

  BUILD/compile-pentium64-debug-max
    1.1 05/11/03 11:18:14 jani@ua141d10.elisa.omakaista.fi +13 -0

  BUILD/compile-pentium64-debug-max
    1.0 05/11/03 11:18:14 jani@ua141d10.elisa.omakaista.fi +0 -0
    BitKeeper file /home/my/bk/mysql-4.0/BUILD/compile-pentium64-debug-max

ChangeSet
  1.1346.1.825 05/11/03 11:05:52 jani@ua141d10.elisa.omakaista.fi +1 -0
  Changed mysql-test-run to correspond to the one in 5.0 tree.

  mysql-test/mysql-test-run.sh
    1.146.1.55 05/11/03 11:05:50 jani@ua141d10.elisa.omakaista.fi +2 -2
    Changed mysql-test-run to correspond to the one in 5.0 tree.

ChangeSet
  1.2448.15.1 05/11/02 18:29:06 jimw@mysql.com +1 -0
  Don't add optimization flags to CFLAGS if the user specified their
  own CFLAGS (ditto for CXXFLAGS). (Bug #12640)

  configure.in
    1.395.3.1 05/11/02 18:29:03 jimw@mysql.com +13 -0
    Only add optimization flags when no CFLAGS (and/or CXXFLAGS) were specified.

ChangeSet
  1.2459.1.5 05/11/01 11:48:55 jimw@mysql.com +1 -0
  Avoid possible race condition in accessing slave statistics
  during shutdown. (Bug #11796)

  sql/sql_show.cc
    1.206 05/11/01 11:48:53 jimw@mysql.com +7 -4
    Check that active_mi is not NULL before accessing its members.

ChangeSet
  1.2459.1.2 05/11/01 17:34:19 evgen@moonbone.local +2 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into moonbone.local:/work/14186-bug-4.1-mysql

  sql/sql_select.h
    1.78 05/11/01 17:34:18 evgen@moonbone.local +0 -0
    Auto merged

  sql/sql_select.cc
    1.443 05/11/01 17:34:18 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2459.1.1 05/11/01 13:00:02 monty@mysql.com +6 -0
  Review of new pushed code
  Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)
  Mark that add_time(), time_diff() and str_to_date() can return null values

  sql/spatial.cc
    1.23 05/11/01 12:59:53 monty@mysql.com +22 -17
    Simple cleanups during review of new code

  sql/item_timefunc.h
    1.54 05/11/01 12:59:53 monty@mysql.com +1 -0
    Mark that time_diff can return 0

  sql/item_timefunc.cc
    1.93 05/11/01 12:59:53 monty@mysql.com +3 -1
    Mark that add_time and str_to_date() can return null values

  sql/item_func.cc
    1.258 05/11/01 12:59:53 monty@mysql.com +0 -1
    Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort)

  mysql-test/r/func_sapdb.result
    1.9 05/11/01 12:59:53 monty@mysql.com +2 -2
    Fixed test after marking that timediff() can return NULL

  myisam/mi_check.c
    1.156 05/11/01 12:59:53 monty@mysql.com +1 -1
    keyoffset is not a position (no %lx here)

ChangeSet
  1.2460 05/11/01 13:18:46 hf@deer.(none) +4 -0
  Fix for bug #14183 (ctype_cp983.test fails with the embedded server)

  mysql-test/t/ctype_cp932_binlog.test
    1.1 05/11/01 13:17:52 hf@deer.(none) +35 -0

  mysql-test/t/ctype_cp932_binlog.test
    1.0 05/11/01 13:17:52 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/t/ctype_cp932_binlog.test

  mysql-test/r/ctype_cp932_binlog.result
    1.1 05/11/01 13:17:51 hf@deer.(none) +19 -0

  mysql-test/t/ctype_cp932.test
    1.8 05/11/01 13:17:51 hf@deer.(none) +0 -23
    these lines don't work in embedded-server

  mysql-test/r/ctype_cp932_binlog.result
    1.0 05/11/01 13:17:51 hf@deer.(none) +0 -0
    BitKeeper file /home/hf/work/mysql-4.1.14183/mysql-test/r/ctype_cp932_binlog.result

  mysql-test/r/ctype_cp932.result
    1.7 05/11/01 13:17:51 hf@deer.(none) +0 -16
    result fixed

ChangeSet
  1.2457.1.2 05/10/31 15:56:52 jimw@mysql.com +1 -0
  Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)

  scripts/mysql_fix_privilege_tables.sql
    1.13 05/10/31 15:56:48 jimw@mysql.com +1 -1
    Remove extra leading - in comment

ChangeSet
  1.2442.80.1 05/10/31 11:15:44 jimw@mysql.com +1 -0
  Handle decision to use mysqld-max over mysqld within mysqld_safe
  even when --ledir option is specified. (Bug #13774)

  scripts/mysqld_safe.sh
    1.76 05/10/31 11:15:40 jimw@mysql.com +11 -8
    Figure out whether to use mysqld or mysqld-max after we have handled
    the command-line options and .cnf files.

ChangeSet
  1.2457.1.1 05/10/31 18:35:26 joerg@mysql.com +1 -0
  Accept any shared library for "libz", not just the static one. Bug#6584

  acinclude.m4
    1.137 05/10/31 18:35:19 joerg@mysql.com +3 -2
    Accept any shared library for "libz", not just the static one. Bug#6584

ChangeSet
  1.2458 05/10/31 16:28:45 ramil@mysql.com +1 -0
  Check for NULLs only if we don't replace column results,
  get real results after all checks.
  (see bug #14254: func_crypt.test fails on FreeBSD with --ps-protocol).

  client/mysqltest.c
    1.189 05/10/31 16:23:52 ramil@mysql.com +9 -4
    Check for NULLs only if we don't replace column results,
    get real results after all checks.

ChangeSet
  1.2457 05/10/31 12:24:43 hf@deer.(none) +1 -0
  Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
  into deer.(none):/home/hf/work/mysql-4.1.12839

  sql/field.cc
    1.227 05/10/31 12:24:36 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.2432.1.2 05/10/31 12:05:27 hf@deer.(none) +2 -0
  Additional fix for #12839

  sql/spatial.cc
    1.22 05/10/31 12:00:57 hf@deer.(none) +9 -9
    small syntax fixes

  sql/field.cc
    1.226 05/10/31 12:00:57 hf@deer.(none) +1 -2
    This code still could work for VERY out-of-dated databases

ChangeSet
  1.2448.5.6 05/10/28 18:12:57 jimw@mysql.com +3 -0
  Fix bug in handling of decimal fields in UNION statements that could
  cause a crash or write to an incorrect memory location. (Bug #14216)

  sql/item.cc
    1.229 05/10/28 18:12:48 jimw@mysql.com +5 -2
    Set max_length for decimal fields correctly

  mysql-test/t/union.test
    1.88 05/10/28 18:12:48 jimw@mysql.com +18 -0
    Add regression test

  mysql-test/r/union.result
    1.94 05/10/28 18:12:48 jimw@mysql.com +26 -0
    Update results

ChangeSet
  1.2450.3.1 05/10/28 23:31:32 sergefp@mysql.com +3 -0
  Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
  do advance the source pointer over 2 bytes that specify value length.

  mysql-test/t/myisam.test
    1.43 05/10/28 23:31:25 sergefp@mysql.com +18 -0
    Testcase for BUG#13814

  mysql-test/r/myisam.result
    1.55 05/10/28 23:31:25 sergefp@mysql.com +18 -0
    Testcase for BUG#13814

  myisam/mi_key.c
    1.36 05/10/28 23:31:25 sergefp@mysql.com +3 -0
    Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB key segment,
    do advance the source pointer over 2 bytes that specify value length (for NULL value the 
    format is: null_marker 0x01, value length 0x00 0x00, data: 0x00 keyseg->length times).
    We need to advance over 2 bytes separately as keyseg->length doesn't include them.

ChangeSet
  1.2450.2.1 05/10/28 17:16:22 aivanov@mysql.com +1 -0
  Fix BUG#10511: Wrong padding of UCS2 CHAR columns in
   ON UPDATE CASCADE

  innobase/row/row0ins.c
    1.55 05/10/28 17:15:52 aivanov@mysql.com +38 -8
    Patch from Marko is applied

ChangeSet
  1.2450.1.1 05/10/28 15:24:46 evgen@moonbone.local +4 -0
  Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server 
  
  Procedure analyse() redefines select's fields_list. setup_copy_fields() assumes
  that fields_list is a part of all_fields_list. Because select have only 
  3 columns and analyse() redefines it to have 10 columns, int overrun in
  setup_copy_fields() occurs and server goes to almost infinite loop.
  
  Because fields_list used not only to send data ad fields types, it's wrong 
  to allow procedure redefine it. This patch separates select's fileds_list 
  and procedure's one. Now if procedure is present, copy of fields_list is 
  created in procedure_fields_list and it is used for sending data and fields.

  sql/sql_select.cc
    1.442 05/10/28 15:24:03 evgen@moonbone.local +14 -11
    Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
    SELECT's fields_list and procedure's fields_list made split. If procedure is defined
    then procedure's fields_list is used to send fields and data.

  sql/sql_select.h
    1.76.1.1 05/10/28 15:23:34 evgen@moonbone.local +1 -0
    Fix bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server
    To JOIN  Added separate fields_list for procedure.

  mysql-test/r/analyse.result
    1.18 05/10/28 15:23:21 evgen@moonbone.local +26 -0
    Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server

  mysql-test/t/analyse.test
    1.15 05/10/28 15:21:32 evgen@moonbone.local +25 -0
    Test case for bug #14138  ROLLUP and PROCEDURE ANALYSE() hang server

ChangeSet
  1.2451 05/10/28 14:04:06 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
  into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

  include/config-netware.h
    1.10 05/10/28 14:03:59 jani@a193-229-222-105.elisa-laajakaista.fi +0 -0
    Auto merged

ChangeSet
  1.1346.860.1 05/10/28 14:01:00 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  NetWare specific change to use a LibC API instead of a
  kernel function to prevent CPU hogs.

  include/config-netware.h
    1.4.1.3 05/10/28 14:00:56 jani@a193-229-222-105.elisa-laajakaista.fi +1 -4
    NetWare specific change to use a LibC API instead of a
    kernel function to prevent CPU hogs.

ChangeSet
  1.2448.12.8 05/10/28 10:46:07 lenz@mysql.com +1 -0
   - fixed RPM spec file list after merge, removed dupes

  support-files/mysql.spec.sh
    1.109 05/10/28 10:45:43 lenz@mysql.com +2 -7
     - fixed file list after merge, removed dupes

ChangeSet
  1.2448.14.1 05/10/28 01:24:11 evgen@moonbone.local +5 -0
  Fix bug#14186 select datefield is null not updated
  
  Date field was declared as not null, thus expression 'datefield is null'
  was always false. For SELECT special handling of such cases is used. 
  There 'datefield is null' converted to 'datefield eq "0000-00-00"'.
  
  In mysql_update() before creation of select added remove_eq_conds() call.
  It makes some optimization of conds and in particular performs conversion
  from 'is null' to 'eq'. 
  Also remove_eq_conds() makes some evaluation of conds and if it founds that
  conds is always false then update statement is not processed further.
  All this allows to perform some update statements process faster due to
  optimized conds, and not wasting resources if conds known to be false. 

  sql/sql_update.cc
    1.147 05/10/28 01:23:05 evgen@moonbone.local +12 -4
    Fix bug#14186  select datefield is null not updated
    To mysql_update() added call to remove_eq_conds() to optimize conds and convert 'datefield is null' to 'datefield eq 0000-00-00'

  mysql-test/t/update.test
    1.25 05/10/28 01:19:13 evgen@moonbone.local +9 -0
    Test case for  bug#14186  select datefield is null not updated

  mysql-test/r/update.result
    1.27 05/10/28 01:17:34 evgen@moonbone.local +8 -0
    Test case for  bug#14186  select datefield is null not updated

  sql/sql_select.h
    1.77 05/10/28 01:15:33 evgen@moonbone.local +1 -0
     Fix bug#14186  select datefield is null not updated
    Added remove_eq_conds() prototype.

  sql/sql_select.cc
    1.440.1.1 05/10/28 01:14:17 evgen@moonbone.local +1 -3
    Fix bug#14186  select datefield is null not updated
    Remove static from remove_eq_conds()

ChangeSet
  1.2450 05/10/27 10:20:38 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-14009
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item_func.cc
    1.257 05/10/27 10:20:35 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2448.12.7 05/10/27 18:34:20 lenz@mysql.com +1 -0
  Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0
  into mysql.com:/data0/mysqldev/lenz/mysql-4.1

  netware/BUILD/compile-linux-tools
    1.7 05/10/27 18:34:19 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.1.824 05/10/27 18:32:14 mysqldev@mysql.com +5 -0
   - cleanup: removed the empty NEW-RPMS directory and all references
   - cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
     script (we now use Do-pkg for building OS X packages)

  netware/BUILD/compile-netware-src
    1.2 05/10/27 18:31:47 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  netware/BUILD/compile-netware-END
    1.5 05/10/27 18:31:47 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  netware/BUILD/compile-linux-tools
    1.4.1.1 05/10/27 18:31:46 mysqldev@mysql.com +0 -1
     - removed reference to the NEW-RPMS directory

  BitKeeper/deleted/.del-make_mysql_pkg.pl~caac82eb901cc206
    1.4 05/10/27 18:15:43 mysqldev@mysql.com +0 -0
    Delete: support-files/MacOSX/make_mysql_pkg.pl

  BitKeeper/deleted/.del-.cvsignore~4c7a1f88a5a62a24
    1.3 05/10/27 18:14:12 mysqldev@mysql.com +0 -0
    Delete: NEW-RPMS/.cvsignore

ChangeSet
  1.2448.12.6 05/10/27 16:53:14 lenz@mysql.com +2 -0
   - after merge fixes

  support-files/mysql.spec.sh
    1.108 05/10/27 16:53:09 lenz@mysql.com +5 -0
     - after-merge fix

  configure.in
    1.395.1.3 05/10/27 16:47:56 lenz@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2448.13.2 05/10/27 18:36:11 evgen@moonbone.local +1 -0
  select.result:
    After merge fix

  mysql-test/r/select.result
    1.70 05/10/27 18:35:50 evgen@moonbone.local +8 -8
    After merge fix

ChangeSet
  1.2448.13.1 05/10/27 17:44:28 evgen@moonbone.local +5 -0
  Manually merged

  netware/mysql_test_run.c
    1.14 05/10/27 17:44:26 evgen@moonbone.local +1 -2
    Manually merged

  mysql-test/t/select.test
    1.53 05/10/27 17:44:26 evgen@moonbone.local +0 -0
    Manuall merged fix for bug#13855

  mysql-test/r/select.result
    1.69 05/10/27 17:44:26 evgen@moonbone.local +0 -0
    Manually merged fix for bug#13855

  sql/sql_select.cc
    1.441 05/10/27 17:36:17 evgen@moonbone.local +0 -0
    Auto merged

  include/config-netware.h
    1.9 05/10/27 17:36:17 evgen@moonbone.local +0 -4
    Auto merged

ChangeSet
  1.1346.1.823 05/10/27 14:51:58 lenz@mysql.com +18 -0
   - Removed obsolete and outdated man page files from the man
     directory - these files are now maintained in the mysqldoc
     repository and included in the source distribution during the
     release build. Updated the configure.in script and Makefiles to
     create the man page file list at build time
   - Updated the file list in the RPM spec file to include all currently
     available man pages (this can not be done with wildcards, as
     the man pages are spread across several subpackages. However, RPM
     warns about unpackaged files, so newly added man pages can be 
     spotted)

  support-files/mysql.spec.sh
    1.61.1.34 05/10/27 14:51:29 lenz@mysql.com +25 -9
     - adjusted file list: added man pages that are now part of the
       official source distribution (taken from the documentation
       server)

  man/mysqlman.1
    1.4 05/10/27 14:51:29 lenz@mysql.com +1 -1
     - removed version number

  man/Makefile.am
    1.10 05/10/27 14:51:29 lenz@mysql.com +2 -24
     - removed hard-coded list of man pages, the list is populated
       during the configure stage. When building from BK, only one
       placeholder file exists. For the release builds, this directory
       is populated by the Bootstrap script, which takes man page files
       from the documentation server.

  configure.in
    1.191.1.142 05/10/27 14:51:29 lenz@mysql.com +4 -0
     - dynamically add man pages included in the man directory
       (the BK tree only contains one dummy file, the directory is
       populated by the Bootstrap script by copying current man pages
       from the documentation server)

ChangeSet
  1.2448.12.3 05/10/27 17:40:21 bar@mysql.com +1 -0
  conf_to_src.c:
    Dump MY_CS_CSSORT when it's necessary.

  strings/conf_to_src.c
    1.15 05/10/27 17:39:10 bar@mysql.com +11 -2
    Dump MY_CS_CSSORT when it's necessary.

ChangeSet
  1.2448.12.2 05/10/27 16:48:49 bar@mysql.com +1 -0
  conf_to_src.c:
    Updating to conform the current CHARSET_INFO structure.

  strings/conf_to_src.c
    1.14 05/10/27 16:48:00 bar@mysql.com +40 -26
    Updating to conform the current structure.

ChangeSet
  1.2448.1.18 05/10/26 09:22:47 patg@krsna.patg.net +2 -0
  Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  krsna.patg.net:/home/patg/mysql-build/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.257 05/10/26 09:22:38 patg@krsna.patg.net +0 -0
    Auto merged

  mysql-test/mysql-test-run.pl
    1.50 05/10/26 09:22:38 patg@krsna.patg.net +0 -0
    Auto merged

ChangeSet
  1.2448.11.1 05/10/26 20:06:08 aivanov@mysql.com +33 -0
  Removed innobase/my_cnf, innobase/include/makefilewin.i,
   and innobase/*/makefilewin (which are unused now).

  innobase/include/Makefile.am
    1.11 05/10/26 20:05:58 aivanov@mysql.com +1 -1
    Removed ref to Makefilewin.i (it is unused now).

ChangeSet
  1.2448.1.17 05/10/26 16:12:41 jani@a193-229-222-105.elisa-laajakaista.fi +1 -0
  Imported fix from 5.0.

  netware/mysql_test_run.c
    1.13 05/10/26 16:12:34 jani@a193-229-222-105.elisa-laajakaista.fi +1 -1
    Imported fix from 5.0.

  BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c
    1.9 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/replace.1.in

  BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c
    1.11 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/perror.1.in

  BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f
    1.10 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysqlshow.1.in

  BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624
    1.9 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysql_zap.1.in

  BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325
    1.7 05/10/26 15:02:10 lenz@mysql.com +0 -0
    Delete: man/mysql_fix_privilege_tables.1.in

  BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5
    1.13 05/10/26 15:02:09 lenz@mysql.com +0 -0
    Delete: man/mysqldump.1.in

  BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b
    1.11 05/10/26 15:02:09 lenz@mysql.com +0 -0
    Delete: man/mysqld_safe.1.in

  BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6
    1.9 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqld_multi.1.in

  BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c
    1.10 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqld.1.in

  BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769
    1.10 05/10/26 15:02:08 lenz@mysql.com +0 -0
    Delete: man/mysqladmin.1.in

  BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf
    1.12 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/mysqlaccess.1.in

  BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a
    1.13 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/mysql.1.in

  BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19
    1.9 05/10/26 15:02:07 lenz@mysql.com +0 -0
    Delete: man/isamlog.1.in

  BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962
    1.10 05/10/26 15:02:06 lenz@mysql.com +0 -0
    Delete: man/isamchk.1.in

  man/mysqlman.1
    1.3 05/10/26 15:01:42 lenz@mysql.com +0 -0
    Rename: man/mysqlman.1.in -> man/mysqlman.1

  BitKeeper/deleted/.del-my_cnf~977f69858affc57b
    1.2 05/10/26 15:58:13 aivanov@mysql.com +0 -0
    Delete: innobase/my_cnf

  BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd
    1.2 05/10/26 15:57:43 aivanov@mysql.com +0 -0
    Delete: innobase/makefilewin

  BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79
    1.2 05/10/26 15:57:27 aivanov@mysql.com +0 -0
    Delete: innobase/ut/makefilewin

  BitKeeper/deleted/.del-makefilewin~72a64128bacce71b
    1.2 05/10/26 15:57:19 aivanov@mysql.com +0 -0
    Delete: innobase/usr/makefilewin

  BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de
    1.2 05/10/26 15:57:12 aivanov@mysql.com +0 -0
    Delete: innobase/trx/makefilewin

  BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb
    1.2 05/10/26 15:57:01 aivanov@mysql.com +0 -0
    Delete: innobase/thr/makefilewin

  BitKeeper/deleted/.del-makefilewin~13888739357b3025
    1.3 05/10/26 15:56:51 aivanov@mysql.com +0 -0
    Delete: innobase/sync/makefilewin

  BitKeeper/deleted/.del-makefilewin~63acd666293282a
    1.2 05/10/26 15:56:44 aivanov@mysql.com +0 -0
    Delete: innobase/srv/makefilewin

  BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd
    1.2 05/10/26 15:56:29 aivanov@mysql.com +0 -0
    Delete: innobase/row/makefilewin

  BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34
    1.2 05/10/26 15:56:21 aivanov@mysql.com +0 -0
    Delete: innobase/rem/makefilewin

  BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365
    1.2 05/10/26 15:56:15 aivanov@mysql.com +0 -0
    Delete: innobase/read/makefilewin

  BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7
    1.2 05/10/26 15:56:08 aivanov@mysql.com +0 -0
    Delete: innobase/que/makefilewin

  BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be
    1.2 05/10/26 15:56:01 aivanov@mysql.com +0 -0
    Delete: innobase/pars/makefilewin

  BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5
    1.2 05/10/26 15:55:53 aivanov@mysql.com +0 -0
    Delete: innobase/page/makefilewin

  BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b
    1.3 05/10/26 15:55:29 aivanov@mysql.com +0 -0
    Delete: innobase/os/makefilewin

  BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8
    1.2 05/10/26 15:55:19 aivanov@mysql.com +0 -0
    Delete: innobase/mtr/makefilewin

  BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db
    1.2 05/10/26 15:55:13 aivanov@mysql.com +0 -0
    Delete: innobase/mem/makefilewin

  BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0
    1.2 05/10/26 15:55:05 aivanov@mysql.com +0 -0
    Delete: innobase/mach/makefilewin

  BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac
    1.2 05/10/26 15:54:59 aivanov@mysql.com +0 -0
    Delete: innobase/log/makefilewin

  BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5
    1.2 05/10/26 15:54:52 aivanov@mysql.com +0 -0
    Delete: innobase/lock/makefilewin

  BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e
    1.2 05/10/26 15:53:50 aivanov@mysql.com +0 -0
    Delete: innobase/ibuf/makefilewin

  BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3
    1.2 05/10/26 15:53:43 aivanov@mysql.com +0 -0
    Delete: innobase/ha/makefilewin

  BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db
    1.2 05/10/26 15:53:37 aivanov@mysql.com +0 -0
    Delete: innobase/fut/makefilewin

  BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73
    1.2 05/10/26 15:53:30 aivanov@mysql.com +0 -0
    Delete: innobase/fsp/makefilewin

  BitKeeper/deleted/.del-makefilewin~4d139e182457e553
    1.2 05/10/26 15:53:23 aivanov@mysql.com +0 -0
    Delete: innobase/fil/makefilewin

  BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95
    1.2 05/10/26 15:53:16 aivanov@mysql.com +0 -0
    Delete: innobase/eval/makefilewin

  BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f
    1.2 05/10/26 15:53:07 aivanov@mysql.com +0 -0
    Delete: innobase/dyn/makefilewin

  BitKeeper/deleted/.del-makefilewin~5104767c73775697
    1.2 05/10/26 15:52:59 aivanov@mysql.com +0 -0
    Delete: innobase/dict/makefilewin

  BitKeeper/deleted/.del-makefilewin~d37b6b303348c871
    1.2 05/10/26 15:52:22 aivanov@mysql.com +0 -0
    Delete: innobase/data/makefilewin

  BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995
    1.2 05/10/26 15:52:12 aivanov@mysql.com +0 -0
    Delete: innobase/buf/makefilewin

  BitKeeper/deleted/.del-makefilewin~78000390c783b1c5
    1.2 05/10/26 15:51:58 aivanov@mysql.com +0 -0
    Delete: innobase/btr/makefilewin

  BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2
    1.2 05/10/26 15:50:37 aivanov@mysql.com +0 -0
    Delete: innobase/include/makefilewin.i

ChangeSet
  1.2448.1.16 05/10/26 01:24:03 kent@mysql.com +1 -0
  mysql-test-run.pl:
    Added MTR_BUILD_THREAD to control the port range

  mysql-test/mysql-test-run.pl
    1.48.1.1 05/10/26 01:23:26 kent@mysql.com +29 -3
    Added MTR_BUILD_THREAD to control the port range

ChangeSet
  1.2448.10.1 05/10/25 14:50:08 patg@krsna.patg.net +5 -0
  BUG# 12123
  
  Made change to mysqlimport to set character_set_database to binary to 
  make importing various charsets/columns work correctly.

  mysql-test/t/mysqldump.test
    1.41 05/10/25 14:49:54 patg@krsna.patg.net +12 -0
    BUG #12123
    
    Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
    show that this fix handles dumping and reloading of non-latin1 charsets
    in table with different charset columns (mixing of charsets, also can be a
    UTF table with latin1 tables). Note the select before and after dump and 
    restore - should be exact. (results of this)

  mysql-test/r/mysqldump.result
    1.50 05/10/25 14:49:54 patg@krsna.patg.net +10 -0
    BUG #12123
    
    Added dumping and reloading (using mysql, mysqldump, and mysqlimport) to
    show that this fix handles dumping and reloading of non-latin1 charsets
    in table with different charset columns (mixing of charsets, also can be a
    UTF table with latin1 tables). Note the select before and after dump and 
    restore - should be exact.

  mysql-test/mysql-test-run.sh
    1.255.1.1 05/10/25 14:49:54 patg@krsna.patg.net +8 -1
    BUG #12123
    
    Added $MYSQL_IMPORT in order to test mysqlimport bug.

  mysql-test/mysql-test-run.pl
    1.49 05/10/25 14:49:54 patg@krsna.patg.net +11 -0
    BUG #12123
    
    Added $MYSQL_IMPORT in order to test mysqlimport bug.

  client/mysqlimport.c
    1.52 05/10/25 14:49:54 patg@krsna.patg.net +7 -0
    BUG# 12123
    
    Added 'set @@character_set_database=binary' to make loading of tables with
    mixed charset types and non-latin characters load.

ChangeSet
  1.2448.9.1 05/10/26 00:56:17 sergefp@mysql.com +5 -0
  BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
  avoid multiplying length of field_X by charset->mbmaxlen twice when calculating space 
  required for field_X in the new table.

  sql/sql_table.cc
    1.303 05/10/26 00:56:10 sergefp@mysql.com +2 -2
    BUG#14139: When handling "CREATE TABLE(field_X type_spec,...) SELECT smth AS field_X, ...."
    we get two instances of create_field: (1) is occurence of field_X in create list, and (2) is
    in select list. If we figure they both refer to the same field, we "join" them according to
    some rule that is not explicitly specified anywhere.
    When we do this "join", create_field::length already contains length-in-bytes for both, so
    when we transfer field length (in characters) from (1) to (2), use length-in-characters that
    we have saved in create_length::chars_length.

  sql/field.h
    1.130 05/10/26 00:56:10 sergefp@mysql.com +8 -0
    BUG#14139: Add create_length::chars_length where we save length-in-characters, added comments.

  sql/field.cc
    1.224.1.1 05/10/26 00:56:10 sergefp@mysql.com +12 -0
    BUG#14139: Make create_length_to_internal_length() save length-in-characters in 
    create_field::chars_length.

  mysql-test/t/create.test
    1.60 05/10/26 00:56:10 sergefp@mysql.com +8 -0
    Testcase for BUG#14139

  mysql-test/r/create.result
    1.86 05/10/26 00:56:10 sergefp@mysql.com +11 -0
    Testcase for BUG#14139

ChangeSet
  1.2448.5.5 05/10/25 10:11:47 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-12925
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  tests/mysql_client_test.c
    1.161 05/10/25 10:11:44 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.79.1 05/10/25 10:10:53 jimw@mysql.com +3 -0
  Fix incorrect casts in my_getopt code that capped the maximum of longlong
  options to the wrong value. (Bug #12925)

  tests/mysql_client_test.c
    1.158.1.1 05/10/25 10:10:47 jimw@mysql.com +19 -0
    Add test case for Bug #12925 (my_getopt bug)

  mysys/my_getopt.c
    1.51 05/10/25 10:10:47 jimw@mysql.com +3 -3
    Remove incorrect and unnecessary casts

  mysql-test/t/mysql_client_test.test
    1.14 05/10/25 10:10:47 jimw@mysql.com +2 -2
    Add parameter for testing getopt bug

ChangeSet
  1.2448.8.1 05/10/25 20:37:26 evgen@moonbone.local +3 -0
  Fix bug #14016 date_format() 2nd parameter was compared using case insensitive 
  collation
  
  By default constant strings in second parameter of date_time() have case
  insensitive collation. Because of this expressions date_format(f,'%m') and 
  date_format(f,'%M') wrongly becomes equal, which results in choosing wrong 
  column to sort by.
  
  Now if second parameter of date_format() is constant then it's collation is 
  changed to case sensitive.

  mysql-test/t/date_formats.test
    1.13 05/10/25 20:35:50 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  mysql-test/r/date_formats.result
    1.16 05/10/25 20:35:31 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  sql/item_timefunc.cc
    1.92 05/10/25 20:33:04 evgen@moonbone.local +10 -0
    Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
    If second parameter of date_format() is constant then it's collation is changed to case sensitive.

ChangeSet
  1.2448.7.1 05/10/25 20:04:12 evgen@moonbone.local +3 -0
  Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATE
  
  VALUES() can only refer to table insert going to. 
  But Item_insert_value::fix_fields() were passing to it's arg full table list,
  This results in finding second column which shouldn't be found, and
  failing with error about ambiguous field.
  
  Item_insert_value::fix_fields() now passes only first table of full table
  list.

  mysql-test/t/insert_select.test
    1.23 05/10/25 20:02:30 evgen@moonbone.local +12 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  mysql-test/r/insert_select.result
    1.29 05/10/25 20:02:11 evgen@moonbone.local +8 -0
    Test case for bug#14016 2nd parameter was compared using case insensitive collation

  sql/item.cc
    1.228 05/10/25 20:01:39 evgen@moonbone.local +7 -0
    Fix bug #14016 date_format() 2nd parameter was compared using case insensitive collation.
    If second parameter of date_format() is constant then it's collation is changed to case sensitive.

ChangeSet
  1.1346.859.1 05/10/25 16:56:25 jani@ua141d10.elisa.omakaista.fi +2 -0
  Imported fixes from 4.1 and 5.0 to 4.0.

  netware/mysql_test_run.c
    1.5.1.4 05/10/25 16:56:21 jani@ua141d10.elisa.omakaista.fi +1 -1
    Imported fixes from 4.1 and 5.0 to 4.0.

  include/config-netware.h
    1.4.1.2 05/10/25 16:56:21 jani@ua141d10.elisa.omakaista.fi +4 -0
    Imported fixes from 4.1 and 5.0 to 4.0.

ChangeSet
  1.2448.6.1 05/10/25 14:49:04 bar@mysql.com +3 -0
    Bug#13347: empty result from query with like and cp1250 charset
  ctype-win1250ch.c:
    Like range prefix tables were wrong.
  ctype_cp1250_ch.result, ctype_cp1250_ch.test:
    Adding test case.

  mysql-test/r/ctype_cp1250_ch.result
    1.3 05/10/25 14:47:57 bar@mysql.com +23 -0
    Adding test case.

  mysql-test/t/ctype_cp1250_ch.test
    1.4 05/10/25 14:47:52 bar@mysql.com +21 -0
    Adding test case.

  strings/ctype-win1250ch.c
    1.47 05/10/25 14:46:59 bar@mysql.com +76 -34
    Bug#13347: empty result from query with like and cp1250 charset
    Like range prefix tables were wrong.

ChangeSet
  1.2448.5.1 05/10/25 12:12:10 jani@ua141d10.elisa.omakaista.fi +1 -0
  Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

  myisam/mi_check.c
    1.155 05/10/25 12:12:05 jani@ua141d10.elisa.omakaista.fi +0 -0
    Auto merged

ChangeSet
  1.2448.4.1 05/10/25 12:11:31 jani@ua141d10.elisa.omakaista.fi +2 -0
  Changed some dbug print options.

  myisam/mi_delete.c
    1.32 05/10/25 12:11:26 jani@ua141d10.elisa.omakaista.fi +4 -2
    Changed print style for keypos.

  myisam/mi_check.c
    1.151.1.1 05/10/25 12:11:26 jani@ua141d10.elisa.omakaista.fi +4 -3
    Changed print style for keyoffset.

ChangeSet
  1.2448.1.14 05/10/25 02:36:51 kent@mysql.com +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
  into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  mysql-test/mysql-test-run.sh
    1.256 05/10/25 02:36:47 kent@mysql.com +3 -1

  Makefile.am
    1.72.1.1 05/10/25 02:34:03 kent@mysql.com +3 -10

ChangeSet
  1.1346.857.2 05/10/25 02:27:55 kent@mysql.com +2 -0
  Makefile.am:
    Option to set environment variable MTR_BUILD_THREAD to a small
    number, from what mysql-test-run calculate port numbers that
    will not conflict with other runs with different thread num

  mysql-test/mysql-test-run.sh
    1.146.1.54 05/10/25 02:27:08 kent@mysql.com +17 -0

  Makefile.am
    1.40.1.14 05/10/25 02:25:52 kent@mysql.com +8 -9
    Option to set environment variable MTR_BUILD_THREAD to a small
    number, from what mysql-test-run calculate port numbers that
    will not conflict with other runs with different thread num

ChangeSet
  1.2448.1.13 05/10/25 02:27:40 monty@mysql.com +15 -0
  Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  sql/structs.h
    1.42 05/10/25 02:27:29 monty@mysql.com +0 -1
    Removed not needed structure element

  sql/sql_update.cc
    1.146 05/10/25 02:27:29 monty@mysql.com +11 -13
    Simplify code
    Fixed bug when one is updating an index column that could be used with ORDER BY

  sql/sql_load.cc
    1.86 05/10/25 02:27:29 monty@mysql.com +2 -5
    Simplify 

  sql/records.cc
    1.32 05/10/25 02:27:29 monty@mysql.com +86 -102
    Simplify new rr_index() code
    Create common error handling function for rr_() functions.
    Remove loop from rr_index() as handler::index_next() can never return HA_ERR_RECORD_DELETED

  mysys/my_handler.c
    1.21 05/10/25 02:27:29 monty@mysql.com +3 -11
    Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument
    (This removes an if in a loop at the expensive of an int on the stack)

  mysql-test/t/update.test
    1.24 05/10/25 02:27:29 monty@mysql.com +9 -4
    Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  mysql-test/r/update.result
    1.26 05/10/25 02:27:29 monty@mysql.com +23 -8
    Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization

  myisammrg/myrg_queue.c
    1.11 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  myisam/mi_write.c
    1.49 05/10/25 02:27:29 monty@mysql.com +3 -3
    Change arguments to ha_key_cmp

  myisam/mi_search.c
    1.55 05/10/25 02:27:29 monty@mysql.com +9 -9
    Change arguments to ha_key_cmp

  myisam/mi_rnext_same.c
    1.17 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  myisam/mi_check.c
    1.154 05/10/25 02:27:29 monty@mysql.com +18 -18
    Change arguments to ha_key_cmp

  include/my_base.h
    1.64 05/10/25 02:27:29 monty@mysql.com +0 -2
    Remove SEARCH_RETURN_B_POS and instead always send an array to ha_key_cmp() as last argument

  heap/hp_create.c
    1.18 05/10/25 02:27:29 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

  heap/_check.c
    1.17 05/10/25 02:27:28 monty@mysql.com +2 -2
    Change arguments to ha_key_cmp

ChangeSet
  1.2448.1.12 05/10/23 02:49:57 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2

  sql/mysqld.cc
    1.605 05/10/23 02:49:55 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.78.2 05/10/23 02:46:10 sergefp@mysql.com +3 -0
  BUG#9622: post-review-fixes: better comments

  mysys/my_handler.c
    1.20 05/10/23 02:46:04 sergefp@mysql.com +19 -7
    BUG#9622: post-review-fixes: better comments

  myisam/mi_check.c
    1.153 05/10/23 02:46:04 sergefp@mysql.com +32 -22
    BUG#9622: post-review-fixes: better comments

  include/myisam.h
    1.66 05/10/23 02:46:04 sergefp@mysql.com +1 -1
    BUG#9622: post-review-fixes: better comments

ChangeSet
  1.2448.1.11 05/10/21 19:54:34 jimw@mysql.com +2 -0
  Fix merge of test that left out a drop table.

  mysql-test/t/loaddata.test
    1.10 05/10/21 19:54:29 jimw@mysql.com +1 -0
    Add missing drop table

  mysql-test/r/loaddata.result
    1.17 05/10/21 19:54:29 jimw@mysql.com +1 -0
    Update esults

ChangeSet
  1.2448.1.10 05/10/21 17:57:51 jimw@mysql.com +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-11203
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  mysql-test/t/loaddata.test
    1.9 05/10/21 17:57:47 jimw@mysql.com +2 -2
    Resolve conflict

  mysql-test/r/loaddata.result
    1.16 05/10/21 17:57:47 jimw@mysql.com +0 -0
    Resolve conflict

  sql/sql_load.cc
    1.85 05/10/21 17:56:51 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2448.1.9 05/10/21 14:56:59 serg@serg.mylan +1 -0
  compilation failure fixed

  sql/item.cc
    1.227 05/10/21 14:56:47 serg@serg.mylan +1 -1
    compilation failure fixed

ChangeSet
  1.2448.1.8 05/10/21 14:41:56 bar@mysql.com +4 -0
    Bug#13233
    select distinct char(column) fails with utf8
  ctype_utf8.result, ctype_utf8.test:
    Adding test case
  sql_yacc.yy:
    Adding new syntax.
  item_strfunc.h:
    Fixing wrong max_length calculation.
    Also, adding CHAR(x USING charset),
    for easier migrating from 4.1 to 5.0,
    according to Monty's suggestion.

  mysql-test/r/ctype_utf8.result
    1.67 05/10/21 14:40:47 bar@mysql.com +9 -0
    Adding test case

  mysql-test/t/ctype_utf8.test
    1.69 05/10/21 14:40:42 bar@mysql.com +9 -0
    Adding test case

  sql/sql_yacc.yy
    1.396 05/10/21 14:39:55 bar@mysql.com +2 -0
    Adding new syntax.

  sql/item_strfunc.h
    1.97 05/10/21 14:38:58 bar@mysql.com +6 -3
    Bug#13233
    select distinct char(column) fails with utf8
    Also, adding CHAR(x USING charset),
    for easier migrating from 4.1 to 5.0.

ChangeSet
  1.2442.11.8 05/10/21 06:41:49 jonas@perch.ndb.mysql.com +2 -0
  bug#14199 - ndb leak of index opertaions in TC leading to error 288

  ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.60 05/10/21 06:41:46 jonas@perch.ndb.mysql.com +29 -1
    New dump for index operation count
    Fix leak on index ops

  ndb/include/kernel/signaldata/DumpStateOrd.hpp
    1.4 05/10/21 06:41:46 jonas@perch.ndb.mysql.com +2 -0
    New dump for index operation count

ChangeSet
  1.2442.78.1 05/10/21 06:29:17 sergefp@mysql.com +12 -0
  BUG#9622, stage 2, work together with fix for BUG#12232:
  added "nulls_ignored" index statistics collection method for MyISAM tables.
  (notification trigger: this is about BUG#9622).

  sql/mysqld.cc
    1.602.3.1 05/10/21 06:29:11 sergefp@mysql.com +16 -5
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  sql/ha_myisam.cc
    1.162 05/10/21 06:29:11 sergefp@mysql.com +1 -1
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  mysys/my_handler.c
    1.19 05/10/21 06:29:11 sergefp@mysql.com +97 -2
    BUG#9622: ha_key_cmp() now supports new SEARCH_RETURN_B_POS flag, added ha_find_null()

  mysql-test/t/myisam.test
    1.42 05/10/21 06:29:11 sergefp@mysql.com +19 -0
    Testcase for BUG9622

  mysql-test/r/myisam.result
    1.54 05/10/21 06:29:11 sergefp@mysql.com +32 -0
    Testcase for BUG9622

  myisam/sort.c
    1.45 05/10/21 06:29:11 sergefp@mysql.com +6 -2
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  myisam/myisamdef.h
    1.81 05/10/21 06:29:11 sergefp@mysql.com +7 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  myisam/myisamchk.c
    1.129 05/10/21 06:29:11 sergefp@mysql.com +20 -4
    BUG#9622: Added nulls_ignored index statistics collection method for MyISAM

  myisam/mi_check.c
    1.152 05/10/21 06:29:11 sergefp@mysql.com +161 -15
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method, added 
     mi_collect_stats_*(), updated update_key_parts() to deal with all 3 methods. 

  include/myisam.h
    1.65 05/10/21 06:29:11 sergefp@mysql.com +12 -2
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method.

  include/my_handler.h
    1.6 05/10/21 06:29:11 sergefp@mysql.com +2 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method: added ha_find_null()

  include/my_base.h
    1.63 05/10/21 06:29:11 sergefp@mysql.com +2 -0
    BUG#9622: Added MI_STATS_METHOD_IGNORE_NULLS statistics collection method:
    Added SEARCH_RETURN_B_POS flag for ha_key_cmp()

ChangeSet
  1.2448.1.5 05/10/20 10:30:51 bar@mysql.com +1 -0
  charset.c:
    Bug#13238 mysqldump and mysqladmin hangs
    Avoid recursion into init_available_charsets.
    Serg's version didn't work for me: I got 
    double mutex locking.
    Pushing this version instead
    (It was approved by Serg anyway)

  mysys/charset.c
    1.143 05/10/20 10:29:06 bar@mysql.com +19 -12
    Bug#13238 mysqldump and mysqladmin hangs
    Avoid recursion into init_available_charsets.
    Serg's version didn't work for me: I got 
    double mutex locking.
    Pushing this version instead
    (It was approved by Serg anyway)

ChangeSet
  1.2442.77.1 05/10/19 18:01:23 aivanov@mysql.com +1 -0
  Fix for BUG#4375: Windows specific directories are copied
   during replication.
   Modified my_dir(). Now this function skips hidden and system
   files which sometimes are created by Windows.
   NOTE. The fix is similar to the previuos one (05 July 2004)
   except for correct setting of the 'attrib' variable value
   (within the previous fix this variable was left uninitialized
   when my_dir() was called with My_flags & MY_WANT_STAT == 0).

  mysys/my_lib.c
    1.21 05/10/19 18:01:08 aivanov@mysql.com +13 -2
    Modified my_dir().
     Now this function skips hidden and system files
     which sometimes are created by Windows.

ChangeSet
  1.2448.3.2 05/10/18 09:45:12 jimw@mysql.com +1 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-13334
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/mysqld.cc
    1.604 05/10/18 09:45:09 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2448.2.1 05/10/18 18:03:26 jani@ua141d10.elisa.omakaista.fi +5 -0
  Some fixes to avoid compiler warnings.

  strings/ctype-ucs2.c
    1.45 05/10/18 18:03:21 jani@ua141d10.elisa.omakaista.fi +1 -1
    Added cast.

  strings/ctype-simple.c
    1.67 05/10/18 18:03:20 jani@ua141d10.elisa.omakaista.fi +1 -1
    Added cast.

  sql/item_func.cc
    1.255.1.1 05/10/18 18:03:20 jani@ua141d10.elisa.omakaista.fi +0 -1
    Removed unused variables.

  mysql-test/mysql_test_run_new.c
    1.11 05/10/18 18:03:20 jani@ua141d10.elisa.omakaista.fi +0 -1
    Removed unused variable.

  mysql-test/my_manage.c
    1.8 05/10/18 18:03:20 jani@ua141d10.elisa.omakaista.fi +4 -1
    Avoid warning: i not used in case of Windows.

ChangeSet
  1.2448.1.1 05/10/18 14:08:50 sergefp@mysql.com +1 -0
  Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/home/psergey/mysql-4.1-bug12915-r2

  sql/sql_update.cc
    1.145 05/10/18 14:08:49 sergefp@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.44.2 05/10/18 14:04:14 sergefp@mysql.com +2 -0
  BUG#12915: post-review fixes

  sql/records.cc
    1.31 05/10/18 14:04:07 sergefp@mysql.com +11 -8
    BUG#12915: post-review fixes

  sql/opt_range.cc
    1.144 05/10/18 14:04:07 sergefp@mysql.com +7 -5
    BUG#12915: post-review fixes

ChangeSet
  1.2449 05/10/17 17:00:42 jimw@mysql.com +3 -0
  Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009)

  sql/item_func.cc
    1.256 05/10/17 17:00:35 jimw@mysql.com +1 -0
    Set maybe_null in Item_func_abs::fix_length_and_dec().

  mysql-test/t/func_math.test
    1.18 05/10/17 17:00:35 jimw@mysql.com +10 -0
    Add new regression test

  mysql-test/r/func_math.result
    1.25 05/10/17 17:00:35 jimw@mysql.com +6 -0
    Add new results

ChangeSet
  1.2442.11.7 05/10/17 09:51:16 jonas@perch.ndb.mysql.com +1 -0
  ndb - hugo
    Disable tests of lock upgrade paths that are currently unsupported

  ndb/test/ndbapi/testOperations.cpp
    1.12 05/10/17 09:51:13 jonas@perch.ndb.mysql.com +3 -0
    Disable lock upgrade paths that currently unsupported

ChangeSet
  1.2442.73.4 05/10/14 15:34:52 guilhem@mysql.com +4 -0
  fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
  because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.

  sql/sql_class.cc
    1.202 05/10/14 15:34:49 guilhem@mysql.com +2 -0
    query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
    because they are used by net_printf() and push_warning(), which may be called if check_connection() fails.

  sql/slave.cc
    1.279 05/10/14 15:34:49 guilhem@mysql.com +0 -1
    not needed anymore

  sql/repl_failsafe.cc
    1.62 05/10/14 15:34:49 guilhem@mysql.com +0 -1
    not needed anymore

  sql/mysqld.cc
    1.602.1.3 05/10/14 15:34:49 guilhem@mysql.com +0 -1
    not needed anymore

ChangeSet
  1.2442.76.1 05/10/14 11:23:02 mskold@mysql.com +1 -0
  Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)

  sql/ha_ndbcluster.cc
    1.173 05/10/14 11:22:51 mskold@mysql.com +16 -14
    Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)

ChangeSet
  1.2445 05/10/14 14:07:22 bar@mysql.com +1 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
  into  mysql.com:/usr/home/bar/mysql-4.1

  client/mysql.cc
    1.214 05/10/14 14:07:16 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2444 05/10/14 13:57:38 bar@mysql.com +2 -0
  Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
  into  mysql.com:/usr/home/bar/mysql-4.1

  mysql-test/t/ctype_latin1.test
    1.7 05/10/14 13:57:27 bar@mysql.com +0 -0
    Auto merged

  mysql-test/r/ctype_latin1.result
    1.7 05/10/14 13:57:27 bar@mysql.com +0 -0
    Auto merged

ChangeSet
  1.1346.858.1 05/10/14 01:22:24 evgen@moonbone.local +3 -0
  Fix bug #13855 select distinct with group by caused server crash
  
  DISTINCT wasn't optimized away and caused creation of tmp table in wrong
  case. This result in integer overrun and running out of memory.
  
  Fix backported from 4.1. Now if optimizer founds that in result be only 1
  row it removes distinct.

  mysql-test/t/select.test
    1.12.1.18 05/10/14 01:21:52 evgen@moonbone.local +9 -0
     Test case for bug#13855 select distinct with group by caused server crash

  mysql-test/r/select.result
    1.8.1.32 05/10/14 01:21:24 evgen@moonbone.local +8 -0
    Test case for bug#13855 select distinct with group by caused server crash

  sql/sql_select.cc
    1.152.1.141 05/10/14 01:20:33 evgen@moonbone.local +1 -0
    Fix bug #13855 select distinct with group by caused server crash

ChangeSet
  1.2442.74.1 05/10/14 00:02:38 bell@sanja.is.com.ua +3 -0
  - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
  - fixed test

  sql/sql_update.cc
    1.143.1.2 05/10/14 00:02:36 bell@sanja.is.com.ua +6 -2
    set 'updating' in both tables list if we have two of them (because of subquery)

  mysql-test/t/rpl_multi_update2.test
    1.6 05/10/14 00:02:36 bell@sanja.is.com.ua +27 -0
    fixed setting/reseting environment
    multi-update with subquery added

  mysql-test/r/rpl_multi_update2.result
    1.4 05/10/14 00:02:35 bell@sanja.is.com.ua +13 -0
    fixed setting/reseting environment
    multi-update with subquery added

ChangeSet
  1.2442.72.2 05/10/13 22:11:49 lenz@mysql.com +1 -0
  Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1

  support-files/mysql.spec.sh
    1.107 05/10/13 22:11:46 lenz@mysql.com +0 -11
    Auto merged

ChangeSet
  1.1346.857.1 05/10/13 22:10:54 lenz@mysql.com +1 -0
   - added a usermod call in the postinstall section of the RPM spec file 
     to assign a potential existing mysql user to the correct user group (BUG#12823) 

  support-files/mysql.spec.sh
    1.61.1.33 05/10/13 22:10:51 lenz@mysql.com +11 -4
     - added a usermod call to assign a potential existing mysql user to the
       correct user group (BUG#12823)

ChangeSet
  1.2442.72.1 05/10/13 22:01:02 lenz@mysql.com +1 -0
  RPM spec file fixes:
  
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
   - Save the perror binary built during Max build so it supports the NDB
     error codes (BUG#13740)
   - added a separate macro "mysqld_group" to be able to define the
     user group of the mysql user seperately, if desired.

  support-files/mysql.spec.sh
    1.106 05/10/13 22:00:55 lenz@mysql.com +22 -5
     - added a usermod call to assign a potential existing mysql user to the
       correct user group (BUG#12823)
     - Save the perror binary built during Max build so it supports the NDB
       error codes (BUG#13740)
     - added a separate macro "mysqld_group" to be able to define the
       user group of the mysql user seperately, if desired.

ChangeSet
  1.2442.71.1 05/10/13 11:10:45 jimw@mysql.com +1 -0
  Force a server restart for the not_embedded_server test to satisfy
  conditions of its first test. (Bug #13796)

  mysql-test/t/not_embedded_server-master.opt
    1.1 05/10/13 11:10:43 jimw@mysql.com +1 -0
    New BitKeeper file ``mysql-test/t/not_embedded_server-master.opt''

  mysql-test/t/not_embedded_server-master.opt
    1.0 05/10/13 11:10:43 jimw@mysql.com +0 -0
    BitKeeper file /home/jimw/my/mysql-4.1-13796/mysql-test/t/not_embedded_server-master.opt

ChangeSet
  1.2442.70.3 05/10/13 11:05:59 jimw@mysql.com +3 -0
  Fix typo (thread_cache should be thread_cache_size) in example
  configuration files. (Bug #13811)

  support-files/my-large.cnf.sh
    1.22 05/10/13 11:05:56 jimw@mysql.com +1 -1
    Fix name of thread_cache_size setting.

  support-files/my-innodb-heavy-4G.cnf.sh
    1.8 05/10/13 11:05:56 jimw@mysql.com +1 -1
    Fix name of thread_cache_size setting.

  support-files/my-huge.cnf.sh
    1.23 05/10/13 11:05:56 jimw@mysql.com +1 -1
    Fix name of thread_cache_size setting.

ChangeSet
  1.2442.70.2 05/10/13 19:24:01 monty@mysql.com +2 -0
  Fixes during review of new code

  vio/vio.c
    1.24 05/10/13 19:23:58 monty@mysql.com +1 -1
    Made code clearer (fcntl_mode is always 0 here)
    

  sql/slave.cc
    1.278 05/10/13 19:23:58 monty@mysql.com +3 -2
    Moved mutex_unlock to handle 'err' case properly

ChangeSet
  1.2442.70.1 05/10/13 18:48:58 monty@mysql.com +1 -0
  Use 4.1 code

  sql/item.cc
    1.226 05/10/13 18:48:56 monty@mysql.com +0 -2
    Use 4.1 code

ChangeSet
  1.2442.1.35 05/10/13 16:52:54 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  scripts/make_binary_distribution.sh
    1.88 05/10/13 16:52:51 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.69.2 05/10/13 19:51:07 hf@deer.(none) +2 -0
  merging

  mysql-test/t/select.test
    1.52 05/10/13 19:51:03 hf@deer.(none) +0 -1
    merging

  mysql-test/r/select.result
    1.68 05/10/13 19:51:03 hf@deer.(none) +0 -55
    merging

ChangeSet
  1.1346.856.1 05/10/13 17:41:55 monty@mysql.com +1 -0
  Review of new pushed code
  - No need to check *ref when ref is checked (Simple optimization fix)

  sql/item.cc
    1.19.1.20 05/10/13 17:41:54 monty@mysql.com +2 -2
    No need to check *ref

ChangeSet
  1.2442.69.1 05/10/13 19:31:09 hf@deer.(none) +3 -0
  merging

  mysql-test/t/select.test
    1.51 05/10/13 19:31:06 hf@deer.(none) +9 -0
    merging

  mysql-test/r/select.result
    1.67 05/10/13 19:31:06 hf@deer.(none) +100 -36
    merging

  sql/sql_select.cc
    1.440 05/10/13 19:25:25 hf@deer.(none) +0 -0
    Auto merged

ChangeSet
  1.1346.1.817 05/10/13 19:23:52 hf@deer.(none) +3 -0
  Fix for bug #3874 (Group by field is not considered)

  sql/sql_select.cc
    1.152.1.140 05/10/13 19:23:37 hf@deer.(none) +1 -1
    do the same for nullable

  mysql-test/t/select.test
    1.12.1.17 05/10/13 19:23:37 hf@deer.(none) +21 -0
    test case added

  mysql-test/r/select.result
    1.8.1.31 05/10/13 19:23:37 hf@deer.(none) +36 -0
    test result fixed

ChangeSet
  1.2442.68.1 05/10/13 17:21:14 jani@ua141d10.elisa.omakaista.fi +4 -0
  Some Netware related fixes and fixes for Metrowerks compiler.

  strings/my_strtoll10.c
    1.10 05/10/13 17:21:06 jani@ua141d10.elisa.omakaista.fi +9 -0
    Fix for Metrowerks compiler.

  scripts/make_binary_distribution.sh
    1.86.1.1 05/10/13 17:21:06 jani@ua141d10.elisa.omakaista.fi +1 -2
    Netware specific change for creating help tables.

  netware/pack_isam.def
    1.5 05/10/13 17:21:06 jani@ua141d10.elisa.omakaista.fi +1 -0
    NetWare specific change, Added SCRENNAME for pack_isam.

  netware/BUILD/mwenv
    1.11 05/10/13 17:21:06 jani@ua141d10.elisa.omakaista.fi +2 -2
    Removed -O3 for Metrowerks compiler.

ChangeSet
  1.2442.59.3 05/10/13 15:52:22 msvensson@neptunus.(none) +3 -0
  Bug #12698  	abnormal program termination running mysql_client_test
   - Move test for bug#93 from mysql_client_test.c to show_check.test
   - No need for test written in c

  tests/mysql_client_test.c
    1.160 05/10/13 15:52:17 msvensson@neptunus.(none) +0 -92
    Remove test for bug#95 to show_check.test

  mysql-test/t/show_check.test
    1.45 05/10/13 15:52:17 msvensson@neptunus.(none) +13 -0
    Add test case for bug#93, moved from mysql_client_test.c

  mysql-test/r/show_check.result
    1.64 05/10/13 15:52:17 msvensson@neptunus.(none) +7 -0
    Add test case for bug#93, moved from mysql_client_test.c

ChangeSet
  1.2442.1.32 05/10/13 17:17:32 evgen@moonbone.local +2 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into moonbone.local:/work/13535-bug-4.1-mysql

  mysql-test/t/select.test
    1.50 05/10/13 17:17:31 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/select.result
    1.66 05/10/13 17:17:31 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2442.63.11 05/10/13 14:32:10 joerg@mysql.com +1 -0
  Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
  into mysql.com:/M41/mysql-4.1

  scripts/make_binary_distribution.sh
    1.87 05/10/13 14:32:09 joerg@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.59.2 05/10/13 13:37:10 msvensson@neptunus.(none) +1 -0
  Bug #12698  abnormal program termination running mysql_client_test
   - The testcase create a .frm file consisting of "junk". Unfortunately the "junk" wasn't
     written to the .frm file if mysql_client_test was run with -s option to make it run silent.
     This most likely caused the file never to be created on windows, and thus the 
      test case failed.

  tests/mysql_client_test.c
    1.159 05/10/13 13:37:04 msvensson@neptunus.(none) +1 -2
    Always write "junk" to the test file.

ChangeSet
  1.2442.66.1 05/10/13 12:36:41 joerg@mysql.com +1 -0
  Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1

  scripts/make_binary_distribution.sh
    1.85.1.1 05/10/13 12:36:38 joerg@mysql.com +0 -4
    Auto merged

ChangeSet
  1.2442.65.2 05/10/13 13:25:07 ramil@mysql.com +1 -0
  memcpy_overlap() replaced with memmove() during the merging.

  strings/ctype-tis620.c
    1.83 05/10/13 13:25:00 ramil@mysql.com +1 -1
    memcpy_overlap() replaced with memmove() during the merge.

ChangeSet
  1.2442.65.1 05/10/13 12:48:30 ramil@mysql.com +2 -0
  Merge mysql.com:/usr/home/ram/work/mysql-4.0
  into  mysql.com:/usr/home/ram/work/mysql-4.1

  include/m_string.h
    1.35 05/10/13 12:48:26 ramil@mysql.com +0 -0
    SCCS merged

  myisam/mi_search.c
    1.54 05/10/13 12:47:24 ramil@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.63.8 05/10/13 11:25:08 bar@mysql.com +1 -0
  Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/usr/home/bar/mysql-4.1.b12476

  sql/item_cmpfunc.cc
    1.203 05/10/13 11:25:02 bar@mysql.com +0 -1
    Auto merged

ChangeSet
  1.2442.64.2 05/10/13 01:14:58 evgen@moonbone.local +3 -0
  Manual merged

  mysql-test/t/select.test
    1.47.1.2 05/10/13 01:14:57 evgen@moonbone.local +10 -9
    Manual merged

  mysql-test/r/select.result
    1.63.1.2 05/10/13 01:14:57 evgen@moonbone.local +0 -0
    Manual merged

  sql/item.cc
    1.225 05/10/13 01:13:18 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.2442.61.2 05/10/13 00:58:59 evgen@moonbone.local +4 -0
  select.test, sql_select.cc, sql_lex.cc, item.cc:
    Bug #7672 after merge fix

  mysql-test/t/select.test
    1.46.1.2 05/10/13 00:52:58 evgen@moonbone.local +2 -1
    Bug #7672 after merge fix

  sql/sql_select.cc
    1.439 05/10/13 00:51:48 evgen@moonbone.local +5 -0
    Bug #7672 after merge fix

  sql/sql_lex.cc
    1.151 05/10/13 00:51:38 evgen@moonbone.local +2 -1
    Bug #7672 after merge fix

  sql/item.cc
    1.221.2.2 05/10/13 00:51:02 evgen@moonbone.local +8 -3
    Bug #7672 after merge fix

ChangeSet
  1.2442.64.1 05/10/12 22:29:36 guilhem@mysql.com +1 -0
  To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.

  mysql-test/t/rpl_dual_pos_advance-master.opt
    1.2 05/10/12 22:29:33 guilhem@mysql.com +1 -0
    the option file must be non-empty (because there's a -z test in mysql-test-run)

ChangeSet
  1.2442.63.3 05/10/12 13:28:46 jimw@mysql.com +2 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/mysqld.cc
    1.602.1.2 05/10/12 13:28:43 jimw@mysql.com +0 -0
    Auto merged

  configure.in
    1.395.1.2 05/10/12 13:28:43 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.63.2 05/10/12 13:27:49 jimw@mysql.com +3 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-13344
  into  mysql.com:/home/jimw/my/mysql-4.1-clean

  sql/item.h
    1.192 05/10/12 13:27:47 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/t/cast.test
    1.20 05/10/12 13:27:47 jimw@mysql.com +0 -0
    Auto merged

  mysql-test/r/cast.result
    1.24 05/10/12 13:27:46 jimw@mysql.com +0 -0
    Auto merged

ChangeSet
  1.2442.1.31 05/10/13 00:16:33 evgen@moonbone.local +2 -0
  Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
  into moonbone.local:/work/13535-bug-4.1-mysql

  mysql-test/t/select.test
    1.49 05/10/13 00:16:32 evgen@moonbone.local +0 -0
    Auto merged

  mysql-test/r/select.result
    1.65 05/10/13 00:16:31 evgen@moonbone.local +0 -0
    Auto merged

ChangeSet
  1.1346.1.816 05/10/12 18:50:25 ramil@mysql.com +2 -0
  memcpy_overlap() removed, as 
    1. it's wrong to use memcpy() for overlapped areas;
    2. we use it only once.
  During merge to 4.1 will remove a memcpy_overlap() call 
  from strings/ctype-tis620.c as well in order to fix 
  bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.

  myisam/mi_search.c
    1.30.1.14 05/10/12 18:50:22 ramil@mysql.com +1 -1
    use memmove() instead, as memcpy_overlap() is removed.

  include/m_string.h
    1.17.1.6 05/10/12 18:50:22 ramil@mysql.com +0 -10
    memcpy_overlap() removed, as 
      1. it's wrong to use memcpy() for overlapped areas;
      2. we use it only once.
    During merge to 4.1 will remove a memcpy_overlap() call 
    from strings/ctype-tis620.c as well in order to fix 
    bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64.

ChangeSet
  1.2442.1.29 05/10/12 13:29:55 guilhem@mysql.com +8 -0
  Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc;
  in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
  and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
  do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
  executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
  the master though it's data-wise it's not).

  mysql-test/t/rpl_dual_pos_advance.test
    1.1 05/10/12 13:29:51 guilhem@mysql.com +108 -0
    Test for BUG#13023 (with a part, disabled, to test BUG#13861 when I fix it).
    Before the fix, this test used to hang.

  mysql-test/r/rpl_dual_pos_advance.result
    1.1 05/10/12 13:29:51 guilhem@mysql.com +22 -0
    New BitKeeper file ``mysql-test/r/rpl_dual_pos_advance.result''

  sql/slave.h
    1.88 05/10/12 13:29:51 guilhem@mysql.com +11 -0
    A couple of coordinates in RELAY_LOG_INFO to keep track of the last ignored events received
    by the slave I/O thread (ignored because of the server id).

  sql/slave.cc
    1.277 05/10/12 13:29:51 guilhem@mysql.com +109 -19
    A comment for BUG#13861 (to be fixed). llstr() instead of %ld as the number is ulonglong.
    mi->rli becomes rli in some places.
    Fix for BUG#13023:
    - in the slave I/O thread, whenever we ignore an event because of its server id we update
    a couple of coordinates in memory
    - in the slave SQL thread, whenever we bump into the end of the latest relay log, we check
    this couple of coordinates to see if we should advance our Exec_master_log_pos.
    - when the slave I/O thread terminates it saves these in-memory coordinates into a Rotate event
    in the relay log, so that they are durable.

  sql/log_event.h
    1.99 05/10/12 13:29:51 guilhem@mysql.com +18 -10
    We now have a case where a Rotate_log_event is executed by the slave SQL thread while
    not being in the relay log, so it needs to pretend its length is 0: a ZERO_LEN flag for that;
    a flag DUP_NAME (replaces "bool alloced") to be able to choose if we want the constructor
    to duplicate the string argument or not.

  sql/log_event.cc
    1.186 05/10/12 13:29:51 guilhem@mysql.com +33 -9
    Moving one Rotate_log_event constructor from log_event.h. Support for on-demand choice of
    duplicating the string argument of the constructor or not (because there now are needs for both
    alternatives, see slave.cc).

  mysql-test/t/rpl_dual_pos_advance.test
    1.0 05/10/12 13:29:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_dual_pos_advance.test

  mysql-test/r/rpl_dual_pos_advance.result
    1.0 05/10/12 13:29:51 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/r/rpl_dual_pos_advance.result

  sql/log.cc
    1.164 05/10/12 13:29:50 guilhem@mysql.com +3 -3
    No more default arguments for Rotate_log_event constructor.
    MYSQL_LOG::appendv() is now called without mutex.

ChangeSet
  1.2442.62.1 05/10/12 09:47:59 grog@mysql.com +3 -0
  sql_yacc.yy:
    Bug #10308: Parse 'purge master logs' with subselect correctly.
  subselect.test:
    Bug #10308: Test for 'purge master logs' with subselect.
  subselect.result:
    Bug #10308: Test result for 'purge master logs' with subselect.

  sql/sql_yacc.yy
    1.395 05/10/12 09:44:20 grog@mysql.com +4 -1
    Bug #10308: Parse 'purge master logs' with subselect correctly.

  mysql-test/t/subselect.test
    1.153 05/10/12 09:43:10 grog@mysql.com +6 -0
    Bug #10308: Test for 'purge master logs' with subselect.

  mysql-test/r/subselect.result
    1.173 05/10/12 09:39:59 grog@mysql.com +1 -0
    Bug #10308: Test result for 'purge master logs' with subselect.

ChangeSet
  1.2442.61.1 05/10/12 03:32:14 evgen@moonbone.local +6 -0
  Manual merge, fix for bug #7672

  sql/sql_select.cc
    1.438 05/10/12 03:32:13 evgen@moonbone.local +0 -6
    Manual merge

  sql/sql_lex.h
    1.187 05/10/12 03:32:13 evgen@moonbone.local +1 -1
    Manual merge

  sql/sql_lex.cc
    1.150 05/10/12 03:32:13 evgen@moonbone.local +0 -0
    Manual merge

  sql/item.cc
    1.221.2.1 05/10/12 03:32:13 evgen@moonbone.local +6 -7
    Manual merge

  mysql-test/t/select.test
    1.46.1.1 05/10/12 03:32:13 evgen@moonbone.local +1 -1
    Manual merge

  mysql-test/r/select.result
    1.62.1.1 05/10/12 03:32:13 evgen@moonbone.local +10 -10
    Manual merge

ChangeSet
  1.2442.60.1 05/10/11 15:23:34 jimw@mysql.com +1 -0
  Fix read past allocated buffer when parsing charsets file. (Bug #6413)

  strings/xml.c
    1.5 05/10/11 15:23:32 jimw@mysql.com +1 -1
    Don't look for comment past end of buffer.

ChangeSet
  1.2442.55.6 05/10/11 22:34:40 kent@mysql.com +2 -0
  mysqlwatch.vcproj:
    Removed Debug target not used
  mysql.sln:
    Added pro-gpl target
    Build mysqlwatch and mysqlshutdown for classic as well

  VC++Files/mysqlwatch/mysqlwatch.vcproj
    1.2 05/10/11 21:53:56 kent@mysql.com +0 -16
    Removed Debug target not used

  VC++Files/mysql.sln
    1.4 05/10/11 21:53:06 kent@mysql.com +258 -26
    Added pro-gpl target

  VC++Files/mysql.sln
    1.3 05/10/11 11:57:15 kent@mysql.com +5 -7
    Build mysqlwatch and mysqlshutdown for classic as well

  mysql-test/t/rpl_dual_pos_advance-master.opt
    1.1 05/10/10 23:09:11 guilhem@mysql.com +0 -0
    empty; its goal is just to trigger a server restart after running the test,
    so that the master forgets that it was a slave (otherwise it affects the following tests).

  mysql-test/t/rpl_dual_pos_advance-master.opt
    1.0 05/10/10 23:09:11 guilhem@mysql.com +0 -0
    BitKeeper file /home/mysql_src/mysql-4.1/mysql-test/t/rpl_dual_pos_advance-master.opt

