1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-05 16:59:35 +03:00

8938 Commits

Author SHA1 Message Date
unknown
45c062ba7f portability fix: sh does not support "==". This resulted in IM tests failing on range of platforms. 2005-10-16 19:30:10 +04:00
unknown
4c4c0f87ca mysql-test-run.pl:
Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.


mysql-test/mysql-test-run.pl:
  Put socket files into $opt_tmpdir, to avoid problems
  with platforms that can't handle long socket paths.
2005-10-16 17:05:14 +02:00
unknown
3e68a46ab6 thread_registry.h, thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files


scripts/make_binary_distribution.sh:
  Copy *.imtest files
mysql-test/Makefile.am:
  Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
server-tools/instance-manager/thread_registry.h:
  Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
2005-10-16 06:49:19 +02:00
unknown
c2b9856333 Additional fix for bug #12267 (Can't use POINT for primary key)
mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  testcase added
sql/sql_table.cc:
  no need to specify keylength for Point type
sql/sql_yacc.yy:
  no need to specify length for Point type
2005-10-15 22:23:13 +05:00
unknown
a1db45674b Fix for bug #13573 (wrong data inserted for too big decimals)
mysql-test/r/type_newdecimal.result:
  result fixed
mysql-test/t/type_newdecimal.test:
  test case added
sql/item_func.cc:
  conditions fixed
sql/my_decimal.cc:
  overflow handling added
sql/my_decimal.h:
  overflow handling added - so the result of operation gets maximum possible
  decimal value
2005-10-15 21:57:32 +05:00
unknown
56d85e2a03 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.12267


sql/sql_table.cc:
  Auto merged
2005-10-15 21:05:29 +05:00
unknown
83afcc9c6a Change the "Password" column type for the Perl suite running the tests. bug#14023
mysql-test/lib/init_db.sql:
  Data type of the "Password" column has been changed in "mysql_create_system_tables",
  this must be reflected here (until they are united). bug#14023
2005-10-14 13:35:36 +02:00
unknown
40157b14e0 Merge mysql.com:/usr/home/bar/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-5.0


strings/ctype-latin1.c:
  Auto merged
2005-10-14 14:02:21 +05:00
unknown
05414133af Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
2005-10-14 13:57:38 +05:00
unknown
04d52fab7a Merge mysql.com:/usr/home/bar/mysql-5.0.b12547
into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged
2005-10-14 13:37:19 +05:00
unknown
92f80fbb86 ctype_utf8.result:
after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,
2005-10-14 13:24:21 +05:00
unknown
df3e57f51f Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.
2005-10-14 12:07:13 +05:00
unknown
9cc7d75ea3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
unknown
1e11d278c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
unknown
2aa10d2464 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1
2005-10-14 08:20:02 +05:00
unknown
96e7df0cc3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0
2005-10-13 15:41:52 -07:00
unknown
e84f7939ec Fix calculation of TIMESTAMPDIFF() of months and years. (Bug #13534)
mysql-test/r/func_time.result:
  Add new results
mysql-test/t/func_time.test:
  Add new regression test
sql/item_timefunc.cc:
  Fix calculation of years and months in TIMESTAMPDIFF().
2005-10-13 15:32:31 -07:00
unknown
0390de8672 Fix bug #13855 select distinct with group by caused server crash
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.

Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.


sql/sql_select.cc:
  Fix bug #13855 select distinct with group by caused server crash
mysql-test/r/select.result:
  Test case for bug#13855 select distinct with group by caused server crash
mysql-test/t/select.test:
   Test case for bug#13855 select distinct with group by caused server crash
2005-10-14 01:22:24 +04:00
unknown
b896d3343b Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases
2005-10-14 00:04:52 +03:00
unknown
0069549021 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)
2005-10-14 00:02:38 +03:00
unknown
b52b67eb58 BUG# 13146
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers


client/mysqldump.c:
  BUG# 13146
  
  Re-application of fix to clean 5.0 tree. 
  
  Added comments for quote_name, moved declarations into proper order, 
  unset MASK_ANSI_QUOTES flag in opt_compatible_mode global when dumping
  triggers
mysql-test/r/mysqldump.result:
  BUG# 13146
  
  New test results
mysql-test/t/mysqldump.test:
  BUG# 13146
  
  New test
