Commit graph

19578 commits

Author SHA1 Message Date
unknown
1c064d285c mysqld.cc:
Fix out-of-order status variable.


sql/mysqld.cc:
  Fix out-of-order status variable.
2005-09-23 14:14:34 -05:00
unknown
727f0b8a1f Bug #13384 mysqltest, no protocol when script contains only lines with eval
client/mysqltest.c:
  Set query_executed also for eval, that results in a query being executed and output is likely.
2005-09-22 21:24:57 +02:00
unknown
443b394fc3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553
2005-09-22 13:05:48 +05:00
unknown
fe61a61355 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-09-22 12:46:50 +05:00
unknown
91ed9588bf Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
set auto_increment_field_not_null to true to preserve zero values
  for autoincrement fields during LOAD DATA execution if 
  NO_AUTO_VALUE_ON_ZERO sql mode is set


mysql-test/r/loaddata.result:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case
mysql-test/t/loaddata.test:
  Fix for bug#12053 LOAD DATA INFILE ignores NO_AUTO_VALUE_ON_ZERO setting
    test case
2005-09-22 12:46:01 +05:00
unknown
2543c551cb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 09:13:14 +02:00
unknown
8e78ba93ec Add testcase for bug#13316
ndb big alter table


mysql-test/r/ndb_alter_table.result:
  Add testcase for bug#13316
mysql-test/t/ndb_alter_table.test:
  Add testcase for bug#13316
2005-09-22 09:09:27 +02:00
unknown
855c1646e1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b11553


sql/sql_yacc.yy:
  Auto merged
