mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 23:34:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
35328 commits 2778 branches 343 tags 1.6 GiB
Commit graph

35328 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
61f4440c29 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge
 2006-06-16 18:54:20 +10:00
unknown
710abe5390 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2006-06-16 10:01:13 +02:00
unknown
64c856c939 Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index 
Don't rely on table->null_row when no index is used - it may be a multi-table search
 2006-06-16 09:49:18 +02:00
unknown
0e90576b08 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/fix-mysql-5.1-new


sql/log.cc:
  Auto merged
 2006-06-16 09:17:42 +02:00
unknown
1b1cb63d69 Bug#18775 - Temporary table from alter table visible to other threads 
The intermediate (not temporary) files of the new table
during ALTER TABLE was visible for SHOW TABLES. These
intermediate files are copies of the original table with
the changes done by ALTER TABLE. After all the data is
copied over from the original table, these files are renamed 
to the original tables file names. So they are not temporary 
files. They persist after ALTER TABLE, but just with another 
name.

Normal GRANT checking takes place for the intermediate table.
Everyone who can see the original table (and hence the final
table) can also see the intermediate table. But noone else.

In 5.0 the intermediate files are invisible for SHOW TABLES
because all file names beginning with "#sql" were suppressed.
In 5.1 temporary files are created in TMPDIR, so that they
don't appear in the database directories. Also in 5.1 a
translation between table names and file names is done. The
tmp_file_prefix on file level is now "@0023sql".

The suppression of files starting with tmp_file_prefix is
still in place, but still only files beginning with "#sql"
were suppressed.

I do now translate tmp_file_prefix from table name to file
name before comparing it with the files in a directory.
This suppresses the intermediate files again.

No test case. The test case looks so that a reasonable big
table is altered while a second thread runs SHOW TABLES.
This in itself would be possible to do, but on slow machines
it would add too much time to the test suite, while on fast
machines the ALTER TABLE might have finished before SHOW
TABLES looks at the directory. Even if there might be a good
balance for todays machines, one day the test would become
void as the intermediate table would not be seen even with
the bug in place. I added a test script to the bug report.
It can easily be changed so that it uses a table size that
is appropriate for the test machine.


sql/sql_show.cc:
  Bug#18775 - Temporary table from alter table visible to other threads
  Translating tmp_file_prefix to filename before comparison.
 2006-06-16 09:02:03 +02:00
unknown
8128470913 Merge mysql.com:/home/marty/MySQL/mysql-5.0 
into  mysql.com:/home/marty/MySQL/mysql-5.1


mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge (using local)
 2006-06-16 08:47:46 +02:00
unknown
b47705abf3 Post_merges fixes. 2006-06-15 20:29:05 -07:00
unknown
59d38c15bc Fixing false alarm errors on windows build from a clean clone. 
win/build-vs71.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.
win/build-vs8.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.
 2006-06-15 22:46:52 -04:00
unknown
79966e670a Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/t/func_group.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/r/func_group.result:
  SCCS merged
 2006-06-15 18:40:18 -07:00
unknown
eb21983453 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
 2006-06-15 18:36:46 -07:00
unknown
40305d7a81 After merge fixes 2006-06-16 02:52:17 +02:00
unknown
cc542b2f98 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/t/disabled.def:
  Auto merged
 2006-06-16 02:44:23 +02:00
unknown
9933c3bd3a Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/extra/rpl_tests/rpl_ddl.test:
  Auto merged
mysql-test/r/rpl_ddl.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/rpl_ndb_charset.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/r/trigger-grant.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger-grant.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
sql/handler.cc:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/sql_class.h:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_insert.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
 2006-06-16 01:15:19 +02:00
unknown
321947ab0f BUG#19281: Auto-increment disappeared after create index 
mysql-test/r/partition_list.result:
  New test case
mysql-test/t/partition_list.test:
  New test case
sql/ha_partition.cc:
  Implement a proper update_create_info
 2006-06-15 18:24:33 -04:00
unknown
2996b49af7 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/m51


mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
 2006-06-15 23:50:32 +02:00
unknown
96f83a0d8a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-06-15 23:50:31 +02:00
unknown
ee69455c02 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-16 01:50:31 +04:00
unknown
9b402b909b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 23:50:31 +02:00
unknown
6d16282f39 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
 2006-06-15 17:50:30 -04:00
unknown
9668198e14 BUG#19940: Add Valgrind suppression for false alarm report. 2006-06-15 22:02:26 +02:00
unknown
1dd45d5c5f Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397


mysql-test/r/partition_error.result:
  Auto merged
mysql-test/t/partition_error.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2006-06-15 16:00:54 -04:00
unknown
6dd40f3e0a BUG#20397: Crash when alter table t1 engine = x; 
Review fixes


sql/sql_table.cc:
  Review fixes
 2006-06-15 15:56:47 -04:00
unknown
33f38c317a don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS 
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts


config/ac-macros/plugins.m4:
  don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS
 2006-06-15 21:43:29 +02:00
unknown
02b9f5b554 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/18175-bug-5.0-opt
 2006-06-15 22:10:47 +04:00
unknown
548b9aeff3 Fixed bug#18175: The nest_level counter wasn't decremented for union parts which 
resulted in a wrong error message.

The nest_level counter indicates the depth of nesting for a subselect. It is
needed to properly resolve aggregate functions in nested subselects. Obviously 
it shouldn't be incremented for UNION parts because they have the same level of
nesting. This counter was incremented by 1 in the mysql_new_select() function
for any new select and wasn't decremented for UNION parts. This resulted in
wrongly reported error messages.

Now the nest_level counter is decremented by 1 for any union part.


mysql-test/t/union.test:
  Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
  resulted in a wrong error message.
mysql-test/r/union.result:
  Added test case for the bug#18175: The nest_level counter wasn't decremented for union parts which
  resulted in a wrong error message.
sql/sql_yacc.yy:
  Fixed bug#18175: The nest_level counter wasn't decremented for union parts which
  resulted in a wrong error message.
  Now the nest_level counter is decremented by 1 for any union part.
 2006-06-15 22:09:58 +04:00
unknown
ae90c20278 BUG#19309: Crash if double procedural alter 
mysql-test/r/partition.result:
  New test case
mysql-test/t/partition.test:
  New test case
sql/sql_table.cc:
  Added new routine to make copy of create_info struct. This struct is
  manipulated during alter table and create table but needs to remain
  the same for repeated execution in stored procedures or prepared
  statements.
 2006-06-15 14:03:17 -04:00
unknown
03fcc48e81 Removing VC++Files directory for 5.1 since we are now using CMake. This has been cleared with Kent. 
.del-zlibvc.dsw~e0a83be4be21be4d:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsw
.del-zlibvc.dsp~27398cfaac865081:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsp
.del-zlib_ia64.dsp~76d309d598061eea:
  Delete: VC++Files/zlib/zlib_ia64.dsp
.del-zlib.vcproj~9b1a681d56dae190:
  Delete: VC++Files/zlib/zlib.vcproj
.del-zlib.dsp~503559fb84963a0d:
  Delete: VC++Files/zlib/zlib.dsp
.del-vio_ia64.dsp~cdfbb900c43e7f10:
  Delete: VC++Files/vio/vio_ia64.dsp
.del-vio.vcproj~b7c21b4e2d6a9b85:
  Delete: VC++Files/vio/vio.vcproj
.del-vio.dsp~52ab62f9d499195a:
  Delete: VC++Files/vio/vio.dsp
.del-thr_test_ia64.dsp~2ff226f5ce3197b4:
  Delete: VC++Files/thr_test/thr_test_ia64.dsp
.del-thr_test.vcproj~fc0e15c1e6880160:
  Delete: VC++Files/thr_test/thr_test.vcproj