2005-10-13 13:42:56 -07:00
unknown
8402aefe25 Force a server restart for the not_embedded_server test to satisfy
conditions of its first test. (Bug #13796)


mysql-test/t/not_embedded_server-master.opt:
  New BitKeeper file ``mysql-test/t/not_embedded_server-master.opt''
2005-10-13 11:10:45 -07:00
unknown
08d4591881 Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0


mysql-test/t/select.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/r/select.result:
  Merge and change table names a,b,c to t1,t2.t3
2005-10-13 20:18:37 +03:00
unknown
f6cb49223f Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278


mysql-test/t/cast.test:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
2005-10-13 22:18:35 +05:00
unknown
2a25659b47 Merged from 4.1. 2005-10-13 19:34:15 +03:00
unknown
6bf7a0f3c9 select.result, mysqldump-max.result:
after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.


mysql-test/t/range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
mysql-test/r/cast.result:
  after merge fix
mysql-test/r/mysqldump-max.result:
  after merge fix.
mysql-test/r/range.result:
  fixing result accordingly
  ,
mysql-test/r/select.result:
  after merge fix.
2005-10-13 21:28:44 +05:00
unknown
1e14067736 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_pthread.h:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
netware/pack_isam.def:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/xml.c:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/select.result:
  Merged from 4.1.
netware/BUILD/mwenv:
  Merged from 4.1.
scripts/make_binary_distribution.sh:
  Merged from 4.1.
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_show.cc:
  Merged from 4.1.
strings/my_strtoll10.c:
  Merged from 4.1.
2005-10-13 18:23:53 +03:00
unknown
3d332ea76f merging 2005-10-13 19:51:07 +05:00
unknown
2a0183b54d merging
sql/sql_select.cc:
  Auto merged
2005-10-13 19:31:09 +05:00
unknown
dddb6812dd Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.char1


sql/sql_yacc.yy:
  Auto merged
2005-10-13 19:27:44 +05:00
unknown
221039515b ctype_utf8.result, ctype_utf8.test:
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.


sql/item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
sql/sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
mysql-test/t/ctype_utf8.test:
  New syntax: CHAR(x USING charset)
  Adding test case.
mysql-test/r/ctype_utf8.result:
  New syntax: CHAR(x USING charset)
  Adding test case.
2005-10-13 19:24:47 +05:00
unknown
2e887f794a Fix for bug #3874 (Group by field is not considered)
mysql-test/r/select.result:
  test result fixed
mysql-test/t/select.test:
  test case added
sql/sql_select.cc:
  do the same for nullable
2005-10-13 19:23:52 +05:00
unknown
842fd992f6 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b9278


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
2005-10-13 19:19:05 +05:00
unknown
60e411eb32 type_binary.result, type_binary.test:
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.


sql/field.cc:
  Adding true BINARY/VARBINARY.
strings/ctype-big5.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
strings/ctype-cp932.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-czech.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-euc_kr.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-eucjpms.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-extra.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-gb2312.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-gbk.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-latin1.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-simple.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-sjis.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-tis620.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-uca.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-ucs2.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-ujis.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-utf8.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
strings/ctype-win1250ch.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
include/m_ctype.h:
  Adding true BINARY/VARBINARY: new pad_char structure member.
mysql-test/t/alter_table.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/binary.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/cast.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ctype_cp1251.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ctype_many.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/federated.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/func_in.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ndb_condition_pushdown.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/ndb_types.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/sp.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/t/type_blob.test:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/alter_table.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/binary.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/cast.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ctype_cp1251.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ctype_many.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/federated.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/func_in.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ndb_condition_pushdown.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/ndb_types.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/sp.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/system_mysql_db.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
mysql-test/r/type_blob.result:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
scripts/mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
scripts/mysql_fix_privilege_tables.sql:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
2005-10-13 19:16:19 +05:00
unknown
7eee194d6e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
unknown
ab87b08973 Bug #12698 abnormal program termination running mysql_client_test
- Move test for bug#93 from mysql_client_test.c to show_check.test
 - No need for test written in c


mysql-test/r/show_check.result:
  Add test case for bug#93, moved from mysql_client_test.c
mysql-test/t/show_check.test:
  Add test case for bug#93, moved from mysql_client_test.c
tests/mysql_client_test.c:
  Remove test for bug#95 to show_check.test
2005-10-13 15:52:22 +02:00
unknown
8b6ba46c2c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2005-10-13 17:17:32 +04:00
unknown
99ed34376f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/7672-bug-5.0-mysql
2005-10-13 17:11:18 +04:00
unknown
c7fa19caed Merge
VC++Files/mysql.sln:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged
2005-10-13 14:35:53 +02:00
unknown
341fbced18 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
unknown
785b7dbccf Manual merge of bug fix #7672
sql/sql_lex.h:
  Auto merged
2005-10-13 16:00:26 +04:00
unknown
9ca0ba87ca Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
2005-10-13 16:21:35 +05:00
unknown
d1ffce69fa Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-12736
2005-10-13 14:46:57 +04:00
unknown
371f8c69b8 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/t/kill.test:
  Auto merged
2005-10-13 12:38:38 +02:00
unknown
1bbf3a27e4 Merge
mysql-test/t/cast.test:
  Auto merged
sql/item.h:
  Auto merged
2005-10-13 12:23:50 +02:00
unknown
d144a00d81 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/item_strfunc.cc:
  Auto merged
2005-10-13 12:09:39 +02:00
unknown
c7ff3bdb98 Updated after testing
mysql-test/mysql-test-run.pl:
  Improved printouts
mysql-test/r/compress.result:
  Updated test result
mysql-test/r/ssl.result:
  Updated test result
mysql-test/r/ssl_compress.result:
  Updated test result
mysql-test/t/compress.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
mysql-test/t/ssl.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
mysql-test/t/ssl_compress.test:
  Use new connection
  Use common include file 
  Test feature is turned on both before and after tests
2005-10-13 11:28:06 +02:00
unknown
799b1e6c5a BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency)
Updated more DDL statements to cause implicit commit.


mysql-test/r/rpl_ddl.result:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
mysql-test/t/rpl_ddl.test:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
sql/sql_parse.cc:
  added implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
2005-10-13 05:12:17 -04:00
unknown
f4e36f9f04 Merge abarkov@bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
2005-10-13 14:07:41 +05:00
unknown
32a0bac119 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-12736


sql/sql_select.cc:
  Auto merged
2005-10-13 12:17:20 +04:00