Commit graph

43875 commits

Author SHA1 Message Date
unknown
23db3ebf6f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-02 20:01:02 +01:00
unknown
94eb5f7185 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-02 19:59:36 +01:00
unknown
6389cd128e Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-02 19:22:53 +01:00
unknown
36d9dea1ae Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.0
2007-03-02 19:21:11 +01:00
unknown
3b53ec8261 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2007-03-02 19:11:56 +01:00
unknown
c554c2bffd Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2007-03-02 19:09:14 +01:00
unknown
039a5f411a ndb - bug#15632
arg...also fix starting node...(version 6)



storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  arg...also fix starting node...
2007-03-02 19:08:58 +01:00
unknown
3ae2a4411d Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2007-03-02 19:04:15 +01:00
unknown
ee3fde4e97 ndb - bug#15632
fix testNodeRestart -n Bug15632
  handle version > 5


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix testNodeRestart -n Bug15632
  handle version > 5
2007-03-02 18:47:30 +01:00
unknown
476f91b50c fixed win32 warnings 2007-03-02 19:32:46 +02:00
unknown
68915daf31 fixed win32 warning 2007-03-02 19:27:32 +02:00
unknown
0336a967f2 Merge trift2.:/MySQL/M50/manpages-5.0
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Manual merge, adapting to additional "embedded" files in 5.1
2007-03-02 17:15:13 +01:00
unknown
b2c6d33efd Merge trift2.:/MySQL/M41/manpages-4.1
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Manual merge, adapting to expanded 5.0 filelist.
2007-03-02 17:01:24 +01:00
unknown
2ebd43960b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B19342-5.0-opt
2007-03-02 17:37:44 +02:00
unknown
a74c8eaf9c Merge trift2.:/MySQL/M40/manpages-4.0
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  SCCS merged
2007-03-02 16:34:29 +01:00
unknown
56eae45c8f More man pages for the RPMs.
support-files/mysql.spec.sh:
  More man pages.
2007-03-02 16:32:27 +01:00
unknown
b73f17fb77 Another man page in the RPMs.
support-files/mysql.spec.sh:
  Another man page.
2007-03-02 16:30:22 +01:00
unknown
f77eb48712 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B19342-5.0-opt


sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
2007-03-02 16:28:41 +02:00
unknown
b114118ab7 Bug #19342:
Several problems here :
 1. The conversion to double of an hex string const item
 was not taking into account the unsigned flag.
 
 2. IN was not behaving in the same was way as comparisons
 when performed over an INT/DATE/DATETIME/TIMESTAMP column
 and a constant. The ordinary comparisons in that case 
 convert the constant to an INTEGER value and do int 
 comparisons. Fixed the IN to do the same.
 
 3. IN is not taking into account the unsigned flag when 
 calculating <expr> IN (<int_const1>, <int_const2>, ...).
 Extended the implementation of IN to store and process
 the unsigned flag for its arguments.


mysql-test/r/func_in.result:
  Bug #19342: test case
mysql-test/t/func_in.test:
  Bug #19342: test case
sql/item.h:
  Bug #19342: correct handling of sign in conersion to real.
sql/item_cmpfunc.cc:
  Bug #19342: exteneded the IN values list
   to support unsigned longlong values.
   Correct comparison of integers in IN with
   regard of signedness.
   Compare DATE/DATETIME/TIMESTAMP values as
   integers in IN.
sql/item_cmpfunc.h:
  Bug #19342: exteneded the IN values list
   to support unsigned longlong values.
   Correct comparison of integers in IN with
   regard of signedness.
2007-03-02 16:25:56 +02:00
unknown
dd2e0cd083 Merge mysql.com:/home/tnurnberg/21103/50-21103
into  mysql.com:/home/tnurnberg/21103/51-21103


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/field.cc:
  Auto merged
2007-03-02 15:25:06 +01:00
unknown
fed9bb9820 Bug #21103: DATE column not compared as DATE
If we compare two items A and B, with B being (a constant) of a
larger type, then A gets promoted to B's type for comparison if
it's a constant, function, or CAST() column, but B gets demoted
to A's type if A is a (not explicitly CAST()) column. This is
counter-intuitive and not mandated by the standard.
 