.del-thr_test.dsp~af5f73d3335a6303:
  Delete: VC++Files/thr_test/thr_test.dsp
.del-thr_test.c~70fc0971c72f2a95:
  Delete: VC++Files/thr_test/thr_test.c
.del-thr_insert_test.dsp~e21944f040fb55a9:
  Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
.del-test1_ia64.dsp~42406d943e5f20f9:
  Delete: VC++Files/test1/test1_ia64.dsp
.del-mysql_client_test_ia64.dsp~6a2b9edf3a66a00b:
  Delete: VC++Files/tests/mysql_client_test_ia64.dsp
.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Delete: VC++Files/tests/mysql_client_test.vcproj
.del-mysql_client_test.dsp~d7b5fed623acb964:
  Delete: VC++Files/tests/mysql_client_test.dsp
.del-test1.vcproj~c474b4614c67e2d2:
  Delete: VC++Files/test1/test1.vcproj
.del-test1.dsp~83f105f472a193:
  Delete: VC++Files/test1/test1.dsp
.del-strings.dsw~74e53a6013b0da99:
  Delete: VC++Files/strings/noMASM/strings.dsw
.del-strings.dsp~7b4d145dfc64e39:
  Delete: VC++Files/strings/noMASM/strings.dsp
.del-mysql_thr.c~20772782813d1274:
  Delete: VC++Files/test1/mysql_thr.c
.del-strings_ia64.dsp~4cbf5c6548d3b4a4:
  Delete: VC++Files/strings/strings_ia64.dsp
.del-strings.vcproj~6d1126ae59e4bf82:
  Delete: VC++Files/strings/strings.vcproj
.del-strings.dsw~fc04f19f9c41f6ea:
  Delete: VC++Files/strings/strings.dsw
.del-strings.dsw~44d2027eeeea00d6:
  Delete: VC++Files/strings/backup/strings.dsw
.del-strings.dsp~de6c79f1cc99a48:
  Delete: VC++Files/strings/strings.dsp
.del-strings.dsp~d1f09e84a9861d86:
  Delete: VC++Files/strings/backup/strings.dsp
.del-strings.dsw~72e5896282b294d5:
  Delete: VC++Files/strings/MASM6x/strings.dsw
.del-strings.dsp~ba34297c3be0c3aa:
  Delete: VC++Files/strings/MASM6x/strings.dsp
.del-myisammrg_ia64.dsp~ffe1ccdf77392d5a:
  Delete: VC++Files/storage/myisammrg/myisammrg_ia64.dsp
.del-myisammrg.vcproj~624417d12268d061:
  Delete: VC++Files/storage/myisammrg/myisammrg.vcproj
.del-myisammrg.dsp~983cc2678e60e979:
  Delete: VC++Files/storage/myisammrg/myisammrg.dsp
.del-myisam_ia64.dsp~ed98417b58974118:
  Delete: VC++Files/storage/myisam/myisam_ia64.dsp
.del-myisam.vcproj~c8ad2ba4e8fb2b21:
  Delete: VC++Files/storage/myisam/myisam.vcproj
.del-myisam.dsp~db522ff879e7720f:
  Delete: VC++Files/storage/myisam/myisam.dsp
.del-innobase_ia64.dsp~dc7a9c2937f8fe75:
  Delete: VC++Files/storage/innobase/innobase_ia64.dsp
.del-innobase.vcproj~4a6cd1221518a77f:
  Delete: VC++Files/storage/innobase/innobase.vcproj
.del-innobase.dsp~8a85302e27197083:
  Delete: VC++Files/storage/innobase/innobase.dsp
.del-libdb_tcl.def~bf5926f22f130545:
  Delete: VC++Files/storage/bdb/build_win32/libdb_tcl.def
.del-heap_ia64.dsp~496a0b7e1268ef8e:
  Delete: VC++Files/storage/heap/heap_ia64.dsp
.del-heap.vcproj~4382203ba03f4038:
  Delete: VC++Files/storage/heap/heap.vcproj
.del-heap.dsp~ad83359791cc780:
  Delete: VC++Files/storage/heap/heap.dsp
.del-example.vcproj~ae647078a46efb6e:
  Delete: VC++Files/storage/example/example.vcproj
.del-libdb.def~898715818fce00a:
  Delete: VC++Files/storage/bdb/build_win32/libdb.def
.del-excxx_tpcb.dsp~c2d09192efb7c6f1:
  Delete: VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp
.del-excxx_mpool.dsp~b98b16a8b35b2724:
  Delete: VC++Files/storage/bdb/build_win32/excxx_mpool.dsp
.del-excxx_lock.dsp~c11419f4c472fd93:
  Delete: VC++Files/storage/bdb/build_win32/excxx_lock.dsp
.del-excxx_env.dsp~a76359c56b592402:
  Delete: VC++Files/storage/bdb/build_win32/excxx_env.dsp
.del-excxx_btrec.dsp~ef7959c1c777234f:
  Delete: VC++Files/storage/bdb/build_win32/excxx_btrec.dsp
.del-excxx_access.dsp~63d67774c47ee39:
  Delete: VC++Files/storage/bdb/build_win32/excxx_access.dsp
.del-ex_tpcb.dsp~303f15835d3608c:
  Delete: VC++Files/storage/bdb/build_win32/ex_tpcb.dsp
.del-ex_mpool.dsp~7fdaf9e8399340e:
  Delete: VC++Files/storage/bdb/build_win32/ex_mpool.dsp
.del-ex_lock.dsp~dd9b8ad7ca7fb617:
  Delete: VC++Files/storage/bdb/build_win32/ex_lock.dsp
.del-ex_env.dsp~2ef0d5f066cb2ae7:
  Delete: VC++Files/storage/bdb/build_win32/ex_env.dsp
.del-ex_btrec.dsp~5e8268bdd6eb02da:
  Delete: VC++Files/storage/bdb/build_win32/ex_btrec.dsp
.del-ex_access.dsp~dedbebade1266682:
  Delete: VC++Files/storage/bdb/build_win32/ex_access.dsp
.del-db_verify.dsp~8d56f94abea8d89b:
  Delete: VC++Files/storage/bdb/build_win32/db_verify.dsp
.del-db_upgrade.dsp~c0eeab4121e3b43b:
  Delete: VC++Files/storage/bdb/build_win32/db_upgrade.dsp
.del-db_test.dsp~c5df2b5cdf7d240f:
  Delete: VC++Files/storage/bdb/build_win32/db_test.dsp
.del-db_tcl.dsp~fe347860ef24d36b:
  Delete: VC++Files/storage/bdb/build_win32/db_tcl.dsp
.del-db_static1.dsp~93cdd4a79c56117f:
  Delete: VC++Files/storage/bdb/build_win32/db_static1.dsp
.del-db_static.dsp~e7e19a638e56c8d5:
  Delete: VC++Files/storage/bdb/build_win32/db_static.dsp
.del-db_stat.dsp~f4322f2f6f5241e5:
  Delete: VC++Files/storage/bdb/build_win32/db_stat.dsp
.del-db_recover.dsp~516a4a0a93e5ecc2:
  Delete: VC++Files/storage/bdb/build_win32/db_recover.dsp
.del-db_printlog.dsp~817cc167432446b8:
  Delete: VC++Files/storage/bdb/build_win32/db_printlog.dsp
.del-db_load.dsp~7c0d709abbea81ee:
  Delete: VC++Files/storage/bdb/build_win32/db_load.dsp
.del-db_java.dsp~f5f6285f1e205f2:
  Delete: VC++Files/storage/bdb/build_win32/db_java.dsp
.del-db_dump.dsp~7f9cfc4363e1317c:
  Delete: VC++Files/storage/bdb/build_win32/db_dump.dsp
