Commit graph

44417 commits

Author SHA1 Message Date
unknown
f3009f3f06 Applied innodb-5.1-ss1381 snapshot
Bug #27381: InnoDB exits when attempting to rename table to non-existant database
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().


mysql-test/t/innodb.test:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1373:
  Port r1372 from branches/5.0: Merge a change from MySQL AB, and remove
  the innodb_gis test case.
  
  ChangeSet
    2007/02/19 13:57:06+03:00 kaa@polly.local
    Bug#18743: Several test cases fails if "classic" configuration in 5.0
    The problem happened because those tests were using "cp932" and "ucs2"
    without checking whether these character sets are available.
    This fix moves test parts to make character set specific parts be
    tested only if they are:
    - some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
    - some parts were moved to the newly added tests "innodb-ucs2.test",
    "mysqlbinglog-cp932.test" and "sp-ucs2.test"
  
  mysql-test/t/innodb.test
    2007/02/19 13:57:02+03:00 kaa@polly.local +0 -222
    Moved ucs2-specific test cases to innodb-ucs2.test
storage/innobase/Makefile.am:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1353:
  Makefile.am: EXTRA_DIST: Add the grammar source files to the
  source distribution of MySQL.
storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1350:
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/handler/ha_innodb.cc:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1377:
  Add static qualifiers to some symbols in ha_innodb.cc that are not
  referenced from other modules.
  
  
  Revision r1380:
  Remove ha_innobase::last_query_id and references to thd->query_id.
  
  MySQL calls external_lock at the beginning and end of a statement
  when it is not calling start_stmt or commit or rollback.  Thus,
  statement boundaries can be (and are already) detected without
  monitoring thd->query_id.
  
  The function innobase_commit() seemingly lacks the call to
  innobase_release_stat_resources(), which should be called at
  the end of every SQL statement.  The call was replaced by
  equivalent statements by Vadim Tkachenko when he implemented
  innodb_commit_concurrency in MySQL 5.0:
  
  http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
  
  
  Revision r1355:
  class ha_innobase: Replace statistic_increment() with ha_statistic_increment().
  
  ha_innobase::change_active_index(): Do not call current_thd unless
  UNIV_DEBUG is defined.
  
  
  Revision r1369:
  Merge a change from MySQL AB:
  
  ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
  Bug #26598: Create variable to allow turning off of statistic gathering
  on metadata commands
  
  Add innodb_stats_on_metadata option, which enables gathering
  index statistics when processing metadata commands such as
  SHOW TABLE STATUS.  Default behavior of the server does not
  change (this option is enabled by default).
  
  
  Revision r1342:
  Minor cleanup in ha_innodb.cc.
  
  Remove the unused constants HA_INNOBASE_ROWS_IN_TABLE and
  HA_INNOBASE_RANGE_COUNT.  Declare innobase_active_counter static.
  
  
  Revision r1381:
  innobase_commit(): Correct the comments and formatting that were broken when
  innodb_commit_concurrency was implemented.
  
  
  Revision r1360:
  Minor cleanup.
  
  innobase_query_caching_of_table_permitted(): Make static.
  
  ha_innobase::register_query_cache_table(): Move the function
  definition from ha_innodb.h to ha_innodb.cc.  Add comments.
storage/innobase/handler/ha_innodb.h:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1377:
  Add static qualifiers to some symbols in ha_innodb.cc that are not
  referenced from other modules.
  
  
  Revision r1380:
  Remove ha_innobase::last_query_id and references to thd->query_id.
  
  MySQL calls external_lock at the beginning and end of a statement
  when it is not calling start_stmt or commit or rollback.  Thus,
  statement boundaries can be (and are already) detected without
  monitoring thd->query_id.
  
  The function innobase_commit() seemingly lacks the call to
  innobase_release_stat_resources(), which should be called at
  the end of every SQL statement.  The call was replaced by
  equivalent statements by Vadim Tkachenko when he implemented
  innodb_commit_concurrency in MySQL 5.0:
  
  http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
  
  
  Revision r1369:
  Merge a change from MySQL AB:
  
  ChangeSet@1.2409.1.83  2007-03-06 10:36:15-07:00  tsmith@hindu.god
  Bug #26598: Create variable to allow turning off of statistic gathering
  on metadata commands
  
  Add innodb_stats_on_metadata option, which enables gathering
  index statistics when processing metadata commands such as
  SHOW TABLE STATUS.  Default behavior of the server does not
  change (this option is enabled by default).
  
  
  Revision r1360:
  Minor cleanup.
  
  innobase_query_caching_of_table_permitted(): Make static.
  
  ha_innobase::register_query_cache_table(): Move the function
  definition from ha_innodb.h to ha_innodb.cc.  Add comments.
