Commit graph

22347 commits

Author SHA1 Message Date
unknown
927d747a21 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


configure.in:
  Auto merged
2005-04-29 19:31:56 +02:00
unknown
90110b8429 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.spaerrs
2005-04-29 20:26:11 +05:00
unknown
1df25ccdac Fix for #6553 and #8776 (no errors on bad spatial data)
mysql-test/r/gis-rtree.result:
  test result fixed
mysql-test/r/gis.result:
  test result fixed
mysql-test/t/gis-rtree.test:
  test case fixed
mysql-test/t/gis.test:
  test case added
sql/field.cc:
  error messages launched now when we try to put bad spatial
  data in the GEOMETRY field
sql/field.h:
  interface fixed
sql/item_geofunc.cc:
  bad_data sign now instead of NULL now returned from
  Item_geometry_from_text::val_str
sql/share/errmsg.txt:
  error message added
sql/spatial.cc:
  bad_geometry data instance
sql/spatial.h:
  bad_geometry_data declaration
sql/sql_base.cc:
  messages now created in store_* function
2005-04-29 20:23:02 +05:00
unknown
e31358aecb Merge
configure.in:
  SCCS merged
2005-04-29 15:44:24 +02:00
unknown
c6dedf4ed4 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-29 14:56:04 +02:00
unknown
17e6c8f292 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-04-29 14:16:41 +02:00
unknown
45236ee55d Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-29 12:54:15 +02:00
unknown
027f9390d3 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-29 11:53:35 +02:00
unknown
ae587036bc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  Auto merged
2005-04-29 11:49:54 +02:00
unknown
b6ad57e0a3 Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug 2005-04-29 11:37:47 +02:00
unknown
b84dc09914 ha_innodb.cc:
Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()


sql/ha_innodb.cc:
  Fix compilation error on Windows in innobase_report_binlog_offset_and_commit()
2005-04-29 12:11:04 +03:00
unknown
c481eb3997 BUG#5964 - 4.1 MERGE tables regression from 4.0
After merge fix.
2005-04-29 10:59:34 +02:00
unknown
f9128d95a1 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-29 09:05:37 +02:00
unknown
cfd042108a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9821


sql/sql_parse.cc:
  Auto merged
2005-04-29 02:52:20 +04:00
unknown
45031a4454 Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000


include/my_sys.h:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
2005-04-28 19:34:05 +02:00
unknown
5192a1a368 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge
2005-04-28 21:05:26 +04:00
unknown
275c8e7790 Merge mysql.com:/home/mydev/mysql-4.1-bug5964
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-28 18:34:47 +02:00
unknown
f0e256efe4 BUG#5964 - 4.1 MERGE tables regression from 4.0
Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.


include/my_sys.h:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added declaration for a new function.
myisammrg/myrg_open.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed check for absolute path to check for any path.
mysys/my_getwd.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added a new functions which checks for absolute _or_
  relative paths.
sql/ha_myisammrg.cc:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed the creation of the .MRG file so that only the table  name
  is written when the MyISAM table is in the same database as the
  MERGE table, a relative path is used in other cases in mysqld,
  and possibly an absolute path is used in an embedded server.
2005-04-28 18:28:50 +02:00
unknown
745d52bb3d Fix tiny typo in configure.in
configure.in:
  Fix typo
2005-04-28 07:47:59 -07:00
unknown
21d16ca707 Bug#8321 - myisampack bug in compression algorithm
Merge from 4.0.
2005-04-28 16:09:53 +02:00
unknown
994674c09b Bug#8321 - myisampack bug in compression algorithm
This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size. 
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences. 
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.
2005-04-28 15:27:42 +02:00
unknown
e28bf9ef5e WL#2286 Compile MySQL w/YASSL support
yaSSL-0.9.7 library bundled.


BUILD/Makefile.am:
  compile-pentium-debug-yassl added to distribution.
Makefile.am:
  Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl
  specified. It is empty otherwise.
configure.in:
  yaSSL CHECK-function call.
extra/Makefile.am:
  yaSSL added to distribution.
include/violite.h:
  YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
2005-04-28 18:23:27 +05:00
unknown
f25f9b5873 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


configure.in:
  Auto merged
2005-04-28 13:50:32 +02:00
unknown
ea2eb32bf0 Removing duplicate AC_PREREQ macros
Setting AC_PREREQ required version to 2.50 until we have sorted out what is required. The manual says 2.58.


