Commit graph

13298 commits

Author SHA1 Message Date
unknown
53ca595451 Merge with 4.0 to get bug fixes
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/r/system_mysql_db.result:
  Auto merged
mysql-test/r/system_mysql_db_refs.result:
  Auto merged
mysql-test/t/system_mysql_db_fix-master.opt:
  Auto merged
mysql-test/t/system_mysql_db.test:
  Auto merged
2004-07-09 02:29:28 +03:00
unknown
ee9890162e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-07-09 02:03:50 +03:00
unknown
da4f3b371a Updated result sets (from 4.1) 2004-07-09 02:03:19 +03:00
unknown
39d6bdfb73 Do-compile:
Call my_md5sum with path


Build-tools/Do-compile:
  Call my_md5sum with path
2004-07-08 16:16:37 -05:00
unknown
4acc0869c4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-08 14:06:30 -05:00
unknown
9c7e5eddca Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-08 13:52:46 -05:00
unknown
8fe328f3a6 Do-compile:
Added support for MD5 verification of file transfers


Build-tools/Do-compile:
  Added support for MD5 verification of file transfers
2004-07-08 13:51:18 -05:00
unknown
85c57e7048 Fixed Bug#4451. According to C/C++ standards, enums should not be used
out of their range.
2004-07-08 17:12:42 +03:00
unknown
661b8165ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_db.cc:
  Auto merged
2004-07-08 15:45:56 +03:00
unknown
a23fbc060e New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
Added key part to optimize_range() to fix problems when using fields in key parts.



sql/examples/ha_archive.h:
  New handler::index_flags() definition
sql/examples/ha_example.h:
  New handler::index_flags() definition
sql/field.cc:
  New optimize_range() definition
sql/field.h:
  New optimize_range() definition
sql/ha_berkeley.cc:
  New handler::index_flags() definition
sql/ha_berkeley.h:
  New handler::index_flags() definition
sql/ha_heap.h:
  New handler::index_flags() definition
sql/ha_innodb.h:
  New handler::index_flags() definition
sql/ha_isam.h:
  New handler::index_flags() definition
sql/ha_isammrg.h:
  New handler::index_flags() definition
sql/ha_myisam.h:
  New handler::index_flags() definition
sql/ha_myisammrg.h:
  New handler::index_flags() definition
sql/ha_ndbcluster.cc:
  New handler::index_flags() definition
sql/ha_ndbcluster.h:
  New handler::index_flags() definition
sql/handler.h:
  New handler::index_flags() definition
sql/log.cc:
  Fixed compiler warnings
sql/log_event.cc:
  Fixed compiler warnings (and renamed short variable name)
sql/opt_range.cc:
  New handler::index_flags() definition
sql/opt_sum.cc:
  New handler::index_flags() definition
sql/set_var.cc:
  Removed compiler warnings
sql/sql_db.cc:
  Removed compiler warnings
sql/sql_select.cc:
  New handler::index_flags() definition
sql/sql_show.cc:
  Removed compiler warnings
sql/sql_update.cc:
  Removed compiler warnings
sql/table.cc:
  New handler::index_flags() definition
2004-07-08 15:45:25 +03:00
unknown
80e005737b Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-07-08 13:59:53 +03:00
unknown
d1bb34d270 Minor fix: V is primary level, not U. 2004-07-08 15:19:26 +05:00
unknown
fb0aa2166c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
2004-07-08 13:18:57 +03:00
unknown
f96b20c95e WL#807 Optimize loading database options in load_db_opt
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
2004-07-08 15:03:01 +05:00
unknown
002a555e5b results fixed 2004-07-08 10:11:30 +02:00
unknown
bfaab0fbfa Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-07 23:51:25 +02:00
unknown
11300725df bug#4441 - crash in UNHEX(NULL) 2004-07-07 23:49:03 +02:00
unknown
1a22b760b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-07 16:33:30 -05:00
unknown
9c8965933b Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-07 16:29:10 -05:00
unknown
fc3c71e9b6 my_md5sum:
Exit properly


Build-tools/my_md5sum:
  Exit properly
2004-07-07 16:28:07 -05:00
unknown
5ef15478cd Don't allow badly formed UTF8 identitiers 2004-07-07 16:39:43 +05:00
unknown
288b8d957b Adding Roman (classical Latin) collation. 2004-07-07 15:20:23 +05:00
unknown
4e95ea7b6e ha_archive.cc:
Memory was used after it has been alreay freed.
  This led to server crash on FreeBSD.


sql/examples/ha_archive.cc:
  Memory was used after it has been alreay freed.
  This led to server crash on FreeBSD.
2004-07-07 13:47:29 +05:00
unknown
8ce9725e53 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:49:34 +02:00
unknown
10935692c9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:46:13 +02:00
unknown
f5652ffa15 Fixed typo 2004-07-06 17:45:37 +02:00
unknown
6407a93259 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.rdg.cyberkinetica.com:/usr/home/antony/work/bug4407.1
2004-07-06 16:43:39 +01:00
unknown
8da691f38c Bug#4407 - assertion in ha_myisam.cc
Fix assertion failure where ha_myisam::index_next() is called
  without first calling ha_myisam::ha_index_init()


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-06 16:30:50 +01:00
unknown
f1b37d3e30 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