.del-db_dll.dsp~7d5f832f50291933:
  Delete: VC++Files/storage/bdb/build_win32/db_dll.dsp
.del-db_deadlock.dsp~12a22e0ca1a33b83:
  Delete: VC++Files/storage/bdb/build_win32/db_deadlock.dsp
.del-db_checkpoint.dsp~f14eb8d118472abf:
  Delete: VC++Files/storage/bdb/build_win32/db_checkpoint.dsp
.del-db_buildall.dsp~5d5b8082549e422f:
  Delete: VC++Files/storage/bdb/build_win32/db_buildall.dsp
.del-db_archive.dsp~dea482eaf6dc3861:
  Delete: VC++Files/storage/bdb/build_win32/db_archive.dsp
.del-bdb.vcproj~a912c68f1c2094:
  Delete: VC++Files/storage/bdb/bdb.vcproj
.del-bdb.dsp~acd664862f396dd9:
  Delete: VC++Files/storage/bdb/bdb.dsp
.del-archive.vcproj~1a017e10fae26f17:
  Delete: VC++Files/storage/archive/archive.vcproj
.del-Berkeley_DB.dsw~8c801b3e52e89bbe:
  Delete: VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw
.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Delete: VC++Files/sql/mysqldmax_ia64.dsp
.del-mysqldmax.dsp~5d213fe1c204142e:
  Delete: VC++Files/sql/mysqldmax.dsp
.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Delete: VC++Files/sql/mysqld_ia64.dsp
.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Delete: VC++Files/sql/mysqld.vcproj
.del-mysqld.dsw~fc5629c0fc1bc3af:
  Delete: VC++Files/sql/old/mysqld.dsw
.del-mysqld.dsw~2fa9d2fa9a5902ef:
  Delete: VC++Files/sql/mysqld.dsw
.del-replace_ia64.dsp~666e3b313837d42e:
  Delete: VC++Files/replace/replace_ia64.dsp
.del-mysqld.dsp~ffdbf2d234e23e56:
  Delete: VC++Files/sql/mysqld.dsp
.del-message.mc~6ff9e8e3e7294840:
  Delete: VC++Files/sql/message.mc
.del-gen_lex_hash.vcproj~544be6b6:
  Delete: VC++Files/sql/gen_lex_hash.vcproj
.del-gen_lex_hash.dsp~540feedd:
  Delete: VC++Files/sql/gen_lex_hash.dsp
.del-replace.vcproj~9620b1ced86e527a:
  Delete: VC++Files/replace/replace.vcproj
.del-replace.dsp~a97f6dda5abfb438:
  Delete: VC++Files/replace/replace.dsp
.del-regex_ia64.dsp~dcd4172d1a454aa3:
  Delete: VC++Files/regex/regex_ia64.dsp
.del-regex.vcproj~9dea9caafa801b26:
  Delete: VC++Files/regex/regex.vcproj
.del-regex.dsw~59ac4f03e7ef16e:
  Delete: VC++Files/regex/regex.dsw
.del-regex.dsp~99de200e71b64359:
  Delete: VC++Files/regex/regex.dsp
.del-perror_ia64.dsp~be2ccb6d1c91c625:
  Delete: VC++Files/perror/perror_ia64.dsp
.del-fulltext.vcproj~27ad6672:
  Delete: VC++Files/plugin/fulltext/fulltext.vcproj
.del-fulltext.def~27754c94:
  Delete: VC++Files/plugin/fulltext/fulltext.def
.del-perror.vcproj~86ad9dc660a048ad:
  Delete: VC++Files/perror/perror.vcproj
.del-perror.dsp~d314b288f6337f54:
  Delete: VC++Files/perror/perror.dsp
.del-mysys_ia64.dsp~7a98bd8cd01d3043:
  Delete: VC++Files/mysys/mysys_ia64.dsp
.del-mysys.vcproj~40a49d09c4184822:
  Delete: VC++Files/mysys/mysys.vcproj
.del-mysys.dsw~f9dacc88b2a51ba5:
  Delete: VC++Files/mysys/mysys.dsw
.del-mysys.dsp~32695fee91189326:
  Delete: VC++Files/mysys/mysys.dsp
.del-mysqlserver_ia64.dsp~9cd3f0532874bfbe:
  Delete: VC++Files/mysqlserver/mysqlserver_ia64.dsp
.del-mysqlserver.vcproj~327cf9fb1c5ec95d:
  Delete: VC++Files/mysqlserver/mysqlserver.vcproj
.del-mysqlserver.dsp~d99cfb2d291e3785:
  Delete: VC++Files/mysqlserver/mysqlserver.dsp
.del-dummy.cpp~38c1c081e0b4c236:
  Delete: VC++Files/mysqlserver/dummy.cpp
.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Delete: VC++Files/mysqldemb/mysqldemb_ia64.dsp
.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Delete: VC++Files/mysqldemb/mysqldemb.vcproj
.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Delete: VC++Files/mysqldemb/mysqldemb.dsp
.del-mysqlcheck_ia64.dsp~7123d1228c39b249:
  Delete: VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
.del-mysqlcheck.dsp~b6295bc9b0c70650:
  Delete: VC++Files/mysqlcheck/mysqlcheck.dsp
.del-mysqlbinlog_ia64.dsp~ac0f4f9efb251f5:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
.del-mysqlbinlog.dsp~e24094996da02d02:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
.del-myisampack_ia64.dsp~628bd80a496099d5:
  Delete: VC++Files/myisampack/myisampack_ia64.dsp
.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Delete: VC++Files/myisampack/myisampack.vcproj
.del-myisampack.dsp~be5b602ddfb1a75a:
  Delete: VC++Files/myisampack/myisampack.dsp
.del-myisamlog_ia64.dsp~a362c2702ab87e07:
  Delete: VC++Files/myisamlog/myisamlog_ia64.dsp
.del-myisamlog.vcproj~daa6596ea386e5a7:
  Delete: VC++Files/myisamlog/myisamlog.vcproj
.del-myisamlog.dsp~9f89a0e49b84a45:
  Delete: VC++Files/myisamlog/myisamlog.dsp
.del-myisamchk_ia64.dsp~a8344727d14479e:
  Delete: VC++Files/myisamchk/myisamchk_ia64.dsp
.del-myisamchk.vcproj~982ebe5673e58fb6:
  Delete: VC++Files/myisamchk/myisamchk.vcproj
.del-myisamchk.dsp~b8627861f0e8dd3e:
  Delete: VC++Files/myisamchk/myisamchk.dsp
.del-myisam_ftdump_ia64.dsp~62d0f5a56a03242:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
.del-myisam_ftdump.dsp~8501cb3943c50bb0:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.dsp
.del-my_print_defaults_ia64.dsp~11f0e6ae16691bce:
  Delete: VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
.del-mytest.dsw~2324698861155335:
  Delete: VC++Files/libmysqltest/mytest.dsw
.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
.del-my_print_defaults.dsp~6393cfdfd0e1b2ee:
  Delete: VC++Files/my_print_defaults/my_print_defaults.dsp
.del-merge_ia64.dsp~d4848c4ba119776c:
  Delete: VC++Files/merge/merge_ia64.dsp
.del-merge.dsw~559bbc65cf36612b:
  Delete: VC++Files/merge/merge.dsw
.del-merge.dsp~ba1dc5704d438e10:
  Delete: VC++Files/merge/merge.dsp
.del-mytest.c~9a99338689e5de8:
  Delete: VC++Files/libmysqltest/mytest.c
.del-myTest_ia64.dsp~b17572b217d092e6:
  Delete: VC++Files/libmysqltest/myTest_ia64.dsp
.del-myTest.vcproj~dba5adc4fad3c06:
  Delete: VC++Files/libmysqltest/myTest.vcproj
