Commit graph

23285 commits

Author SHA1 Message Date
unknown
cfb54ed514 ha_archive.cc:
Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String


sql/examples/ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
VC++Files/sql/mysqld.dsp:
  Added the ARCHIVE storage engine to max
sql/examples/ha_archive.cc:
  Use local seach path for "mysql_priv.h"
2005-05-24 18:51:53 +02:00
unknown
be9845b004 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-05-24 19:47:18 +03:00
unknown
edcc645b8e Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-05-24 18:23:31 +03:00
unknown
879d932ba9 Merge
mysql-test/r/lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/t/lock.test:
  Auto merged
mysql-test/r/rpl_rotate_logs.result:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
sql/sql_repl.cc:
  SCCS merged
2005-05-24 15:52:48 +01:00
unknown
801c2c275a Added a test case for Bug#8009.
sql/item.cc:
  Fixed Bug#8009.
2005-05-24 17:50:17 +03:00
unknown
8643958c5f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/41test2
2005-05-24 09:02:56 -05:00
unknown
6a96b815e7 removed unneeded reserved_win_names testcase
BitKeeper/deleted/.del-reserved_win_names.test~334b02776c4247a7:
  Delete: mysql-test/t/reserved_win_names.test
BitKeeper/deleted/.del-reserved_win_names.require~be6a130b5430085f:
  Delete: mysql-test/r/reserved_win_names.require
BitKeeper/deleted/.del-reserved_win_names.result~ea458226c0df5337:
  Delete: mysql-test/r/reserved_win_names.result
2005-05-24 09:01:06 -05:00
unknown
3b3cd242a0 - bumped up version number string to 4.1.12a 2005-05-24 15:14:21 +02:00
unknown
4a80acecea - added the cp932 charset support to the Windows builds
VC++Files/strings/strings.dsp:
  - added ctype-cp932.c to the project (new charset)
include/config-win.h:
  - added a HAVE_CHARSET_cp932 #define to enable the cp932 charset
    on Windows
2005-05-24 14:46:28 +02:00
unknown
3a23b67566 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p3-bug7241.5
2005-05-24 13:40:25 +01:00
unknown
1a8f64d715 Add comments 2005-05-24 13:38:46 +01:00
unknown
9e636a2491 - Backport of the patch to fix BUG#10687 (Merge engine fails
on Windows): applied required patches on top of the 4.1.12
  release (will be published as 4.1.12a for Windows)


myisammrg/myrg_open.c:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    under Windows): use fn_format to convert pathnames if the files 
    in the merge file have a pathname
mysys/my_getwd.c:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    on Windows): Added test to see if FN_LIBCHAR != '/' before
    doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
  - Backport of the patch to fix BUG#10687 (Merge engine fails 
    on Windows): added extra debug output
2005-05-24 14:30:22 +02:00
unknown
8ddb0ddc5c Print information about XA recovery only if there are prepared XA transactions
after recovery.
2005-05-24 14:06:44 +03:00
unknown
efc7b884eb Bug#7241 - Invalid response when DELETE .. USING and LOCK TABLES used.
Only acquire necessary write lock for multi-delete


mysql-test/r/lock.result:
  Test for Bug#7241
mysql-test/t/lock.test:
  Test for Bug#7241
sql/sql_parse.cc:
  Bug#7241
    Don't acquire write lock on all tables.
    Make sure to set lock_type on real table_list
2005-05-24 11:44:34 +01:00
unknown
d0afc3492e Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-24 15:35:24 +05:00
unknown
f9433acc81 Fix for bug #10659: information_schema_db fail on Mac OS 2005-05-24 14:35:23 +04:00
unknown
ab1ba1341c Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-05-24 10:19:10 +02:00
unknown
b36f9f2eed Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-24 01:09:23 +02:00
unknown
0e4afc2412 Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
into bk-internal.mysql.com:/data0/bk/mysql-5.0


BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysys/my_open.c:
  Auto merged