storage/innobase/include/trx0trx.h:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
  
  
  Revision r1343:
  trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
  and never tested.
storage/innobase/os/os0file.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1352:
  Fix typo in comment in os/os0file.c
  
  Approved by:	heikki
  
  
  
  Revision r1366:
  Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
  os_file_handle_error().
  
  Approved by:	Heikki
storage/innobase/row/row0undo.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1350:
  Lock the data dictionary during rollback.  This removes the rare
  debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
  dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/trx/trx0purge.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
storage/innobase/trx/trx0trx.c:
  Applied innodb-5.1-ss1381 snapshot
  
  Revision r1344:
  Rename the Boolean field trx->type to trx->is_purge
  and remove the constants TRX_USER and TRX_PURGE.
  
  
  Revision r1343:
  trx_sig_struct: Remove state.  It is always assigned to TRX_SIG_WAITING
  and never tested.
2007-03-28 22:46:28 -06:00
unknown
c8fde97f48 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


sql/log.cc:
  Manual merge
2007-03-28 17:54:11 -06:00
unknown
465cf7380a Remove warning when compiling libmysqld/log.cc
sql/log.cc:
  define print_buffer_to_file only ifdef EMBEDDED_LIBRARY, to avoid "defined but not used" warning
2007-03-28 17:50:06 -06:00
unknown
382ae31305 Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/include/gis_generic.inc:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
mysql-test/r/innodb_gis.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
sql/log.cc:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged
2007-03-28 17:41:52 -06:00
unknown
942bb0dfd9 Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result


mysql-test/include/gis_generic.inc:
  Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
  - Add primary key to test table, so NDB with binlog doesn't complain
mysql-test/r/archive_gis.result:
  update test results
mysql-test/r/bdb_gis.result:
  update test results
mysql-test/r/innodb_gis.result:
  update test results
mysql-test/r/ndb_gis.result:
  update test results
2007-03-28 17:40:42 -06:00
unknown
3d52fb0e71 Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-03-28 12:27:37 -06:00
unknown
6190715f5a Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 11:47:28 -06:00
unknown
965816241a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-03-28 21:22:13 +04:00
unknown
94cb1c1c47 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-03-28 21:21:22 +04:00
unknown
339ae7c743 Merge pilot.blaudden:/home/msvensson/mysql/yassl_import/my51-yassl_import2
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:48:36 +02:00
unknown
94b6ec6b1e Import yaSSL
extra/yassl/include/lock.hpp:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/include/socket_wrapper.hpp:
  Import patch yassl.diff
extra/yassl/include/yassl.hpp:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/mySTL/algorithm.hpp:
  Import patch yassl.diff
2007-03-28 18:47:51 +02:00
unknown
c6638c4278 Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 18:43:49 +02:00
unknown
4037871255 Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


sql/log.cc:
  Auto merged
2007-03-28 18:43:39 +02:00
unknown
34ada6e483 Merge polly.local:/tmp/maint/bug26844/my51-bug26844
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-03-28 20:39:34 +04:00
unknown
c6b0bceefd Merge pilot.blaudden:/home/msvensson/mysql/bug27490/my50-bug27490
into  pilot.blaudden:/home/msvensson/mysql/bug27490/my51-bug27490


sql/log.cc:
  Manual merge, the -5 hack is not needed anymore
2007-03-28 18:37:27 +02:00
unknown
f7c4ed0abe Bug #26262: Add option to skip binary logging for mysqlcheck
Add the --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG
to REPAIR, ANALYZE, and OPTIMIZE commands.

Use this option when these SQL commands should not be sent to
replication slaves, nor run when using the binary logs for recovery
from backup


client/client_priv.h:
  Add OPT_WRITE_BINLOG client option
client/mysqlcheck.c:
  Add --skip-write-binlog option, which adds NO_WRITE_TO_BINLOG to REPAIR, ANALYZE, and OPTIMIZE commands.