.del-myTest.dsp~4a8c480769193952:
  Delete: VC++Files/libmysqltest/myTest.dsp
.del-myTest-package_ia64.dsp~e423b69f2c624850:
  Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp
.del-myTest-package.dsp~ec9faf3287cbe2b9:
  Delete: VC++Files/libmysqltest/myTest-package.dsp
.del-test_libmysqld_ia64.dsp~d79f095fa7072b25:
  Delete: VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
.del-test_libmysqld.dsp~681dc3c6e97a48f2:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.dsp
.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Delete: VC++Files/libmysqld/libmysqld_ia64.dsp
.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Delete: VC++Files/libmysqld/libmysqld.vcproj
.del-libmysqld.dsp~78dc6a589e5a4149:
  Delete: VC++Files/libmysqld/libmysqld.dsp
.del-udf_example.dsw~91692a3d:
  Delete: VC++Files/examples/udf_example/udf_example.dsw
.del-libmysql_ia64.dsp~ddad907847ceed3:
  Delete: VC++Files/libmysql/libmysql_ia64.dsp
.del-libmysql.vcproj~e21508a4cbf96b49:
  Delete: VC++Files/libmysql/libmysql.vcproj
.del-libmysql.dsw~e7bc53b7d2c2e081:
  Delete: VC++Files/libmysql/libmysql.dsw
.del-libmysql.dsp~eebbe823fb1ed32:
  Delete: VC++Files/libmysql/libmysql.dsp
.del-udf_example.dsp~91456aca:
  Delete: VC++Files/examples/udf_example/udf_example.dsp
.del-udf_example.def~9111ef87:
  Delete: VC++Files/examples/udf_example/udf_example.def
.del-dbug_ia64.dsp~76dbb7ecf79ee3e5:
  Delete: VC++Files/dbug/dbug_ia64.dsp
.del-dbug.vcproj~1fc073f0c76a14b5:
  Delete: VC++Files/dbug/dbug.vcproj
.del-dbug.dsw~6182dd731bef15f9:
  Delete: VC++Files/dbug/dbug.dsw
.del-dbug.dsp~848b9cda893ec0cd:
  Delete: VC++Files/dbug/dbug.dsp
.del-zlibvc.dsw~c6fcbe08f7876788:
  Delete: VC++Files/contrib/minizip/zlibvc.dsw
.del-zlibvc.dsw~be3fc0a598daa999:
  Delete: VC++Files/contrib/asm386/zlibvc.dsw
.del-zlibvc.dsp~d8e6e287a364132f:
  Delete: VC++Files/contrib/asm386/zlibvc.dsp
.del-zlibvc.dsp~4661a0a47229e354:
  Delete: VC++Files/contrib/minizip/zlibvc.dsp
.del-comp_err_ia64.dsp~4b56e5e25d9e54de:
  Delete: VC++Files/comp_err/comp_err_ia64.dsp
.del-comp_err.vcproj~45c167ae5ddd5a96:
  Delete: VC++Files/comp_err/comp_err.vcproj
.del-mysqltest_ia64.dsp~fc3a4cd59af92ac8:
  Delete: VC++Files/client/mysqltest_ia64.dsp
.del-mysqltest.vcproj~21878840704179ef:
  Delete: VC++Files/client/mysqltest.vcproj
.del-mysqltest.dsp~bb948912e890ae3:
  Delete: VC++Files/client/mysqltest.dsp
.del-mysqlslap.vcproj~6f30db25e7c09b6e:
  Delete: VC++Files/client/mysqlslap.vcproj
.del-mysqlshow_ia64.dsp~5b77172f8e4fe84a:
  Delete: VC++Files/client/mysqlshow_ia64.dsp
.del-comp_err.dsp~cdd2b4a543da5d4c:
  Delete: VC++Files/comp_err/comp_err.dsp
.del-mysqlshow.vcproj~797d4fa322faa148:
  Delete: VC++Files/client/mysqlshow.vcproj
.del-mysqlshow.dsp~7166315b18f991d7:
  Delete: VC++Files/client/mysqlshow.dsp
.del-mysqlimport_ia64.dsp~c905eeae53373c68:
  Delete: VC++Files/client/mysqlimport_ia64.dsp
.del-mysqlimport.vcproj~5a30228ef641c081:
  Delete: VC++Files/client/mysqlimport.vcproj
.del-mysqlimport.dsp~d508ae2a3483f1ab:
  Delete: VC++Files/client/mysqlimport.dsp
.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Delete: VC++Files/client/mysqldump_ia64.dsp
.del-mysqldump.vcproj~22f26554166c8e38:
  Delete: VC++Files/client/mysqldump.vcproj
.del-mysqldump.dsp~a8bd23547d3fc27e:
  Delete: VC++Files/client/mysqldump.dsp
.del-mysqlclient_ia64.dsp~ecab72d5220875b:
  Delete: VC++Files/client/mysqlclient_ia64.dsp
.del-mysqlclient.vcproj~e78a73e31368a44a:
  Delete: VC++Files/client/mysqlclient.vcproj
.del-mysqlclient.dsw~1c2fa53ceaed0042:
  Delete: VC++Files/client/mysqlclient.dsw
.del-mysqlclient.dsp~c9f1abb3247adfa0:
  Delete: VC++Files/client/mysqlclient.dsp
.del-mysqlcheck_ia64.dsp~5726883250a7526a:
  Delete: VC++Files/client/mysqlcheck_ia64.dsp
.del-mysqlcheck.dsp~da7dcab87501f05b:
  Delete: VC++Files/client/mysqlcheck.dsp
.del-mysqladmin_ia64.dsp~6d8d1da649203881:
  Delete: VC++Files/client/mysqladmin_ia64.dsp
.del-mysqladmin.vcproj~178fa55cba442d50:
  Delete: VC++Files/client/mysqladmin.vcproj
.del-mysqladmin.dsp~1f8468bd768bcbcd:
  Delete: VC++Files/client/mysqladmin.dsp
.del-mysql_upgrade_ia64.dsp~c9007a313d39d7e8:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
.del-mysql_upgrade.vcproj~54815b7265120589:
  Delete: VC++Files/client/mysql_upgrade.vcproj
.del-mysql_upgrade.dsp~e44498c4a2714360:
  Delete: VC++Files/client/mysql_upgrade.dsp
.del-mysql_ia64.dsp~e651942397edd7e5:
  Delete: VC++Files/client/mysql_ia64.dsp
.del-mysql.vcproj~f7bfe13a8836eea0:
  Delete: VC++Files/client/mysql.vcproj
.del-mysql.dsp~1ea3b71c5b73913b:
  Delete: VC++Files/client/mysql.dsp
.del-prepare~773a10a535120a7e:
  Delete: VC++Files/prepare
.del-mysql_ia64.dsw~5030d1d1d4c87330:
  Delete: VC++Files/mysql_ia64.dsw
.del-mysql.sln~76a9ff1e793b3547:
  Delete: VC++Files/mysql.sln
.del-mysql.dsw~7ea9e16395f139f4:
  Delete: VC++Files/mysql.dsw
.del-mysql.dsp~9d6eee4fc1d54ca5:
  Delete: VC++Files/mysql.dsp
.del-fix-project-files~892fb27fa831ee36:
  Delete: VC++Files/fix-project-files
.del-copy_mysql_files.bat~f6878eeb80173de9:
  Delete: VC++Files/copy_mysql_files.bat
.del-README.build-files~8aa38ef3fb2ffc61:
  Delete: VC++Files/README.build-files


BitKeeper/deleted/.del-README.build-files~8aa38ef3fb2ffc61:
  Delete: VC++Files/README.build-files
BitKeeper/deleted/.del-copy_mysql_files.bat~f6878eeb80173de9:
  Delete: VC++Files/copy_mysql_files.bat
