Commit graph

48620 commits

Author SHA1 Message Date
unknown
3756819e4b Fixed bug #29415.
The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.

Fixed by throwing errors for such cases.


mysql-test/r/type_newdecimal.result:
  Added a test case for bug #29415.
mysql-test/t/type_newdecimal.test:
  Added a test case for bug #29415.
2007-07-07 10:33:02 -07:00
unknown
8c35eec8af Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-07-07 09:45:43 -07:00
unknown
fe00f78d80 disable federated_innodb test until bug29522 is fixed 2007-07-07 09:28:35 -07:00
unknown
a0336ad7d8 Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
sql/item.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/loaddata.result:
  Merge with 5.0-opt.
mysql-test/t/view.test:
  Merge with 5.0-opt.
2007-07-07 20:14:06 +05:00
unknown
5bfb61a2b6 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.20
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
2007-07-07 15:26:29 +02:00
unknown
3779d58ec1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged
2007-07-07 15:23:36 +02:00
unknown
f2cddbab17 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


libmysql/libmysql.c:
  Auto merged
2007-07-07 15:20:14 +02:00
unknown
8dbb698973 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


libmysql/libmysql.c:
  Auto merged
2007-07-07 15:20:09 +02:00
unknown
82ca333994 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-07-07 15:13:34 +02:00
unknown
84c229ff19 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


scripts/make_binary_distribution.sh:
  Auto merged
2007-07-07 15:10:09 +02:00
unknown
cbbd890596 revert previous patch 2007-07-07 15:08:21 +02:00
unknown
5c60418104 Merge mysql.com:/home/ram/work/b29420/b29420.5.0
into  mysql.com:/home/ram/work/b29420/b29420.5.1


sql/sql_repl.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged
2007-07-07 12:04:11 +05:00
unknown
efbcbad4df Merge ymer.(none):/usr/local/mysql/mysql-5.0-engines
into  ymer.(none):/usr/local/mysql/mysql-5.1-engines


sql/stacktrace.c:
  Auto merged
BUILD/compile-pentium-gcov:
  Manual merge.
2007-07-07 07:48:43 +02:00
unknown
87e1a302c3 Bug #29543 GCov information not written in case of crash.
For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.

Fix this by explicitly calling the __gcov_flush function in our crash handler.
2007-07-07 07:46:17 +02:00
unknown
04a9d3000d Merge sita.local:/Users/tsmith/m/bk/maint/41
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-06 19:03:35 -06:00
unknown
1f1366c4c6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-06 17:55:46 -06:00
unknown
53c8af88b6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
into  sita.local:/Users/tsmith/m/bk/maint/41
2007-07-06 17:54:25 -06:00
unknown
89688aefcf Merge sita.local:/Users/tsmith/m/bk/50
into  sita.local:/Users/tsmith/m/bk/maint/50
2007-07-06 17:50:01 -06:00
unknown
107d13e7c7 Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 14:52:18 -07:00
unknown
84b9715d18 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge


libmysql/libmysql.c:
  Auto merged
2007-07-06 14:33:14 -07:00
unknown
b1dce946cc Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
2007-07-06 14:29:58 -07:00
unknown
ea5439ac97 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-07-06 21:43:02 +02:00
unknown
9e137c4648 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-07-06 21:39:55 +02:00
unknown
6096d90ec1 Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge


mysql-test/t/fulltext2.test:
  Auto merged
BitKeeper/deleted/.del-fulltext3.result:
  Delete: mysql-test/r/fulltext3.result
BitKeeper/deleted/.del-fulltext3.test:
  Delete: mysql-test/t/fulltext3.test
mysql-test/r/fulltext2.result:
  SCCS merged
2007-07-06 11:39:55 -07:00
unknown
a077186b70 fix test for bug29299 2007-07-06 11:35:10 -07:00
unknown
e21310b1ef WL#3303
- row based ndb logging also in mixed
2007-07-06 19:04:11 +02:00
unknown
db9a06b7ca Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge


sql/sql_insert.cc:
  Auto merged
2007-07-06 09:07:08 -07:00
unknown
09ee3a5ae1 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge


include/my_base.h:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/events_bugs.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_single_user.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_partition.cc:
  Auto merged
2007-07-06 09:03:50 -07:00
unknown
b0f65c166c Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-4.1-engines.merge
into  ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
2007-07-06 09:02:36 -07:00
unknown
fec6d3f134 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge


sql/sql_insert.cc:
  Auto merged
2007-07-06 09:00:40 -07:00
unknown
46943ab628 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines
into  anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
2007-07-06 08:57:18 -07:00
unknown
a64be676a4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
2007-07-06 16:22:11 +04:00
unknown
360a5ebc37 Remove typedef st_table_list TABLE_LIST and always use name 'TABLE_LIST'.
The need arose when working on Bug 26141, where it became
necessary to replace TABLE_LIST with its forward declaration in a few
headers, and this involved a lot of s/TABLE_LIST/st_table_list/.
Although other workarounds exist, this patch is in line
with our general strategy of moving away from typedef-ed names.
Sometime in future we might also rename TABLE_LIST to follow the
coding style, but this is a huge change.


sql/item.cc:
  st_table_list -> TABLE_LIST
sql/item.h:
  st_table_list -> TABLE_LIST
sql/mysql_priv.h:
  st_table_list -> TABLE_LIST
sql/sql_base.cc:
  st_table_list -> TABLE_LIST
sql/sql_lex.cc:
  st_table_list -> TABLE_LIST