2007-03-28 10:19:10 -06:00
unknown
6ba16a703a Merge polly.local:/tmp/maint/bug26844/my50-bug26844
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-03-28 20:16:23 +04:00
unknown
2551c20f7d Merge polly.local:/tmp/maint/bug26844/my50-bug26844
into  polly.local:/tmp/maint/bug26844/my51-bug26844


mysys/my_malloc.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
2007-03-28 20:10:41 +04:00
unknown
70ae657cc2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


extra/yassl/include/openssl/ssl.h:
  Auto merged
extra/yassl/src/ssl.cpp:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2007-03-28 15:57:27 +02:00
unknown
1778d177be Add back the look for exe_mysql 2007-03-28 15:56:57 +02:00
unknown
ff7db598a2 Set yaSSL to use same type as MySQL do for socket handles
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
2007-03-28 15:34:52 +02:00
unknown
f86a489f76 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-03-28 11:17:08 +02:00
unknown
230a116ed2 Turn off im if extern
Remove strange comment
Add run_query function
2007-03-28 11:16:50 +02:00
unknown
3c902fb971 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/lib/mtr_process.pl:
  Auto merged
2007-03-28 10:24:47 +02:00
unknown
2bc57a692c Dont' redirect stderr in ActiveState perl
Improve comments
2007-03-28 10:24:33 +02:00
unknown
9cfc25f2cd Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  SCCS merged
2007-03-28 10:18:35 +02:00
unknown
1747a6b60c Bug#27490 Function to log to NT event log could allocate memory
- Change 'print_buffer_to_nt_event_log' to overwrite the string
if the buffer is not long enough to hold the ending CR/LF's
- Make functions static
- Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
 never to use "new"


sql/log.cc:
  -Change 'print_buffer_to_nt_event_log' to overwrite the string
  if the buffer is not long enough to hold the ending CR/LF's
  - Make functions static
  - Remove the "hack" intended to force 'print_buffer_to_nt_event_log'
   never to use "new"
2007-03-28 10:12:33 +02:00
unknown
e0f5f280a7 Use mtr_verbose instead of "if ($opt_verbose)" 2007-03-28 10:08:26 +02:00
unknown
55883e9628 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-03-28 09:35:03 +02:00
unknown
2473c35960 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-03-28 09:34:04 +02:00
unknown
cce2cb5733 Merge pilot.blaudden:/home/msvensson/mysql/bug25197/my50-bug25197
into  pilot.blaudden:/home/msvensson/mysql/bug25197/my51-bug25197


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
2007-03-28 09:33:16 +02:00
unknown
e9b606bf3e Bug#25197 repeat function returns null when using table field directly as count
- Add extra test case from bug#27073
 - Change "if" to be optimized for count > 0


mysql-test/r/func_str.result:
  Add test case from bug#27073
mysql-test/t/func_str.test:
  Add test case from bug#27073
sql/item_strfunc.cc:
  Change the if statemnet to be optimized for the normal case where count > 0
2007-03-28 09:32:49 +02:00
unknown
563a50770e Remove remnants of ssl_des.test
BitKeeper/deleted/.del-ssl_des-master.opt:
  Delete: mysql-test/t/ssl_des-master.opt
2007-03-27 21:29:45 +02:00
unknown
d8ddc1aa83 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-27 21:12:59 +02:00
unknown
0477ba92e5 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-27 21:12:32 +02:00
unknown
f933ae5d88 Merge pilot.blaudden:/home/msvensson/mysql/bug27022/my50-bug27022
into  pilot.blaudden:/home/msvensson/mysql/bug27022/my51-bug27022


scripts/mysql_install_db.sh:
  Auto merged
2007-03-27 21:11:22 +02:00
unknown
a2eb8b8336 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-03-27 12:16:16 -04:00
unknown
3b0c6e65e1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27047/my50-prece-bug27047
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


sql/sql_show.cc:
  Auto merged
2007-03-27 11:34:16 -04:00
unknown
60fb9a03a4 Bug#26600: table PROFILING in INFORMATION SCHEMA has wrong data type
Bug#27047[partial]: INFORMATION_SCHEMA table cannot have BIGINT \
	fields

No Information_schema table has ever needed floating-point data 
before.  Transforming all floating point to a string and back to a
number causes a real data problem on Windows, where the libc may 
pad the exponent with more leading zeroes than we expect and the
significant digits are truncated away.