BitKeeper/deleted/.del-fix-project-files~892fb27fa831ee36:
  Delete: VC++Files/fix-project-files
BitKeeper/deleted/.del-mysql.dsp~9d6eee4fc1d54ca5:
  Delete: VC++Files/mysql.dsp
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Delete: VC++Files/mysql.dsw
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Delete: VC++Files/mysql.sln
BitKeeper/deleted/.del-mysql_ia64.dsw~5030d1d1d4c87330:
  Delete: VC++Files/mysql_ia64.dsw
BitKeeper/deleted/.del-prepare~773a10a535120a7e:
  Delete: VC++Files/prepare
BitKeeper/deleted/.del-mysql.dsp~1ea3b71c5b73913b:
  Delete: VC++Files/client/mysql.dsp
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
  Delete: VC++Files/client/mysql.vcproj
BitKeeper/deleted/.del-mysql_ia64.dsp~e651942397edd7e5:
  Delete: VC++Files/client/mysql_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.dsp~e44498c4a2714360:
  Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
  Delete: VC++Files/client/mysql_upgrade.vcproj
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp~c9007a313d39d7e8:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysqladmin.dsp~1f8468bd768bcbcd:
  Delete: VC++Files/client/mysqladmin.dsp
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
  Delete: VC++Files/client/mysqladmin.vcproj
BitKeeper/deleted/.del-mysqladmin_ia64.dsp~6d8d1da649203881:
  Delete: VC++Files/client/mysqladmin_ia64.dsp
BitKeeper/deleted/.del-mysqlcheck.dsp~da7dcab87501f05b:
  Delete: VC++Files/client/mysqlcheck.dsp
BitKeeper/deleted/.del-mysqlcheck_ia64.dsp~5726883250a7526a:
  Delete: VC++Files/client/mysqlcheck_ia64.dsp
BitKeeper/deleted/.del-mysqlclient.dsp~c9f1abb3247adfa0:
  Delete: VC++Files/client/mysqlclient.dsp
BitKeeper/deleted/.del-mysqlclient.dsw~1c2fa53ceaed0042:
  Delete: VC++Files/client/mysqlclient.dsw
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
  Delete: VC++Files/client/mysqlclient.vcproj
BitKeeper/deleted/.del-mysqlclient_ia64.dsp~ecab72d5220875b:
  Delete: VC++Files/client/mysqlclient_ia64.dsp
BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e:
  Delete: VC++Files/client/mysqldump.dsp
BitKeeper/deleted/.del-mysqldump.vcproj~22f26554166c8e38:
  Delete: VC++Files/client/mysqldump.vcproj
BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31:
  Delete: VC++Files/client/mysqldump_ia64.dsp
BitKeeper/deleted/.del-mysqlimport.dsp~d508ae2a3483f1ab:
  Delete: VC++Files/client/mysqlimport.dsp
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
  Delete: VC++Files/client/mysqlimport.vcproj
BitKeeper/deleted/.del-mysqlimport_ia64.dsp~c905eeae53373c68:
  Delete: VC++Files/client/mysqlimport_ia64.dsp
BitKeeper/deleted/.del-mysqlshow.dsp~7166315b18f991d7:
  Delete: VC++Files/client/mysqlshow.dsp
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
  Delete: VC++Files/client/mysqlshow.vcproj
BitKeeper/deleted/.del-comp_err.dsp~cdd2b4a543da5d4c:
  Delete: VC++Files/comp_err/comp_err.dsp
BitKeeper/deleted/.del-mysqlshow_ia64.dsp~5b77172f8e4fe84a:
  Delete: VC++Files/client/mysqlshow_ia64.dsp
BitKeeper/deleted/.del-mysqlslap.vcproj~6f30db25e7c09b6e:
  Delete: VC++Files/client/mysqlslap.vcproj
BitKeeper/deleted/.del-mysqltest.dsp~bb948912e890ae3:
  Delete: VC++Files/client/mysqltest.dsp
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
  Delete: VC++Files/client/mysqltest.vcproj
BitKeeper/deleted/.del-mysqltest_ia64.dsp~fc3a4cd59af92ac8:
  Delete: VC++Files/client/mysqltest_ia64.dsp
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
  Delete: VC++Files/comp_err/comp_err.vcproj
BitKeeper/deleted/.del-comp_err_ia64.dsp~4b56e5e25d9e54de:
  Delete: VC++Files/comp_err/comp_err_ia64.dsp
BitKeeper/deleted/.del-zlibvc.dsp~4661a0a47229e354:
  Delete: VC++Files/contrib/minizip/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsp~d8e6e287a364132f:
  Delete: VC++Files/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~be3fc0a598daa999:
  Delete: VC++Files/contrib/asm386/zlibvc.dsw
BitKeeper/deleted/.del-zlibvc.dsw~c6fcbe08f7876788:
  Delete: VC++Files/contrib/minizip/zlibvc.dsw
BitKeeper/deleted/.del-dbug.dsp~848b9cda893ec0cd:
  Delete: VC++Files/dbug/dbug.dsp
BitKeeper/deleted/.del-dbug.dsw~6182dd731bef15f9:
  Delete: VC++Files/dbug/dbug.dsw
BitKeeper/deleted/.del-dbug.vcproj~1fc073f0c76a14b5:
  Delete: VC++Files/dbug/dbug.vcproj
BitKeeper/deleted/.del-dbug_ia64.dsp~76dbb7ecf79ee3e5:
  Delete: VC++Files/dbug/dbug_ia64.dsp
BitKeeper/deleted/.del-udf_example.def~9111ef87:
  Delete: VC++Files/examples/udf_example/udf_example.def
BitKeeper/deleted/.del-udf_example.dsp~91456aca:
  Delete: VC++Files/examples/udf_example/udf_example.dsp
BitKeeper/deleted/.del-libmysql.dsp~eebbe823fb1ed32:
  Delete: VC++Files/libmysql/libmysql.dsp
BitKeeper/deleted/.del-libmysql.dsw~e7bc53b7d2c2e081:
  Delete: VC++Files/libmysql/libmysql.dsw
BitKeeper/deleted/.del-libmysql.vcproj~e21508a4cbf96b49:
  Delete: VC++Files/libmysql/libmysql.vcproj
BitKeeper/deleted/.del-libmysql_ia64.dsp~ddad907847ceed3:
  Delete: VC++Files/libmysql/libmysql_ia64.dsp
BitKeeper/deleted/.del-udf_example.dsw~91692a3d:
  Delete: VC++Files/examples/udf_example/udf_example.dsw
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Delete: VC++Files/libmysqld/libmysqld.dsp
BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0:
  Delete: VC++Files/libmysqld/libmysqld.vcproj
BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a:
  Delete: VC++Files/libmysqld/libmysqld_ia64.dsp
BitKeeper/deleted/.del-test_libmysqld.dsp~681dc3c6e97a48f2:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.dsp
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
  Delete: VC++Files/libmysqld/examples/test_libmysqld.vcproj
BitKeeper/deleted/.del-test_libmysqld_ia64.dsp~d79f095fa7072b25:
  Delete: VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp
BitKeeper/deleted/.del-myTest-package.dsp~ec9faf3287cbe2b9:
  Delete: VC++Files/libmysqltest/myTest-package.dsp
BitKeeper/deleted/.del-myTest-package_ia64.dsp~e423b69f2c624850:
  Delete: VC++Files/libmysqltest/myTest-package_ia64.dsp
BitKeeper/deleted/.del-myTest.dsp~4a8c480769193952:
  Delete: VC++Files/libmysqltest/myTest.dsp
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
  Delete: VC++Files/libmysqltest/myTest.vcproj