client/mysqltest.c:
  Auto merged
2004-07-06 16:30:04 +02:00
unknown
68aec1e48d mysql_fix_privilege_tables.sh:
various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1


mysql-test/mysql-test-run.sh:
  it's --verbose, not --verbose=1
mysql-test/t/ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
scripts/mysql_fix_privilege_tables.sh:
  various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
2004-07-06 16:29:26 +02:00
unknown
692f440b42 HAVE_RTREE_KEYS are enabled on windows too 2004-07-06 14:24:44 +02:00
unknown
b5f66b02a4 mysqltest.c:
Bug #4338  	mysql-test-run fails if compiled with non-latin1 character set.


client/mysqltest.c:
  Bug #4338  	mysql-test-run fails if compiled with non-latin1 character set.
2004-07-06 17:18:04 +05:00
unknown
dce5cc109d Bug#4417 binary character set breaks multi-byte table/field name. 2004-07-06 17:15:43 +05:00
unknown
133c244d19 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
unknown
6ecb255734 re-enable spatial features for windows
grr
2004-07-06 13:56:50 +02:00
unknown
82912d989c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 10:45:53 +02:00
unknown
46f90a6a3e rpl_charset.result, rpl_charset.test:
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.


mysql-test/t/rpl_charset.test:
  An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
mysql-test/r/rpl_charset.result:
  An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-06 13:43:15 +05:00
unknown
1d57e419e9 Fix uninit variable 2004-07-06 10:19:05 +02:00
unknown
2a64371e64 my_lib.c:
more accurate comment


mysys/my_lib.c:
  more accurate comment
2004-07-05 19:12:23 +02:00
unknown
bdb3460fed Windows-specific:
Fix for BUG#4375 "Windows specific directories are copied during
replication": in the Windows version of my_dir(), do not show hidden
or system files which Windows sometimes creates in the root directory
of drive (like RECYCLER and SYSTEM VOLUME INFORMATION directories) (so
this problem showed up only when the datadir was the root dir of a
drive).
This will make SHOW DATABASES display better, and will do no harm to
MySQL. For example, DROP DATABASE will not miss some files, as MySQL
creates no hidden or system files.


mysys/my_lib.c:
  In my_dir(), do not show hidden or system files
  which Windows sometimes creates.
2004-07-05 19:07:26 +02:00
unknown
3e3a2e835b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
2004-07-05 10:08:38 +02:00
unknown
38486b33c6 Merge joreland@bk-internal:/home/bk/mysql-4.1
into melody.local:/home/mysqldev/jonas/mysql-4.1
2004-07-05 07:59:34 +02:00
unknown
1042c0e86b BUG#4384
ndb/src/common/util/ConfigValues.cpp:
  BUG#4384
  Compute pointers manually instead of using ptr[-x]
  Changed return type from "*&" to "**"
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-07-05 07:52:20 +02:00
unknown
298ce27e92 - fixed typo in mysql-test/ndb/ndbcluster.sh that caused a
"test: argument expected" error when trying to run the NDB test
   suite on Solaris


mysql-test/ndb/ndbcluster.sh:
   - fixed typo that caused a "test: argument expected" error when trying
     to run the NDB test suite on Solaris
2004-07-05 07:48:09 +02:00
unknown
41b04a9b1e Fix mysql-test-run ndb order by/endian issue 2004-07-05 07:14:45 +02:00
unknown
a7909ab90a Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/gcc34
2004-07-04 21:20:39 +02:00
unknown
ad165ad183 do not assign values of left expression of IN/ANN/ANY subquery in case of PS preparation (BUG#4403)
mysql-test/r/ps_2myisam.result:
  changes in results of select without order by
mysql-test/r/ps_3innodb.result:
  changes in results of select without order by
mysql-test/r/ps_5merge.result:
  changes in results of select without order by
mysql-test/r/ps_6bdb.result:
  changes in results of select without order by
sql/item_cmpfunc.cc:
  do not assign values of left expression of IN/ANN/ANY subquery in case of PS preparation
2004-07-04 10:40:24 +03:00
unknown
d760bfd6b0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
2004-07-02 17:32:47 -05:00
unknown
5b38494800 item_geofunc.cc:
Minor comment tweaks.


sql/item_geofunc.cc:
  Minor comment tweaks.
2004-07-02 16:22:46 -05:00
unknown
3214bf8117 Added comments to the PS test files, to prevent modifications which may destroy the tests .
mysql-test/include/ps_create.inc:
  Added comments
mysql-test/include/ps_modify.inc:
  added comments
mysql-test/include/ps_modify1.inc:
  Added comments
mysql-test/include/ps_query.inc:
  Added and modified comments
mysql-test/t/ps_1general.test:
  Description of the test structure and rules how to extend the tests added and one comment modified .
mysql-test/t/ps_2myisam.test:
  Added comments
mysql-test/t/ps_3innodb.test:
  added comments
mysql-test/t/ps_4heap.test:
  added and altered comments
mysql-test/t/ps_5merge.test:
  added comments
mysql-test/t/ps_6bdb.test:
  added comments
2004-07-02 20:01:34 +02:00