This also makes interpreting an unimplemented type as a string into
a fatal error in debug builds.  Thus, we will catch problems when we
try to use those types in new I_S tables.


sql/sql_show.cc:
  Add floating-point types to information_schema output.
2007-03-27 11:30:53 -04:00
unknown
3d90a07a06 Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".
Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.


mysys/my_malloc.c:
  Pass ME_NOREFRESH flag to an error handler in my_malloc() in case of memory allocation failure, so that it gets logged to the error log.
mysys/safemalloc.c:
  Pass ME_NOREFRESH flag to an error handler in _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
2007-03-26 13:31:23 +04:00
unknown
9dfe413a15 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.0


sql-common/my_time.c:
  Auto merged
2007-03-26 13:43:20 +05:00
unknown
87bc0da719 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/ram/work/b25301/b25301.5.1


sql-common/my_time.c:
  Auto merged
2007-03-26 13:40:20 +05:00
unknown
27c1d3e76d after-merge fix: result adjusted. 2007-03-26 13:20:34 +05:00
unknown
b5351740c4 Merge mysql.com:/home/ram/work/b25993/b25993.5.0
into  mysql.com:/home/ram/work/b25993/b25993.5.1


client/mysqldump.c:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
2007-03-26 13:01:46 +05:00
unknown
9b2e0127f0 Fix for bug #25993: mysqldump crashes with merge table and -c option
opt_complete_insert was improperly used by accident.
Use complete_insert flag instead.


client/mysqldump.c:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - use complete_insert instead of opt_complete_insert.
mysql-test/r/mysqldump.result:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test result.
mysql-test/t/mysqldump.test:
  Fix for bug #25993: mysqldump crashes with merge table and -c option
    - test case.
2007-03-26 12:56:41 +05:00
unknown
1801bff37e Bug #24588: "MBROverlaps missing in 5.1?"
The MBR-prefixed function aliases (e.g., MBROVERLAPS()) were missing in 5.1, after
some code refactoring left them out.  This simply adds them into the func_array list.


sql/item_create.cc:
  Add MBR* functions to func_array[]; the non-MBR-prefixed aliases were already there
2007-03-23 18:02:37 -06:00
unknown
f48f4f1efb Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
into  siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51


mysql-test/include/gis_generic.inc:
  Auto merged
mysql-test/r/archive_gis.result:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged
mysql-test/r/ndb_gis.result:
  Auto merged
sql/spatial.h:
  Auto merged
mysql-test/r/gis.result:
  Manual merge
mysql-test/r/innodb_gis.result:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
2007-03-23 17:48:03 -06:00
unknown
7cf2e15dc5 bug#26346
Fix to a memory leak found by a complier warning.
2007-03-23 19:30:25 -04:00
unknown
eee28a267d Bug #24563: MBROverlaps does not seem to function propertly.
Fix is to rewrite the MBR::overlaps() function, to compute the dimension of both
arguments, and the dimension of the intersection; test that all three dimensions are the
same (e.g., all are Polygons).

Add tests for all MBR* functions for various combinations of shapes, lines and points.


mysql-test/include/gis_generic.inc:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
mysql-test/r/archive_gis.result:
  Update test results.
mysql-test/r/bdb_gis.result:
  Update test results.
mysql-test/r/gis.result:
  Update test results.
mysql-test/r/innodb_gis.result:
  Update test results.
mysql-test/r/ndb_gis.result:
  Update test results.
mysql-test/t/gis.test:
  Add tests & checks for bug #24563 and bug #24588 - some GIS functions missing in
  5.1; many GIS functions not tested; Overlaps() function was incorrect when MBR shifted
  only along one axis; Overlaps() needs to take dimension of shape into account.
sql/spatial.h:
  Add MBR::dimension() (map MBR to integral dimension: point -> 0, line -> 1,
  polygon -> 2, invalid -> -1)
  
  Fix MBR::overlaps() to handle MBRs which are shifted on one dimension only, and to
  take MBR dimension into account.  Also, test both within() and contains() predicates (so
  that overlaps(a, b) == overlaps(b, a)).
2007-03-23 16:28:07 -06:00
unknown
09d6be9580 Merge damiendev.:C:/build/dev50
into  damiendev.:C:/build/mysql-5.1


client/mysqldump.c:
  Auto merged
2007-03-23 18:22:57 -04:00