BitKeeper/deleted/.del-myTest_ia64.dsp~b17572b217d092e6:
  Delete: VC++Files/libmysqltest/myTest_ia64.dsp
BitKeeper/deleted/.del-mytest.c~9a99338689e5de8:
  Delete: VC++Files/libmysqltest/mytest.c
BitKeeper/deleted/.del-merge.dsp~ba1dc5704d438e10:
  Delete: VC++Files/merge/merge.dsp
BitKeeper/deleted/.del-merge.dsw~559bbc65cf36612b:
  Delete: VC++Files/merge/merge.dsw
BitKeeper/deleted/.del-merge_ia64.dsp~d4848c4ba119776c:
  Delete: VC++Files/merge/merge_ia64.dsp
BitKeeper/deleted/.del-my_print_defaults.dsp~6393cfdfd0e1b2ee:
  Delete: VC++Files/my_print_defaults/my_print_defaults.dsp
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
  Delete: VC++Files/my_print_defaults/my_print_defaults.vcproj
BitKeeper/deleted/.del-mytest.dsw~2324698861155335:
  Delete: VC++Files/libmysqltest/mytest.dsw
BitKeeper/deleted/.del-my_print_defaults_ia64.dsp~11f0e6ae16691bce:
  Delete: VC++Files/my_print_defaults/my_print_defaults_ia64.dsp
BitKeeper/deleted/.del-myisam_ftdump.dsp~8501cb3943c50bb0:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.dsp
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump.vcproj
BitKeeper/deleted/.del-myisam_ftdump_ia64.dsp~62d0f5a56a03242:
  Delete: VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp
BitKeeper/deleted/.del-myisamchk.dsp~b8627861f0e8dd3e:
  Delete: VC++Files/myisamchk/myisamchk.dsp
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
  Delete: VC++Files/myisamchk/myisamchk.vcproj
BitKeeper/deleted/.del-myisamchk_ia64.dsp~a8344727d14479e:
  Delete: VC++Files/myisamchk/myisamchk_ia64.dsp
BitKeeper/deleted/.del-myisamlog.dsp~9f89a0e49b84a45:
  Delete: VC++Files/myisamlog/myisamlog.dsp
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
  Delete: VC++Files/myisamlog/myisamlog.vcproj
BitKeeper/deleted/.del-myisamlog_ia64.dsp~a362c2702ab87e07:
  Delete: VC++Files/myisamlog/myisamlog_ia64.dsp
BitKeeper/deleted/.del-myisampack.dsp~be5b602ddfb1a75a:
  Delete: VC++Files/myisampack/myisampack.dsp
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
  Delete: VC++Files/myisampack/myisampack.vcproj
BitKeeper/deleted/.del-myisampack_ia64.dsp~628bd80a496099d5:
  Delete: VC++Files/myisampack/myisampack_ia64.dsp
BitKeeper/deleted/.del-mysqlbinlog.dsp~e24094996da02d02:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.dsp
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog.vcproj
BitKeeper/deleted/.del-mysqlbinlog_ia64.dsp~ac0f4f9efb251f5:
  Delete: VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp
BitKeeper/deleted/.del-mysqlcheck.dsp~b6295bc9b0c70650:
  Delete: VC++Files/mysqlcheck/mysqlcheck.dsp
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
  Delete: VC++Files/mysqlcheck/mysqlcheck.vcproj
BitKeeper/deleted/.del-mysqlcheck_ia64.dsp~7123d1228c39b249:
  Delete: VC++Files/mysqlcheck/mysqlcheck_ia64.dsp
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Delete: VC++Files/mysqldemb/mysqldemb.dsp
BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c:
  Delete: VC++Files/mysqldemb/mysqldemb.vcproj
BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd:
  Delete: VC++Files/mysqldemb/mysqldemb_ia64.dsp
BitKeeper/deleted/.del-dummy.cpp~38c1c081e0b4c236:
  Delete: VC++Files/mysqlserver/dummy.cpp
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Delete: VC++Files/mysqlserver/mysqlserver.dsp
BitKeeper/deleted/.del-mysqlserver.vcproj~327cf9fb1c5ec95d:
  Delete: VC++Files/mysqlserver/mysqlserver.vcproj
BitKeeper/deleted/.del-mysqlserver_ia64.dsp~9cd3f0532874bfbe:
  Delete: VC++Files/mysqlserver/mysqlserver_ia64.dsp
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
  Delete: VC++Files/mysys/mysys.dsp
BitKeeper/deleted/.del-mysys.dsw~f9dacc88b2a51ba5:
  Delete: VC++Files/mysys/mysys.dsw
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Delete: VC++Files/mysys/mysys.vcproj
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043:
  Delete: VC++Files/mysys/mysys_ia64.dsp
BitKeeper/deleted/.del-perror.dsp~d314b288f6337f54:
  Delete: VC++Files/perror/perror.dsp
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
  Delete: VC++Files/perror/perror.vcproj
BitKeeper/deleted/.del-fulltext.def~27754c94:
  Delete: VC++Files/plugin/fulltext/fulltext.def
BitKeeper/deleted/.del-fulltext.vcproj~27ad6672:
  Delete: VC++Files/plugin/fulltext/fulltext.vcproj
BitKeeper/deleted/.del-perror_ia64.dsp~be2ccb6d1c91c625:
  Delete: VC++Files/perror/perror_ia64.dsp
BitKeeper/deleted/.del-regex.dsp~99de200e71b64359:
  Delete: VC++Files/regex/regex.dsp
BitKeeper/deleted/.del-regex.dsw~59ac4f03e7ef16e:
  Delete: VC++Files/regex/regex.dsw
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
  Delete: VC++Files/regex/regex.vcproj
BitKeeper/deleted/.del-regex_ia64.dsp~dcd4172d1a454aa3:
  Delete: VC++Files/regex/regex_ia64.dsp
BitKeeper/deleted/.del-replace.dsp~a97f6dda5abfb438:
  Delete: VC++Files/replace/replace.dsp
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
  Delete: VC++Files/replace/replace.vcproj
BitKeeper/deleted/.del-gen_lex_hash.dsp~540feedd:
  Delete: VC++Files/sql/gen_lex_hash.dsp
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
  Delete: VC++Files/sql/gen_lex_hash.vcproj
BitKeeper/deleted/.del-message.mc~6ff9e8e3e7294840:
  Delete: VC++Files/sql/message.mc
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Delete: VC++Files/sql/mysqld.dsp
BitKeeper/deleted/.del-replace_ia64.dsp~666e3b313837d42e:
  Delete: VC++Files/replace/replace_ia64.dsp
BitKeeper/deleted/.del-mysqld.dsw~2fa9d2fa9a5902ef:
  Delete: VC++Files/sql/mysqld.dsw
BitKeeper/deleted/.del-mysqld.dsw~fc5629c0fc1bc3af:
  Delete: VC++Files/sql/old/mysqld.dsw
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Delete: VC++Files/sql/mysqld.vcproj
BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2:
  Delete: VC++Files/sql/mysqld_ia64.dsp
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Delete: VC++Files/sql/mysqldmax.dsp
BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1:
  Delete: VC++Files/sql/mysqldmax_ia64.dsp
BitKeeper/deleted/.del-Berkeley_DB.dsw~8c801b3e52e89bbe:
  Delete: VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw
BitKeeper/deleted/.del-archive.vcproj~1a017e10fae26f17:
  Delete: VC++Files/storage/archive/archive.vcproj
BitKeeper/deleted/.del-bdb.dsp~acd664862f396dd9:
  Delete: VC++Files/storage/bdb/bdb.dsp
BitKeeper/deleted/.del-bdb.vcproj~a912c68f1c2094:
  Delete: VC++Files/storage/bdb/bdb.vcproj