configure.in:
  Removing duplicate AC_PREREQ macros
2005-04-28 13:48:51 +02:00
unknown
e3613c9377 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-28 13:32:52 +02:00
unknown
b411128fa5 After review fixes to check-cpu
BUILD/check-cpu:
  Remove the exit 0 from check-cpu
2005-04-28 13:30:45 +02:00
unknown
c3e1ccada2 A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal
value into a char field": the patch submitted for the bug a while
ago has never been reviewed or approved to push into 4.0. Decimal
support in 5.0 resolves the issue.
Adding the test case and closing the bug report.


mysql-test/r/type_decimal.result:
  Bug#5673: test results fixed.
mysql-test/t/type_decimal.test:
  A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal 
  value into a char field"
2005-04-28 13:06:36 +04:00
unknown
56b8c9061c Merge bug9911 with 5.0
mysql-test/r/archive.result:
  Warning will be pushed when renaming table with "optional" files.
2005-04-28 11:05:44 +02:00
unknown
aba91fb130 Merge
sql/examples/ha_archive.cc:
  SCCS merged
sql/examples/ha_archive.h:
  SCCS merged
sql/handler.cc:
  SCCS merged
2005-04-28 10:58:24 +02:00
unknown
c53b0c4398 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-28 10:57:08 +02:00
unknown
67a7bc2d98 Merge neptunus.(none):/home/msvensson/mysql/bug9911
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-28 10:50:31 +02:00
unknown
2c8e261725 BUG#9911 After review fixes
- Remove ha_archive::rename_table and move the fix to handler::rename_table


sql/examples/ha_archive.cc:
  Remove ha_archive::rename_table
sql/examples/ha_archive.h:
  Remove ha_archive::rename_table
sql/handler.cc:
  Fix handler::rename_table so it does not care about if the file to rename is missing
2005-04-28 10:49:18 +02:00
unknown
824eb3341c Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-28 10:48:08 +02:00
unknown
c97859b300 Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes 2005-04-28 10:46:39 +02:00
unknown
a5f4b569ab Merge
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2005-04-28 10:28:56 +02:00
unknown
2ef10765dc Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes 2005-04-28 09:39:29 +02:00
unknown
92db5489ff Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000


configure.in:
  Auto merged
2005-04-27 23:00:17 +02:00
unknown
2cd93843bf Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
After merge fix.
2005-04-27 22:58:11 +02:00
unknown
a1b0139fe7 BUG#9911 RENAME TABLE of type ARCHIVE fails with .ARN file error
- Different behaviuor in 5.0 pushes a warning when renaming a non existent file. Avoid that by checking that the file exists before renaming.


mysql-test/r/archive.result:
  Warning is not produced anymore
sql/examples/ha_archive.cc:
  Change ha_archive::rename_table to avoid warning when trying to rename non existent file.
2005-04-27 22:20:58 +02:00
unknown
cde34dfbf3 Little different behaviour in 5.0 and merge with new tests required these changes
mysql-test/r/archive.result:
  Changed order of tests so that the are before the unpredictable INSERT DELAYED
  Warning is produced during the rename
mysql-test/t/archive.test:
  Changed order of tests so that the are before the unpredictable INSERT DELAYED
  Warning is produced during the rename
2005-04-27 22:02:26 +02:00
unknown
57d9c6d077 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged
2005-04-27 21:40:11 +02:00
unknown
ace2de52ae Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
Merge from 4.1


configure.in:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2005-04-27 21:02:38 +02:00
unknown
3238612840 Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock
After merge fix.
2005-04-27 20:54:19 +02:00
unknown
756d5da03f Merge mysql.com:/home/psergey/mysql-4.1-bug9298
into mysql.com:/home/psergey/mysql-5.0-bug9298-merge


mysql-test/r/group_by.result:
  Auto merged
sql/protocol.cc:
  Auto merged
2005-04-27 22:49:42 +04:00
unknown
f3a1bafa48 Merge from 4.0 needs fixes
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2005-04-27 18:59:31 +02:00
unknown
758f5d0a59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-04-27 18:28:57 +02:00
unknown
27a6a81464 Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
unknown
c18bed5715 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 17:52:47 +02:00
unknown
cd50bf9ae4 After review fix
BUILD/check-cpu:
  Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.
2005-04-27 17:52:14 +02:00
unknown
b580f8ddf5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-27 17:12:08 +02:00