Disabling optimisation where it would be lossy so field value
will properly get promoted and compared as binary string (rather
than as integers).


mysql-test/include/ps_conv.inc:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/r/func_time.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Show that everything works as expected.
mysql-test/r/ps_2myisam.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/r/ps_3innodb.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/r/ps_4heap.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/r/ps_5merge.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/r/ps_7ndb.result:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Fix certain queries to still work.
mysql-test/t/func_time.test:
  Bug #21103: DATE column not compared as DATE
  
  When comparing a DATE field with a DATETIME constant, we now compare
  as DATETIMEs, not as DATEs.  Show that everything works as expected.
sql/field.cc:
  Bug #21103: DATE column not compared as DATE
  
  #0 stores the date only as a 3-byte integer; save_in_field() in
  #1 saves 'this' in field's format (DATE), #2 "converts a constant
  item to an int and replaces the original item" -- consequently,
  this replaces the Item_string "2006-11-06 04:08:36.0" with the
  Item_int_with_ref 20061106.
  
  #0  Field_newdate::store (this=0x8d26880, from=0x8d5e658 "2006-11-06
  04:08:36.0", len=21, cs=0x88022c0) at field.cc:5344
  #1  0x0817e3b0 in Item_string::save_in_field (this=0x8d5e670, field=0x8d26880, no_conversions=true) at item.cc:4340
  #2  0x081b22ae in convert_constant_item (thd=0x8d25240, field=0x8d26880, item=0x8d5e74c) at item_cmpfunc.cc:245
  #3  0x081b8a36 in Item_bool_func2::fix_length_and_dec (this=0x8d5e6f8) at item_cmpfunc.cc:309
  #4  0x081a3427 in Item_func::fix_fields (this=0x8d5e6f8, thd=0x8d25240, ref=0x8d5f5fc) at item_func.cc:190
  #5  0x0825bc2d in setup_conds (thd=0x8d25240, tables=0x8d5e410, leaves=0x8d5e410, conds=0x8d5f5fc) at sql_base.cc:4941
  ...
  
  Disabling optimisation where it would be lossy so field value will
  properly get promoted and compared as binary string (rather than as
  integers).
2007-03-02 15:23:13 +01:00
unknown
06888e74fc Add hint about using --help to see what options are available 2007-03-02 15:21:01 +01:00
unknown
2464f10826 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B26537-5.0-opt
2007-03-02 16:18:00 +02:00
unknown
614a55512f Merge trift2.:/MySQL/M50/manpages-5.0
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Auto merged
2007-03-02 14:23:12 +01:00
unknown
35c841fb82 Merge trift2.:/MySQL/M41/manpages-4.1
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own.
2007-03-02 14:20:43 +01:00
unknown
00179853d4 Merge trift2.:/MySQL/M40/manpages-4.0
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own (NDB).
2007-03-02 14:17:04 +01:00
unknown
ceab5d2fed Add man pages for NDB to the RPMs.
support-files/mysql.spec.sh:
  Add man pages for NDB.
2007-03-02 14:13:13 +01:00
unknown
9e290476f8 Add the man pages for NDB to the RPMs.
support-files/mysql.spec.sh:
  Add the man pages for NDB.
2007-03-02 14:08:32 +01:00
unknown
622533fa81 Add the man pages for NDB to the RPMs.
support-files/mysql.spec.sh:
  Add the man pages for NDB.
2007-03-02 14:05:43 +01:00
unknown
d26369327e Add missing man pages to the RPMs.
support-files/mysql.spec.sh:
  Add missing man pages.
2007-03-02 14:03:28 +01:00
unknown
f7f5f00649 Freeze the number of conflicts. We should not introduce any more
conflicts without proper analysis and documentation of the nature of
the conflict.
2007-03-02 15:05:16 +03:00
unknown
b0e07932c6 Rename a macro to better reflect the action taken.
sql/sql_yacc.yy:
  Rename: YYERROR_UNLESS -> YYABORT_UNLESS
  yyerror doesn't have to abort of the parser, whereas this macro
  does explicitly call YYABORT.