BitKeeper/deleted/.del-db_archive.dsp~dea482eaf6dc3861:
  Delete: VC++Files/storage/bdb/build_win32/db_archive.dsp
BitKeeper/deleted/.del-db_buildall.dsp~5d5b8082549e422f:
  Delete: VC++Files/storage/bdb/build_win32/db_buildall.dsp
BitKeeper/deleted/.del-db_checkpoint.dsp~f14eb8d118472abf:
  Delete: VC++Files/storage/bdb/build_win32/db_checkpoint.dsp
BitKeeper/deleted/.del-db_deadlock.dsp~12a22e0ca1a33b83:
  Delete: VC++Files/storage/bdb/build_win32/db_deadlock.dsp
BitKeeper/deleted/.del-db_dll.dsp~7d5f832f50291933:
  Delete: VC++Files/storage/bdb/build_win32/db_dll.dsp
BitKeeper/deleted/.del-db_dump.dsp~7f9cfc4363e1317c:
  Delete: VC++Files/storage/bdb/build_win32/db_dump.dsp
BitKeeper/deleted/.del-db_java.dsp~f5f6285f1e205f2:
  Delete: VC++Files/storage/bdb/build_win32/db_java.dsp
BitKeeper/deleted/.del-db_load.dsp~7c0d709abbea81ee:
  Delete: VC++Files/storage/bdb/build_win32/db_load.dsp
BitKeeper/deleted/.del-db_printlog.dsp~817cc167432446b8:
  Delete: VC++Files/storage/bdb/build_win32/db_printlog.dsp
BitKeeper/deleted/.del-db_recover.dsp~516a4a0a93e5ecc2:
  Delete: VC++Files/storage/bdb/build_win32/db_recover.dsp
BitKeeper/deleted/.del-db_stat.dsp~f4322f2f6f5241e5:
  Delete: VC++Files/storage/bdb/build_win32/db_stat.dsp
BitKeeper/deleted/.del-db_static.dsp~e7e19a638e56c8d5:
  Delete: VC++Files/storage/bdb/build_win32/db_static.dsp
BitKeeper/deleted/.del-db_static1.dsp~93cdd4a79c56117f:
  Delete: VC++Files/storage/bdb/build_win32/db_static1.dsp
BitKeeper/deleted/.del-db_tcl.dsp~fe347860ef24d36b:
  Delete: VC++Files/storage/bdb/build_win32/db_tcl.dsp
BitKeeper/deleted/.del-db_test.dsp~c5df2b5cdf7d240f:
  Delete: VC++Files/storage/bdb/build_win32/db_test.dsp
BitKeeper/deleted/.del-db_upgrade.dsp~c0eeab4121e3b43b:
  Delete: VC++Files/storage/bdb/build_win32/db_upgrade.dsp
BitKeeper/deleted/.del-db_verify.dsp~8d56f94abea8d89b:
  Delete: VC++Files/storage/bdb/build_win32/db_verify.dsp
BitKeeper/deleted/.del-ex_access.dsp~dedbebade1266682:
  Delete: VC++Files/storage/bdb/build_win32/ex_access.dsp
BitKeeper/deleted/.del-ex_btrec.dsp~5e8268bdd6eb02da:
  Delete: VC++Files/storage/bdb/build_win32/ex_btrec.dsp
BitKeeper/deleted/.del-ex_env.dsp~2ef0d5f066cb2ae7:
  Delete: VC++Files/storage/bdb/build_win32/ex_env.dsp
BitKeeper/deleted/.del-ex_lock.dsp~dd9b8ad7ca7fb617:
  Delete: VC++Files/storage/bdb/build_win32/ex_lock.dsp
BitKeeper/deleted/.del-ex_mpool.dsp~7fdaf9e8399340e:
  Delete: VC++Files/storage/bdb/build_win32/ex_mpool.dsp
BitKeeper/deleted/.del-ex_tpcb.dsp~303f15835d3608c:
  Delete: VC++Files/storage/bdb/build_win32/ex_tpcb.dsp
BitKeeper/deleted/.del-excxx_access.dsp~63d67774c47ee39:
  Delete: VC++Files/storage/bdb/build_win32/excxx_access.dsp
BitKeeper/deleted/.del-excxx_btrec.dsp~ef7959c1c777234f:
  Delete: VC++Files/storage/bdb/build_win32/excxx_btrec.dsp
BitKeeper/deleted/.del-excxx_env.dsp~a76359c56b592402:
  Delete: VC++Files/storage/bdb/build_win32/excxx_env.dsp
BitKeeper/deleted/.del-excxx_lock.dsp~c11419f4c472fd93:
  Delete: VC++Files/storage/bdb/build_win32/excxx_lock.dsp
BitKeeper/deleted/.del-excxx_mpool.dsp~b98b16a8b35b2724:
  Delete: VC++Files/storage/bdb/build_win32/excxx_mpool.dsp
BitKeeper/deleted/.del-excxx_tpcb.dsp~c2d09192efb7c6f1:
  Delete: VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp
BitKeeper/deleted/.del-libdb.def~898715818fce00a:
  Delete: VC++Files/storage/bdb/build_win32/libdb.def
BitKeeper/deleted/.del-example.vcproj~ae647078a46efb6e:
  Delete: VC++Files/storage/example/example.vcproj
BitKeeper/deleted/.del-heap.dsp~ad83359791cc780:
  Delete: VC++Files/storage/heap/heap.dsp
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
  Delete: VC++Files/storage/heap/heap.vcproj
BitKeeper/deleted/.del-heap_ia64.dsp~496a0b7e1268ef8e:
  Delete: VC++Files/storage/heap/heap_ia64.dsp
BitKeeper/deleted/.del-libdb_tcl.def~bf5926f22f130545:
  Delete: VC++Files/storage/bdb/build_win32/libdb_tcl.def
BitKeeper/deleted/.del-innobase.dsp~8a85302e27197083:
  Delete: VC++Files/storage/innobase/innobase.dsp
BitKeeper/deleted/.del-innobase.vcproj~4a6cd1221518a77f:
  Delete: VC++Files/storage/innobase/innobase.vcproj
BitKeeper/deleted/.del-innobase_ia64.dsp~dc7a9c2937f8fe75:
  Delete: VC++Files/storage/innobase/innobase_ia64.dsp
BitKeeper/deleted/.del-myisam.dsp~db522ff879e7720f:
  Delete: VC++Files/storage/myisam/myisam.dsp
BitKeeper/deleted/.del-myisam.vcproj~c8ad2ba4e8fb2b21:
  Delete: VC++Files/storage/myisam/myisam.vcproj
BitKeeper/deleted/.del-myisam_ia64.dsp~ed98417b58974118:
  Delete: VC++Files/storage/myisam/myisam_ia64.dsp
BitKeeper/deleted/.del-myisammrg.dsp~983cc2678e60e979:
  Delete: VC++Files/storage/myisammrg/myisammrg.dsp
BitKeeper/deleted/.del-myisammrg.vcproj~624417d12268d061:
  Delete: VC++Files/storage/myisammrg/myisammrg.vcproj
BitKeeper/deleted/.del-myisammrg_ia64.dsp~ffe1ccdf77392d5a:
  Delete: VC++Files/storage/myisammrg/myisammrg_ia64.dsp
BitKeeper/deleted/.del-strings.dsp~ba34297c3be0c3aa:
  Delete: VC++Files/strings/MASM6x/strings.dsp
BitKeeper/deleted/.del-strings.dsw~72e5896282b294d5:
  Delete: VC++Files/strings/MASM6x/strings.dsw
BitKeeper/deleted/.del-strings.dsp~d1f09e84a9861d86:
  Delete: VC++Files/strings/backup/strings.dsp
BitKeeper/deleted/.del-strings.dsp~de6c79f1cc99a48:
  Delete: VC++Files/strings/strings.dsp