2005-05-24 00:31:28 +02:00
unknown
b6c1f2302a marking the file gone again to hopefully get the tree on its feet
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-23 23:54:39 +02:00
unknown
9c79a9d691 Fixed on BUG#6048: Stored procedure causes operating system reboot
Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.
  Second attempt, now tested with debug build, valgrind build, max (optimized)
  build, with and without --debug, --vagrind and --ps-protocol.
  Errors in trigger and view test with --debug in debug build where present
  before this patch, and likewise for valgrind warnings for view test in
  valgrind build with --ps-protocol.


sql/item.cc:
  Init rsize in Item (for SP item reusal).
sql/item.h:
  Addes special new operator for reuse of Items, for SP internal use only.
sql/sp_head.cc:
  Reuse items assigned internally in SPs when possible.
sql/sp_rcontext.cc:
  Reuse items assigned internally in SPs when possible.
  Moved the local variable assignment here (from sp_head) to avoid
  duplicated code.
sql/sp_rcontext.h:
  New arg to sp_rcontext::set_item_eval() (and some coding style).
sql/sql_class.cc:
  Adjusted call to new set_item_eval().
2005-05-23 23:43:43 +02:00
unknown
97bde75e4e BUG# 9148 Denial of service
fixups of test case and comment formatting


BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b:
  ***MISSING TEXT***
mysql-test/r/lowercase_table.result:
  added my test for bug #9148 to this test case
mysql-test/t/lowercase_table.test:
  added my test for bug #9148 to this test case
mysys/my_fopen.c:
  reformatted comments
mysys/my_open.c:
  reformatted comments
2005-05-23 14:48:25 -05:00
unknown
87f3b9f43e mysqld.dsp:
Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
ha_federated.cc:
  Use local seach path for "mysql_priv.h"


sql/ha_federated.cc:
  Use local seach path for "mysql_priv.h"
VC++Files/sql/mysqld.dsp:
  Added BLACKHOLE and FEDERATED storage engines for max builds
  Some preparations for including yaSSL
2005-05-23 21:15:00 +02:00
unknown
d81bee6ec1 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 21:05:30 +02:00
unknown
ad9eba227d A comment for view_prepare_mode.
sql/sql_lex.h:
  A comment.
2005-05-23 22:38:12 +04:00
unknown
cb46f9c5c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp


include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
2005-05-23 20:20:22 +02:00
unknown
7d185f5d7e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-23 13:03:11 -05:00
unknown
b096c34d92 merged changes from 4.1
include/my_global.h:
  Auto merged
ndb/src/cw/cpcd/Process.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
2005-05-23 12:55:39 -05:00
unknown
67c5514b90 BUG#10687 - Merge engine fails under Windows
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.

ha_myisammrg.cc:
  Replaced missing / in format string
my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison


mysys/my_getwd.c:
  Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
  Replaced missing / in format string
2005-05-23 12:31:22 -05:00
unknown
1b2a2c8647 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-05-23 12:08:57 -05:00
unknown
36b3f0a052 BUG# 10687: Merge engine fails under Windows
This cset is to roll out the cset applied earlier from Ingo.
This bug has been fixed with a different cset.



sql/ha_myisammrg.cc:
  removed the patch applied earlier
strings/my_vsnprintf.c:
  removed the patch applied earlier.  The patch was to add %c ability.  
  Monty has already done this.
2005-05-23 12:05:15 -05:00
unknown
3e2417ed57 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp


VC++Files/mysys/mysys.dsp:
  Auto merged
include/my_global.h:
  Auto merged
myisam/rt_split.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
2005-05-23 19:01:16 +02:00
unknown
3ca4caef3f Build fixes for icc, compile _without_ "-no-gnu"
include/my_global.h:
  icc does not define __ICC when emulating gcc. Use __INTEL_COMPILER to check for icc.
ndb/src/cw/cpcd/Process.cpp:
  Remove rlimit64
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Remove dirent64
2005-05-23 18:53:53 +02:00
unknown
6b964f0f10 BUG# 10687: MERGE Engine fails on Windows
This is a replacement for the original patch given by Ingo.  This one comes
from Monty.
The problem is that merge files now use unix style pathnames on all 
platforms.  The merge file open code was not properly converting those
pathnames back to non-unix when necessary.