2007-03-02 14:29:51 +03:00
unknown
e5d9a306dc Merge mysql.com:/home/ram/work/b23616/b23616.5.0
into  mysql.com:/home/ram/work/b23616/b23616.5.1


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
2007-03-02 15:13:28 +04:00
unknown
d4272a16de after merge fix (bug #26038)
Item_func_geometry_from_text::val_str() should set null_value
in case of wrong data.


mysql-test/include/gis_generic.inc:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
mysql-test/r/archive_gis.result:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
mysql-test/r/gis.result:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
mysql-test/r/innodb_gis.result:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
mysql-test/r/ndb_gis.result:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
mysql-test/t/gis.test:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
sql/item_geofunc.cc:
  after merge fix
  
  Item_func_geometry_from_text::val_str() should set null_value
  in case of wrong data.
2007-03-02 15:09:44 +04:00
unknown
7fc2a2a765 Merge mysql.com:/home/ram/work/b23616/b23616.4.1
into  mysql.com:/home/ram/work/b23616/b23616.5.0


mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
2007-03-02 15:09:20 +04:00
unknown
6ad7d66431 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
2007-03-02 11:52:16 +01:00
unknown
3fcc6915b2 ndb -
fix printout
  crashes testSystemRestart -n SR_UNDO


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix printout
  crashes testSystemRestart -n SR_UNDO
2007-03-02 11:48:14 +01:00
unknown
be3d4002f7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
2007-03-02 11:41:21 +01:00
unknown
19948e8a7f sql_base.cc:
Post fix for bug#25122.


sql/sql_base.cc:
  Post fix for bug#25122.
2007-03-02 13:25:41 +03:00
unknown
399bf23c1d Bug #26537: item_unhex() was not expected
to return NULL for non-NULL arguments.
This is not the case as it can return NULL
for invalid hexidecimal strings.
Fixed by setting the maybe_null flag.


mysql-test/r/func_str.result:
  Bug #26537: test case
mysql-test/t/func_str.test:
  Bug #26537: test case
sql/item_strfunc.h:
  Bug #26537: item_unhex() can return NULLs
  even for guaranteed non-null arguments.
2007-03-02 12:14:50 +02:00
unknown
4268313e50 Removing global events_till_disconnect variable as it is replaced by a member of
master info structure.
2007-03-02 10:35:04 +01:00
unknown
198a8abd87 Merge BUG: Windows target won't compile.
- winsock2.h must be included before windows.h
2007-03-02 09:04:23 +01:00
unknown
133e08af14 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-26093


sql/item_func.cc:
  Auto merged
2007-03-01 20:08:58 -07:00
unknown
7be25714a7 Manual merge 2007-03-01 20:04:49 -07:00
unknown
bd6df52de7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2007-03-02 09:38:03 +07:00
unknown
93e6eb8037 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-26093
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-26093-merge


mysql-test/r/func_misc.result:
  Auto merged
2007-03-01 19:22:43 -07:00
unknown
0a93be2869 Bug#26093 (SELECT BENCHMARK() for SELECT statements does not produce valid
results)

Before this fix, the function BENCHMARK() would fail to evaluate expressions
like "(select avg(a) from t1)" in debug builds (with an assert),
or would report a time of zero in non debug builds.

The root cause is that evaluation of DECIMAL_RESULT expressions was not
supported in Item_func_benchmark::val_int().

This has been fixed by this change.


mysql-test/r/func_misc.result:
  Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
mysql-test/t/func_misc.test:
  Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
sql/item_func.cc:
  Added support for DECIMAL_RESULT in Item_func_benchmark::val_int()
2007-03-01 19:20:47 -07:00
unknown
6b2e148566 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
2007-03-02 09:17:17 +07:00
unknown
af0554d133 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/CreateTable.hpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
2007-03-02 09:13:00 +07:00
unknown
abc66a6f7f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-02 09:10:17 +07:00