BitKeeper/deleted/.del-strings.dsw~44d2027eeeea00d6:
  Delete: VC++Files/strings/backup/strings.dsw
BitKeeper/deleted/.del-strings.dsw~fc04f19f9c41f6ea:
  Delete: VC++Files/strings/strings.dsw
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
  Delete: VC++Files/strings/strings.vcproj
BitKeeper/deleted/.del-strings_ia64.dsp~4cbf5c6548d3b4a4:
  Delete: VC++Files/strings/strings_ia64.dsp
BitKeeper/deleted/.del-mysql_thr.c~20772782813d1274:
  Delete: VC++Files/test1/mysql_thr.c
BitKeeper/deleted/.del-strings.dsp~7b4d145dfc64e39:
  Delete: VC++Files/strings/noMASM/strings.dsp
BitKeeper/deleted/.del-strings.dsw~74e53a6013b0da99:
  Delete: VC++Files/strings/noMASM/strings.dsw
BitKeeper/deleted/.del-test1.dsp~83f105f472a193:
  Delete: VC++Files/test1/test1.dsp
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
  Delete: VC++Files/test1/test1.vcproj
BitKeeper/deleted/.del-mysql_client_test.dsp~d7b5fed623acb964:
  Delete: VC++Files/tests/mysql_client_test.dsp
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
  Delete: VC++Files/tests/mysql_client_test.vcproj
BitKeeper/deleted/.del-mysql_client_test_ia64.dsp~6a2b9edf3a66a00b:
  Delete: VC++Files/tests/mysql_client_test_ia64.dsp
BitKeeper/deleted/.del-test1_ia64.dsp~42406d943e5f20f9:
  Delete: VC++Files/test1/test1_ia64.dsp
BitKeeper/deleted/.del-thr_insert_test.dsp~e21944f040fb55a9:
  Delete: VC++Files/thr_insert_test/thr_insert_test.dsp
BitKeeper/deleted/.del-thr_test.c~70fc0971c72f2a95:
  Delete: VC++Files/thr_test/thr_test.c
BitKeeper/deleted/.del-thr_test.dsp~af5f73d3335a6303:
  Delete: VC++Files/thr_test/thr_test.dsp
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
  Delete: VC++Files/thr_test/thr_test.vcproj
BitKeeper/deleted/.del-thr_test_ia64.dsp~2ff226f5ce3197b4:
  Delete: VC++Files/thr_test/thr_test_ia64.dsp
BitKeeper/deleted/.del-vio.dsp~52ab62f9d499195a:
  Delete: VC++Files/vio/vio.dsp
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
  Delete: VC++Files/vio/vio.vcproj
BitKeeper/deleted/.del-vio_ia64.dsp~cdfbb900c43e7f10:
  Delete: VC++Files/vio/vio_ia64.dsp
BitKeeper/deleted/.del-zlib.dsp~503559fb84963a0d:
  Delete: VC++Files/zlib/zlib.dsp
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
  Delete: VC++Files/zlib/zlib.vcproj
BitKeeper/deleted/.del-zlib_ia64.dsp~76d309d598061eea:
  Delete: VC++Files/zlib/zlib_ia64.dsp
BitKeeper/deleted/.del-zlibvc.dsp~27398cfaac865081:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsp
BitKeeper/deleted/.del-zlibvc.dsw~e0a83be4be21be4d:
  Delete: VC++Files/zlib/contrib/asm386/zlibvc.dsw
 2006-06-15 17:40:23 +02:00
unknown
6e2bb263af Various fixes to allow tests to pass. 
mysql-test/r/rpl_row_basic_11bugs.result:
  Result change
mysql-test/t/disabled.def:
  Disabling test due to already reported bug.
mysql-test/t/rpl_row_basic_11bugs.test:
  Adding code to replace server version
mysql-test/t/rpl_truncate_7ndb.test:
  Adding sleep to allow NDB to write events to the binary log.
 2006-06-15 16:53:12 +02:00
unknown
0ac7219404 Many files: 
Small corrections after a bad merge


mysql-test/r/partition.result:
  Small corrections after a bad merge
mysql-test/r/partition_02myisam.result:
  Small corrections after a bad merge
mysql-test/r/partition_mgm.result:
  Small corrections after a bad merge
mysql-test/r/partition_range.result:
  Small corrections after a bad merge
 2006-06-15 16:51:24 +02:00
unknown
2fc416fe22 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-06-15 15:54:50 +02:00
unknown
aca2e92c00 Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-06-15 15:51:57 +02:00
unknown
af17f788b5 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


mysql-test/r/partition_range.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
 2006-06-15 14:56:00 +02:00
unknown
629830d962 Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt 
into moonbone.local:/work/16377-4.1-after
 2006-06-15 16:41:26 +04:00
unknown
e4bfa961ae item_cmpfunc.h, cast.result: 
Post fix for bug#16377


mysql-test/r/cast.result:
  Post fix for bug#16377
sql/item_cmpfunc.h:
  Post fix for bug#16377
 2006-06-15 16:39:18 +04:00
unknown
4a9985762e Merge mysql.com:/usr/home/ram/work/mysql-4.1 
into  mysql.com:/usr/home/ram/work/mysql-5.0


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  ul
sql/ha_archive.cc:
  ul
sql/item_func.cc:
  ul
 2006-06-15 17:37:47 +05:00
unknown
f684f86b82 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
 2006-06-15 15:38:14 +04:00
unknown
689205ae94 Fix for bug#19667 group by a decimal expression yields wrong result 
mysql-test/r/type_newdecimal.result:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case
mysql-test/t/type_newdecimal.test:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case
 2006-06-15 16:24:02 +05:00
unknown
925a53b95f Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
 2006-06-15 15:04:52 +04:00
unknown
81bc8d3bc7 Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt 
into moonbone.local:/work/19789-bug-5.0-opt-mysql
 2006-06-15 15:01:37 +04:00
unknown
99c320d7cf Merge moonbone.local:/work/15351-bug-4.1-mysql 
into moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt


sql/item_strfunc.cc:
  Auto merged
 2006-06-15 14:57:53 +04:00
unknown
48db4010c4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap


storage/csv/ha_tina.h:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge
 2006-06-15 14:53:11 +04:00
unknown
0961714435 Merge mysql.com:/home/mydev/mysql-5.1--main 
into  mysql.com:/home/mydev/mysql-5.1-amerge
 2006-06-15 12:22:40 +02:00
unknown
b15981a40c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 12:21:34 +02:00
unknown
d7d401ffa4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into serg.mylan:/usr/home/serg/Abk/m51
 2006-06-15 11:59:50 +02:00
unknown
ed849efcc1 Fixed typo in variable name 2006-06-15 11:59:21 +02:00
unknown
7eec6c3f04 BUG#17201: Removed version number from test case output 
mysql-test/r/mysqldump.result:
  Remove comments in mysqldump output
mysql-test/t/mysqldump.test:
  Remove comments in mysqldump output
 2006-06-15 11:55:53 +02:00
unknown
57096e94cf Removed stray bracket 2006-06-15 11:40:53 +02:00
unknown
6bc9973183 Merge mysql.com:/home/mydev/mysql-5.0-amerge 
into  mysql.com:/home/mydev/mysql-5.1-amerge


mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Manual merge
sql/ha_myisammrg.h:
  Manual merge
 2006-06-15 10:58:02 +02:00
unknown
64b82dfdb7 Fixed windows compilation failure introduced by fix for BUG#12982. 
include/my_global.h:
  Remove cast to ssize_t, since there is no ssize_t type on Windows.
 2006-06-15 13:38:32 +05:00
unknown
684bda9a06 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/b19066-mysql-5.1-new
 2006-06-15 10:29:06 +02:00