myisammrg/myrg_open.c:
  use fn_format to convert pathnames if the files in the merge file have a pathname
mysys/my_getwd.c:
  add a test for '/' in the code that determines if a string inlucdes a pathname
2005-05-23 11:53:16 -05:00
unknown
7ff2a5a543 Removing mysqlshutdown and mysqlwatch from the Windows packages, removing their sources.
They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.


BitKeeper/deleted/.del-myshutdown.dsp~a8eee34a3d3ab679:
  Delete: VC++Files/mysqlshutdown/myshutdown.dsp
BitKeeper/deleted/.del-myshutdown_ia64.dsp~dd2ad23d744ba1ba:
  Delete: VC++Files/mysqlshutdown/myshutdown_ia64.dsp
BitKeeper/deleted/.del-mysql.ico~d4c55da4e911ced7:
  Delete: VC++Files/mysqlshutdown/mysql.ico
BitKeeper/deleted/.del-mysqlshutdown.c~35d5feec4507d810:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.dsp~27db1e088d39987c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp
BitKeeper/deleted/.del-mysqlshutdown.rc~454359c66381843c:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlshutdown_ia64.dsp~53fe7127af678bc:
  Delete: VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
BitKeeper/deleted/.del-mysqlwatch.c~de504821ede1cb8:
  Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-mysqlwatch.dsp~4699ddfb6ed23a6d:
  Delete: VC++Files/mysqlwatch/mysqlwatch.dsp
BitKeeper/deleted/.del-mysqlwatch_ia64.dsp~1a11ce58f66a493:
  Delete: VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
BitKeeper/deleted/.del-db.cpp~6bbc3687ff8a2913:
  Delete: VC++Files/winmysqladmin/db.cpp
BitKeeper/deleted/.del-db.h~e38deaf45dffa24d:
  Delete: VC++Files/winmysqladmin/db.h
BitKeeper/deleted/.del-initsetup.cpp~b988f9ab7dbe4e92:
  Delete: VC++Files/winmysqladmin/initsetup.cpp
BitKeeper/deleted/.del-initsetup.h~bc2a39769765e1a5:
  Delete: VC++Files/winmysqladmin/initsetup.h
BitKeeper/deleted/.del-main.cpp~f822deb513ce0250:
  Delete: VC++Files/winmysqladmin/main.cpp
BitKeeper/deleted/.del-Goahead.ico~805e753b7f13c6b7:
  Delete: VC++Files/winmysqladmin/images/Goahead.ico
BitKeeper/deleted/.del-main.h~d17e73cf0b0cbf8:
  Delete: VC++Files/winmysqladmin/main.h
BitKeeper/deleted/.del-mysql.h~a538c356e526804b:
  Delete: VC++Files/winmysqladmin/mysql.h
BitKeeper/deleted/.del-mysql_com.h~8828acc269ca5036:
  Delete: VC++Files/winmysqladmin/mysql_com.h
BitKeeper/deleted/.del-mysql_version.h~674dd1127ee25880:
  Delete: VC++Files/winmysqladmin/mysql_version.h
BitKeeper/deleted/.del-winmysqladmin.cpp~bfac61f49813a983:
  Delete: VC++Files/winmysqladmin/winmysqladmin.cpp
BitKeeper/deleted/.del-HELP.ICO~6b91d6eff4a7b11e:
  Delete: VC++Files/winmysqladmin/images/HELP.ICO
BitKeeper/deleted/.del-INFO.ICO~b1eb08e87e0c1c3e:
  Delete: VC++Files/winmysqladmin/images/INFO.ICO
BitKeeper/deleted/.del-Info.bmp~9c3c5afea29fa9b7:
  Delete: VC++Files/winmysqladmin/images/Info.bmp
BitKeeper/deleted/.del-MYINI.ICO~91c77cc71d665f4:
  Delete: VC++Files/winmysqladmin/images/MYINI.ICO
BitKeeper/deleted/.del-Myini.bmp~6cea36edbb94df3a:
  Delete: VC++Files/winmysqladmin/images/Myini.bmp