sql/sql_lex.h:
  st_table_list -> TABLE_LIST
sql/sql_select.cc:
  st_table_list -> TABLE_LIST
sql/sql_show.cc:
  st_table_list -> TABLE_LIST
sql/sql_udf.h:
  Was not needed.
sql/table.cc:
  st_table_list -> TABLE_LIST
sql/table.h:
  st_table_list -> TABLE_LIST
2007-07-06 16:18:49 +04:00
unknown
d4e6d4b2c1 Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel


BitKeeper/etc/ignore:
  auto-union
libmysql/libmysql.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge from 5.0
storage/innobase/handler/ha_innodb.cc:
  Manual merge from 5.0
2007-07-06 13:49:15 +03:00
unknown
4e825803bf Bug #29570 original error lost in write_event on slave
- make sure error gets propagated to thd->net by calling print_error
- also print the full error message
2007-07-06 12:39:03 +02:00
unknown
ae23a601ae update some description in t/disable.def for testcase rpl_ndb_innodb2ndb and rpl_ndb_myisam2ndb
mysql-test/t/disabled.def:
  correct related bug, bug#29549 discovers more accurate reason
2007-07-06 16:58:56 +08:00
unknown
0b24005753 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel


libmysql/libmysql.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge from main 5.1 to 5.1-marvel.
mysql-test/t/innodb_mysql.test:
  Manual merge from main 5.1 to 5.1-marvel.
2007-07-06 09:51:02 +03:00
unknown
8195a213c2 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29392


sql/item.h:
  Auto merged
2007-07-05 17:39:51 -07:00
unknown
50373d1ae7 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-06 03:49:40 +05:00
unknown
725b49716b Fixed bug #29442.
The SELECT INTO OUTFILE FIELDS ENCLOSED BY digit or minus sign,
followed by the same LOAD DATA INFILE statement, used wrond encoding
of non-string fields contained the enclosed character in their text
representation.

Example:
  SELECT 15, 9 INTO OUTFILE 'text' FIELDS ENCLOSED BY '5';

Old encoded result in the text file:
  5155 595
         ^ was decoded as the 1st enclosing character of the 2nd field;
        ^ was skipped as garbage;
  ^    ^ was decoded as a pair of englosing characters of the 1st field;
      ^   was decoded as traling space of the first field;
    ^^ was decoded as a doubled enclosed character.

New encoded result in the text file:
  51\55 595
  ^   ^ pair of enclosing characters of the 1st field;
    ^^ escaped enclosed character.



sql/sql_class.h:
  Fixed bug #29442.
  The NUMERIC_CHARS macro constant has been defined to enumerate
  all possible characters of a numeric value text representation.
  The select_export::is_unsafe_field_sep boolean flag has been added
  to apply the encoding algorithm to non-string values when it is
  necessary.
sql/sql_class.cc:
  Fixed bug #29442.
  The select_export::send_data method has been modified to encode text
  representation of fields of all data types like string fields.
mysql-test/t/loaddata.test:
  Updated test case for bug #29442.
mysql-test/r/loaddata.result:
  Updated test case for bug #29442.
2007-07-06 03:43:23 +05:00
unknown
d1f64b14c8 Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-05 22:28:34 +02:00
unknown
79301c45d4 Merge chilla.local:/home/mydev/mysql-5.1-ateam
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_partition.cc:
  Auto merged
2007-07-05 22:27:05 +02:00
unknown
6e61c03faa Merge chilla.local:/home/mydev/mysql-4.1-axmrg
into  chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-05 20:51:29 +02:00
unknown
01554dd939 Merge chilla.local:/home/mydev/mysql-4.1-ateam
into  chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-05 19:38:07 +02:00
unknown
ea2ec3d96f Post-merge fixes.
Fixed typos and comment styles in tests.


mysql-test/r/rpl_partition.result:
  Post-merge fixes.
  Removed warnings after fixing --disable_warnings command.
mysql-test/t/ctype_uca.test:
  Post-merge fixes.
  Fixed comment style.
mysql-test/t/rpl_partition.test:
  Post-merge fixes.
  Fixed typo in --disable_warnings and --enable_warnings.
mysql-test/t/subselect.test:
  Post-merge fixes.
  Fixed comment style.
2007-07-05 19:20:14 +02:00
unknown
6139d34c92 Bug #29166:
AsText() needs to know the maximum number of
characters a IEEE double precision value can
occupy to make sure there's enough buffer space.
The number was too small to hold all possible
values and this caused buffer overruns.
Fixed by correcting the calculation of the 
maximum digits in a string representation of an
IEEE double precision value as printed by 
String::qs_append(double).


mysql-test/r/gis.result:
  Bug #29166: test case
mysql-test/t/gis.test:
  Bug #29166: test case
sql/spatial.cc:
  Bug #29166: correct calculation of the maximum digits in
  a string representation of a double
2007-07-05 18:24:48 +03:00
unknown
6a2ef78c89 Fixing wrong results 2007-07-05 19:02:04 +05:00
unknown
2262fcbcd0 Additional fix for the previous patch. 2007-07-05 17:25:26 +05:00
unknown
35475155ed Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.0
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/mysql/bk/mysql-5.1


scripts/make_binary_distribution.sh:
  Auto merged
2007-07-05 13:07:41 +01:00
unknown
c9aa1e463c Merge chilla.local:/home/mydev/mysql-5.0-axmrg
into  chilla.local:/home/mydev/mysql-5.1-axmrg


sql/sql_insert.cc:
  Auto merged
2007-07-05 13:59:08 +02:00