2005-09-22 11:46:54 +05:00
unknown
6367a2c631 a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
sql/sql_yacc.yy:
  a fix (#11553: gives error if aggregate user-defined function in HAVING clause).
  udf_sum_expr_list rule introduced and used for aggregate udf functions:            
    - call inc_in_sum_expr() before udf_expr_list parsing                            
      (as in_sum_expr rule does).
2005-09-22 11:45:16 +05:00
unknown
86713962d9 bug#13316
ndb alter table with big dicttabinfo
  send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE
    send fragmented instead
2005-09-22 08:35:27 +02:00
unknown
d440d5ea7c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:19:09 +02:00
unknown
ac2ffe02b5 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-22 07:17:41 +02:00
unknown
449fb0b184 ndb - fix gcc4 compile problem
ndb/src/ndbapi/Ndbinit.cpp:
  fix gcc4 compile problem
2005-09-22 07:11:53 +02:00
unknown
1ca355dbd2 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-21 17:05:35 -07:00
unknown
14926bf926 Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into  mysql.com:/home/jimw/my/mysql-4.1-clean


zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged
2005-09-21 15:17:48 -07:00
unknown
14deb9632b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13180-bug-4.1-mysql
2005-09-22 01:48:39 +04:00
unknown
1b02a815dd Fix bug #13180 thd->allow_sum_funcs wasn't reset before query processing.
thd->allow_sum_func was left 'true' after previous statement thus allowing
sum funcs to be present in conditions.

thd->allow_sum_func should be set to 0 for each query and each prepared
statement reinitialization. This is done in lex_start() and 
reset_stmt_for_execute().


sql/sql_lex.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in lex_start().
sql/sql_prepare.cc:
  Fix bug#13180 thd->allow_sum_func wasn't reset obefore query processing.
  thd->allow_sum_func is set to 0 in  reset_stmt_for_execute().
mysql-test/t/update.test:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.
mysql-test/r/update.result:
  Test case for bug#13180 thd->allow_sum_funcs wasn't reset before query
  processing.
2005-09-22 01:38:39 +04:00
unknown
a808e97d8a Fix compiler error: C++ code in C 2005-09-21 19:58:40 +04:00
unknown
09225cef3a Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into  mysql.com:/home/timka/mysql/src/4.1-dbg
2005-09-21 18:58:39 +03:00
unknown
02fe27b3e3 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-21 17:58:38 +02:00
unknown
3c8a296f28 bug#12950
ndb backup with charsets and simultanious updates
    make sure that backup _dont_ read xfrm data


ndb/src/kernel/blocks/backup/Backup.cpp:
  Backup can do dirty read
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix so that backup dont read xfrm data
ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Fix so that backup dont read xfrm data
2005-09-21 17:24:39 +02:00
unknown
1c2cb84285 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


sql/mysqld.cc:
  Auto merged
2005-09-21 14:39:28 +02:00
unknown
98bbb1ae89 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b7589
2005-09-21 14:33:39 +05:00
unknown
24922a3092 a fix (bug #7589: Decimal types are ignored when updating data from another column).
mysql-test/r/union.result:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  removed wrong test result (see #13372)
mysql-test/t/union.test:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  removed wrong test result (see #13372)
sql/field_conv.cc:
  a fix (bug #7589: Decimal types are ignored when updating data from another column).
  use memcpy() only for identical decimals.
2005-09-21 14:32:19 +05:00
unknown
30681cf509 Don't add all args to mysqltest to MYSQL_TEST env var
mysql-test/mysql-test-run.pl:
  Not all args to mysqltest should be added to the MYSQL_TEST environment variable. The MYSQL_TEST var is used when testing mysqltest and --record and result_file should not be set.
2005-09-21 10:24:46 +02:00
unknown
a4243d3c6b Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into  mysql.com:/home/timka/mysql/src/4.1-dbg


sql/opt_sum.cc:
  Auto merged
2005-09-21 09:53:42 +03:00
unknown
8e7217e43b Fix for BUG#12882 - min/max inconsistent on empty table.
The problem was in that the MIN/MAX optimization in opt_sum_query was
replacing MIN/MAX functions with their constant argument without
taking into account that a query has no result rows.


mysql-test/r/func_group.result:
  Test for BUG#12882.
mysql-test/t/func_group.test:
  Test for BUG#12882.
sql/item_sum.cc:
  If it is known that a query has no result rows, do not call add()
  via the call to Item_sum::no_rows_in_result() which calls reset().
  Instead directly call clear() so that the MIN and MAX functions
  produce NULL when there are no result rows.
sql/opt_sum.cc:
  * Do not apply MIN/MAX optimization when the operand of MIN/MAX is
    a constant if it can't be determined whether the query has any
    result rows. The reason is that if the query has result rows,
    then the result of MIN/MAX is its constant argument, but if the
    query result is empty, then the result of MIN/MAX must be NULL
    irrespective of its argument.
  
  * The patch also simplifies a bit the branch that hadles COUNT().
2005-09-21 09:49:19 +03:00
unknown
458a4234e4 Merge mysql.com:/home/psergey/bk-trees/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-csc6030-r3


sql/mysqld.cc:
  Auto merged
2005-09-21 02:20:55 +04:00
unknown
a2a8216b20 BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index
statistics (like 4.0 did) (patch #3, with review #1 & #2 feedback addressed)


include/myisam.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/mi_check.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
myisam/myisamchk.c:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/r/myisam.result:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
mysql-test/t/myisam.test:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/ha_myisam.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/handler.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/mysqld.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/set_var.cc:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
sql/sql_class.h:
  BUG#12232: Add a server option to treat NULL values as equal when calculating MyISAM index statistics
2005-09-21 02:18:29 +04:00
unknown
1818ff1c22 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-4.1
into  selena.:H:/MYSQL/src/#12929-mysql-4.1


include/my_sys.h:
  Auto merged
2005-09-20 20:11:38 +04:00
unknown
ac604f715d Small update for lock functions used in my_cgets() 2005-09-20 20:03:51 +04:00
unknown
3ce33c2c52 Bug #10694 LOAD DATA FROM INFILE fails with 'Out of operation records' 2005-09-20 14:20:02 +02:00
unknown
7aad3ae6a9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-09-20 09:50:10 +02:00
unknown
9683c722db Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 00:26:23 +02:00
unknown
87950518fb Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-20 00:25:33 +02:00
unknown
5cf25d8019 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139
2005-09-19 15:45:01 -06:00
unknown
f903f8e3a2 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13218-bug-4.1-mysql
2005-09-19 23:46:39 +04:00
unknown
d9315344ee Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqltest.c:
  Merged from 4.0.
2005-09-19 19:33:59 +03:00
unknown
a89807336f Fixed Bug#13275 mysqltest empty file bug 2005-09-19 18:45:22 +03:00
unknown
b390a1a400 ndb - imlp. show engine ndb status;
that dump free list allocation per connection


sql/ha_ndbcluster.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/ha_ndbcluster.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/mysqld.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_lex.h:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_parse.cc:
  imlp. show engine ndb status;
    that dump free list allocation per connection
sql/sql_yacc.yy:
  imlp. show engine ndb status;
    that dump free list allocation per connection
2005-09-19 15:35:07 +02:00
unknown
90e6060858 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2005-09-19 15:00:13 +02:00
unknown
5df7f93ddf mysql-test-run.pl:
Added flag --valgrind-mysqltest


mysql-test/mysql-test-run.pl:
  Added flag --valgrind-mysqltest
2005-09-19 14:58:06 +02:00
unknown
7150244e50 bug#9282 - ndb
big delete from causing NdbObjectIdMap::expand at same time 
  as receiver thread perform getObjectId 


ndb/src/ndbapi/Ndbinit.cpp:
  Protect NdbObjectIdMap::expand from getObjectId
ndb/src/ndbapi/ObjectMap.hpp:
  Protect NdbObjectIdMap::expand from getObjectId
2005-09-19 14:05:54 +02:00
unknown
5bc4501259 Fix bug #13218: InnoDB: using a partial-field key prefix in search
This is backport from 5.0 of fix for bug #11039


mysql-test/t/innodb.test:
  Backport from 5.0 of test case for bug#11039
mysql-test/r/innodb.result:
  Backport from 5.0 of test case for bug#11039
sql/opt_sum.cc:
  Fix bug #13218:  backport from 5.0 of bug #11039 fix
2005-09-19 04:39:49 +04:00
unknown
4014d76cd1 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:24:27 -05:00
unknown
766eaf6bf2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/merge-4.1
2005-09-18 13:18:09 -05:00
unknown
8618ea6321 .del-which.2~463417adb2e37122:
Delete: man/which.2


BitKeeper/deleted/.del-which.2~463417adb2e37122:
  Delete: man/which.2
2005-09-18 13:16:32 -05:00
unknown
ce7e95d41d Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug11139


mysql-test/r/rpl_multi_delete2.result:
  Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
  Auto merged
mysql-test/t/rpl_multi_delete2.test:
  Auto merged
2005-09-17 18:46:54 -06:00
unknown
f12f98e226 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-17 10:05:07 +02:00
unknown
d6afdcb77c mysql-test-run.pl:
Enabled --valgrind to work (bug#13280)


mysql-test/mysql-test-run.pl:
  Enabled --valgrind to work (bug#13280)
2005-09-17 01:09:32 +02:00