BitKeeper/deleted/.del-Noentry.ico~6791fac163575069:
  Delete: VC++Files/winmysqladmin/images/Noentry.ico
BitKeeper/deleted/.del-SETUP.BMP~43bd1e614fc7e5d5:
  Delete: VC++Files/winmysqladmin/images/SETUP.BMP
BitKeeper/deleted/.del-Setup 16.bmp~9a9bf24a5dd952f3:
  Delete: VC++Files/winmysqladmin/images/Setup 16.bmp
BitKeeper/deleted/.del-Table.ico~d64bf78e407b5e50:
  Delete: VC++Files/winmysqladmin/images/Table.ico
BitKeeper/deleted/.del-Working.ico~f5cf304a7b6e592c:
  Delete: VC++Files/winmysqladmin/images/Working.ico
BitKeeper/deleted/.del-database.ico~df8562312d9d9ed8:
  Delete: VC++Files/winmysqladmin/images/database.ico
BitKeeper/deleted/.del-find.ico~44644ca5bab7901e:
  Delete: VC++Files/winmysqladmin/images/find.ico
BitKeeper/deleted/.del-green.ico~88749a9a4ff83d25:
  Delete: VC++Files/winmysqladmin/images/green.ico
BitKeeper/deleted/.del-help.bmp~bb6ac08cf7ab60d7:
  Delete: VC++Files/winmysqladmin/images/help.bmp
BitKeeper/deleted/.del-initsetup.cpp~6704e992d966647f:
  Delete: VC++Files/winmysqladmin/images/initsetup.cpp
BitKeeper/deleted/.del-killdb.ico~1043773bac9da67c:
  Delete: VC++Files/winmysqladmin/images/killdb.ico
BitKeeper/deleted/.del-logo.ico~f00b08cd64695232:
  Delete: VC++Files/winmysqladmin/images/logo.ico
BitKeeper/deleted/.del-multitrg.ico~52f787d7d9509533:
  Delete: VC++Files/winmysqladmin/images/multitrg.ico
BitKeeper/deleted/.del-mysql-07.bmp~c157a2c3573b5c27:
  Delete: VC++Files/winmysqladmin/images/mysql-07.bmp
BitKeeper/deleted/.del-mysql-17.bmp~99b3c90f96a9964b:
  Delete: VC++Files/winmysqladmin/images/mysql-17.bmp
BitKeeper/deleted/.del-mysql.BMP~b58fe4f0c416291:
  Delete: VC++Files/winmysqladmin/images/mysql.BMP
BitKeeper/deleted/.del-red.ico~179f5587e5a706c9:
  Delete: VC++Files/winmysqladmin/images/red.ico
BitKeeper/deleted/.del-red22.BMP~bc47efefee4a5a86:
  Delete: VC++Files/winmysqladmin/images/red22.BMP
BitKeeper/deleted/.del-see.bmp~c6863c3564387841:
  Delete: VC++Files/winmysqladmin/images/see.bmp
VC++Files/mysql.dsw:
  removing mysqlshutdown and mysqlwatch
VC++Files/mysql_ia64.dsw:
  removing mysqlshutdown and mysqlwatch
2005-05-23 16:50:20 +02:00
unknown
bc40c03d3a Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/c4944-4.1 2005-05-23 16:23:05 +02:00
unknown
d35e537a68 Build fix
include/my_global.h:
  Look for __INTEL_COMPILER to detect icc
2005-05-23 15:13:21 +02:00
unknown
c1248c4268 Build fix
ndb/src/cw/cpcd/Process.cpp:
  Remove ifdef for icc
  Shouldn't need to define rlimit64
2005-05-23 15:02:02 +02:00
unknown
4694d1245e ndb - NdbDictionaryImpl.cpp: fix access to freed memory
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix access to freed memory
2005-05-22 20:47:08 +02:00
unknown
6f3718e4e8 misc.hpp:
Check _LONGLONG_TYPE as well, to define 'word64', to make it
  work on Solaris 10 x86_64.
  Can't assume all x86_64 share the same assembler syntax.
  For now disabled assembler for x86_64 and Solaris.


extra/yassl/taocrypt/include/misc.hpp:
  Check _LONGLONG_TYPE as well, to define 'word64', to make it
  work on Solaris 10 x86_64.
  Can't assume all x86_64 share the same assembler syntax.
  For now disabled assembler for x86_64 and Solaris.
2005-05-22 04:19:54 +02:00
unknown
05e658235b default_modify.c:
Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
  New file needed, "../mysys/default_modify.c"


VC++Files/libmysql/libmysql.dsp:
  New file needed, "../mysys/default_modify.c"
VC++Files/libmysqld/libmysqld.dsp:
  New file needed, "../mysys/default_modify.c"
VC++Files/mysys/mysys.dsp:
  New file needed, "../mysys/default_modify.c"
sql/des_key_file.cc:
  Use local seach path for "mysql_priv.h"
mysys/default_modify.c:
  Use MY_STAT to declare argument to my_fstat()
2005-05-21 23:23:39 +02:00
unknown
442c072fdf BUG# 9148: Denial of service
This is a second patch needing another review.  The first patch didn't solve
the entire problem.  open and fopen on Windows will still open
files like "com1.sym" when they shouldn't.  This patch
checks that the file exists before trying to open it.



mysys/my_fopen.c:
  on Windows, if we are not creating a file the we call my_access to make sure the
  file exists before trying to open it.
mysys/my_open.c:
  on Windows, if we are not creating a file the we call my_access to make sure the
  file exists before trying to open it.
2005-05-21 12:31:58 -05:00
unknown
982bd00d48 ha_innodb.cc:
The natural InnoDB type for NEWDECIMAL is FIXBINARY, not BINARY, since there probably is no benefit from stripping trailing bytes 0x20; note that tables created with 5.0.6 and containing DECIMAL do not need to be rebuilt, as BINARY works as well; note that because of Jani's fix to bug 10465, tables created with 5.0.? - 5.0.5 DO NEED TO BE REBUILT if they contain DECIMAL


sql/ha_innodb.cc:
  The natural InnoDB type for NEWDECIMAL is FIXBINARY, not BINARY, since there probably is no benefit from stripping trailing bytes 0x20; note that tables created with 5.0.6 and containing DECIMAL do not need to be rebuilt, as BINARY works as well; note that because of Jani's fix to bug 10465, tables created with 5.0.? - 5.0.5 DO NEED TO BE REBUILT if they contain DECIMAL
2005-05-21 18:44:51 +03:00
unknown
6df4988985 join_outer.test, join_outer.result:
Added test cases for bug #9938.
item.h:
  Fixed bug #9938: missing method not_null_tables for Item_ref.


sql/item.h:
  Fixed bug #9938: missing method not_null_tables for Item_ref.
mysql-test/t/join_outer.test:
  Added test cases for bug #9938.
2005-05-21 08:44:50 -07:00
unknown
e2e90649f5 sql_select.cc:
Added missing comment for fix of #10561.


sql/sql_select.cc:
  Added missing comment for fix of #10561.
2005-05-21 08:39:35 -07:00
unknown
d844dab14f opt_range.cc:
Post review corrections for optimization request #10561.


sql/opt_range.cc:
  Post review corrections for optimization request #10561.
2005-05-21 07:02:43 -07:00
unknown
8f7bca3abd range.result, range.test:
Added test cases for optimization request #10561.
opt_range.cc, sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.


sql/sql_select.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
sql/opt_range.cc:
  Fixed bug #10561: an optimization request to allow
  range analysis for NOT IN and NOT BETWEEN.
mysql-test/t/range.test:
  Added test cases for optimization request #10561.
mysql-test/r/range.result:
  Added test cases for optimization request #10561.
2005-05-21 06:11:44 -07:00
unknown
c273526d85 Merge mdk10.(none):/home/reggie/bk/bug9148
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-05-20 16:59:31 -05:00
unknown
9b8e02741a fixed stupid typo that added a ! before my_access 2005-05-20 16:53:41 -05:00
unknown
606d8a5ab0 fixed conflicts
VC++Files/mysys/mysys.dsp:
  Auto merged
include/my_sys.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
2005-05-20 16:34:59 -05:00