Commit graph

3961 commits

Author SHA1 Message Date
unknown
7865746c27 merging
mysql-test/r/show_check.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-02-28 18:11:18 +04:00
unknown
ebdbe9e5c3 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/psergey/mysql-4.0-look
2005-02-28 15:40:45 +03:00
unknown
c8b3d65ca2 Merge 2005-02-28 14:52:35 +03:00
unknown
8b8c9452dd Fixed wrong memory references found by purify
(No really critical errors found, but a few possible wrong results)


innobase/dict/dict0dict.c:
  Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
mysql-test/r/select_found.result:
  Add missing drop table
mysql-test/r/type_set.result:
  More tests
mysql-test/t/select_found.test:
  Add missing drop table
mysql-test/t/type_set.test:
  More tests
mysys/my_init.c:
  Avoid warning from purify (purify doesn't handle getrusage() properly)
sql/field.h:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/filesort.cc:
  enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/item_cmpfunc.cc:
  Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
  Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
sql/mysqld.cc:
  Wait for signal handler to stop when running --bootstrap
  (Fixes warning from purify)
sql/sql_insert.cc:
  Initialize slot used by innodb.cc (not critical)
sql/sql_lex.h:
  Better comments
sql/sql_repl.cc:
  memcmp -> bcmp() to avoid warning from purify
sql/sql_select.cc:
  Fix for out-of-bound memory reference when doing DISTINCT on const expressions
strings/ctype-simple.c:
  Fixes to not access uninitialized memory
  (Not critical)
2005-02-28 11:59:46 +02:00
unknown
1a72e219f2 Fix for BUG#8560: Set max_sort_char for any 8-bit charset with binary collation. max_sort_char is needed by
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.


mysql-test/r/ctype_cp1251.result:
  Test for BUG#8560
mysql-test/t/ctype_cp1251.test:
  Test for BUG#8560
2005-02-26 17:15:04 +03:00
unknown
abd8200f77 Fix of an incorrect merge 2005-02-24 17:25:06 +01:00
unknown
a1db28a290 Don't try to create a symlink if the DATA DIRECTORY specified for a table
is the same as the normal datadir for that database. (Bug #8707)


mysys/my_symlink2.c:
  Expand path of linkname before checking it against filename to decide if
  we need to create a link.
mysql-test/t/symlink.test:
  Add new regression test
mysql-test/r/symlink.result:
  Add new results
2005-02-23 13:59:04 -08:00
unknown
1f2b46fa0f Bug#8412: Merge from 4.0
mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0
2005-02-23 19:58:54 +01:00
unknown
6a0e1def63 Merge mysql.com:/home/bkroot/mysql-4.0
into mysql.com:/home/bk/b8412-mysql-4.0
2005-02-23 19:40:31 +01:00
unknown
262dadccf1 Fix for bug #6572: SHOW ERRORS doesn't 2005-02-23 20:18:21 +03:00
unknown
f443992e66 Fix for bug#6317: string function CHAR, parameter is NULL, wrong result 2005-02-23 18:15:45 +03:00
unknown
62ff22ee28 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-22 13:14:49 -08:00
unknown
100f792602 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 14:17:17 +01:00
unknown
d6a53e0cfc Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-02-22 14:12:42 +01:00
unknown
1c172c3bc4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-02-22 14:43:14 +02:00
unknown
29b4d186cb Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:39:41 +01:00
unknown
fe471dfd0f Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1
2005-02-22 14:34:59 +02:00
unknown
a7b6d0c232 Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6676-4.1 2005-02-22 13:29:20 +01:00
unknown
6f6bf32afa Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b6662-4.1
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-02-22 13:22:34 +01:00
unknown
2fb807d1d0 A user variable are now always have IMPLICIT coercibility,
independently from the expression it is initialized from.
In other words, this change treats a user variable like
a table with one column and one record. Discussed with 
PeterG, Serg and Lars. This change also simplifies replication
allowing not to replicate variables' coercibility.


mysql-test/r/user_var.result:
  Test changes accordintly
mysql-test/t/user_var.test:
  Test changes accordintly
2005-02-22 15:55:40 +04:00
unknown
7d766fdbeb BUG#6662: Changes after Guilhems and Sergs review 2005-02-22 12:40:31 +01:00
unknown
56679769a8 Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1
into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-02-22 13:00:00 +02:00
unknown
7e028f994a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/field.cc:
  Auto merged
2005-02-22 12:51:54 +02:00
unknown
cb8d9c3ad4 Backport my_strntod() from 5.0
Change string->float conversion to delay division as long as possible.
This gives us more exact integer->float conversion for numbers of type '123.45E+02' (Bug #7740)




client/mysql.cc:
  Fix wront usage of charset (found during review of pushed code)
include/m_string.h:
  Backported my_strtod() from 5.0
mysql-test/mysql-test-run.sh:
  Run also mysql_client_test with --debug
mysql-test/r/ps_1general.result:
  Safety fix (if mysql_client_test.test fails)
mysql-test/r/type_float.result:
  More test
mysql-test/t/mysql_client_test.test:
  Comments for what to do if this test fails
mysql-test/t/ps_1general.test:
  Safety fix (if mysql_client_test.test fails)
mysql-test/t/type_float.test:
  More test to better test new strtod() function
  Test also bug #7740 (wrong comparsion between integer and float-in-integer-range)
sql/field.cc:
  Backport my_strntod() from 5.0
sql/item.cc:
  Backport my_strntod() from 5.0
sql/item.h:
  Backport my_strntod() from 5.0
sql/item_func.h:
  Backport my_strntod() from 5.0
sql/item_strfunc.cc:
  Backport my_strntod() from 5.0
sql/item_sum.cc:
  Backport my_strntod() from 5.0
sql/item_sum.h:
  Backport my_strntod() from 5.0
sql/procedure.h:
  Backport my_strntod() from 5.0
strings/ctype-simple.c:
  Backport my_strntod() from 5.0
strings/ctype-ucs2.c:
  Backport my_strntod() from 5.0
strings/strtod.c:
  Backport my_strntod() from 5.0
  Change conversion to delay division as long as possible.
  This gives us more exact integer-> float conversion for numbers of type '123.45E+02'
2005-02-22 12:51:23 +02:00
unknown
14707d71c3 ctype_latin1.result, ctype_latin1.test, charset.c:
Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.


mysys/charset.c:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/t/ctype_latin1.test:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
mysql-test/r/ctype_latin1.result:
  Treat unknown characters straight in a query as syntax error, rather skipping it as a space character.
2005-02-22 09:56:07 +04:00
unknown
edaf33a14e BUG#6662: Importing mysqldumps should not show any warnings of level "notes". 2005-02-21 18:40:28 +01:00
unknown
df1b674a69 BUG#6676: Derivation of user variables should be of derivation "IMPLICIT" 2005-02-21 16:26:04 +01:00
unknown
65410bd0a1 ctype_utf8.result, ctype_utf8.test, ctype-utf8.c:
Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same


strings/ctype-utf8.c:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/t/ctype_utf8.test:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
mysql-test/r/ctype_utf8.result:
  Bugs: #8385: utf8_general_ci treats cyrillic letters I and SHORT I as the same
2005-02-21 17:17:30 +04:00
unknown
881ce362bf Merge mysql.com:/home/jimw/my/mysql-4.1-8475
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged
2005-02-18 15:40:17 -08:00
unknown
cfa78c2645 Bug #7878 with utf_general_ci, equals (=) has problem with accent insensitivity
Backporting Monty's fix for 5.0 into 4.1.
2005-02-18 16:10:12 +04:00
unknown
2b69b4ae4f Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 15:23:28 -08:00
unknown
3a88e0e017 Merge mysql.com:/home/jimw/my/mysql-4.1-8303
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:54:05 -08:00
unknown
771eecdd78 Merge mysql.com:/home/jimw/my/mysql-4.1-7617
into mysql.com:/home/jimw/my/mysql-4.1-clean


scripts/mysql_create_system_tables.sh:
  Auto merged
2005-02-17 13:53:35 -08:00
unknown
cb9b57fb8c Merge mysql.com:/home/jimw/my/mysql-4.1-8471
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_acl.cc:
  Auto merged
2005-02-17 13:53:07 -08:00
unknown
cb8b1cf3e7 Merge mysql.com:/home/jimw/my/mysql-4.1-8355
into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_base.cc:
  Auto merged
2005-02-17 13:48:34 -08:00
unknown
d14e9b642a Merge mysql.com:/home/jimw/my/mysql-4.1-7989
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:47:14 -08:00
unknown
ae9166cd65 Log each slow query in a multi-statement query to the slow query log.
(Bug #8475)


sql/sql_parse.cc:
  Reset the start time before each statement before each statement in
  a multi-statement query, and check whether each statement should
  be logged to the slow query log independently.
mysql-test/r/multi_statement.result:
  Add new results
mysql-test/t/multi_statement.test:
  Add new regression test
2005-02-17 11:48:44 -08:00
unknown
844277ec1d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1


sql/sql_parse.cc:
  Auto merged
2005-02-17 17:52:49 +00:00
unknown
23f786b0ad bug#6958
Fixed that negative arguments to certain integer options wrap around.


mysql-test/r/variables.result:
  Added a test case for bug#6958.
mysql-test/t/variables.test:
  Added a test case for bug#6958.
sql/set_var.cc:
  sys_var_long_ptr::check function was added.
sql/set_var.h:
  Use sys_var_long_ptr::check function for sys_var_long_ptr class.
2005-02-17 15:04:04 +04:00
unknown
d2a69d8f7d Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-02-16 21:20:39 -08:00
unknown
7f905da3d8 select.result, select.test:
Added a test case for bug #7098.
sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.


sql/sql_select.cc:
  Fixed bug #7098.
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
mysql-test/t/select.test:
  Added a test case for bug #7098.
mysql-test/r/select.result:
  Added a test case for bug #7098.
2005-02-16 21:17:20 -08:00
unknown
c082848897 A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode, as currently
ONLY_FULL_GROUP_BY mode is overly restrictive.


mysql-test/r/ansi.result:
  A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.
mysql-test/t/ansi.test:
  A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.
sql/set_var.cc:
  A "fix" for problem discovered in BUG#8510: remove ONLY_FULL_GROUP_BY mode from ANSI mode.
2005-02-17 07:12:31 +03:00
unknown
d475cece23 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-17 03:34:30 +01:00
unknown
3f80899679 Windows compatibility changes of the 'rpl_delete_all',
'ps_1general' and 'fulltext_cache' test cases.


mysql-test/r/fulltext_cache.result:
  To pass on Windows, round to less digits
mysql-test/t/fulltext_cache.test:
  To pass on Windows, round to less digits
mysql-test/t/ps_1general.test:
  To pass on Windows, change \\ to / in result
mysql-test/t/rpl_delete_all.test:
  To pass on Windows, change \\ to / in result
mysql-test/mysql-test-run.pl:
  Pass mysqld --console to catch output on Windows
mysql-test/lib/mtr_process.pl:
  Check error from exec() to avoid becoming a fork() bomb
2005-02-17 02:59:39 +01:00
unknown
89f031b3e9 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dellis/bkl/bug-4.1
2005-02-16 19:37:53 -06:00
unknown
6078fcc1f0 Bug#8147
Fix ambigious table error for INSERT..SELECT..UPDATE


mysql-test/r/insert_update.result:
  Bug#8147
    Alter test for bug
mysql-test/t/insert_update.test:
  Bug#8147
    Alter test for bug
sql/sql_parse.cc:
  Bug#8147
    Change order of code - 
    skip insert table before calling mysql_prepare_insert()
2005-02-17 01:33:59 +00:00
unknown
026bb52678 Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dellis/mysqlab/bk/mysql-4.0
2005-02-16 19:15:08 -06:00
unknown
c3dec835b5 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
2005-02-16 12:48:38 +01:00
unknown
dbff1150c5 ndb - fix old decimal type mysql vs ndb
mysql-test/r/ndb_index_ordered.result:
  fix old decimal type mysql vs ndb (re-commit 3)
mysql-test/t/ndb_index_ordered.test:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/ndbapi/NdbDictionary.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/include/util/NdbSqlUtil.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/common/util/NdbSqlUtil.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionary.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/src/ndbapi/NdbRecAttr.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/test/include/NdbSchemaOp.hpp:
  fix old decimal type mysql vs ndb (re-commit 3)
ndb/tools/restore/consumer.cpp:
  fix old decimal type mysql vs ndb (re-commit 3)
sql/ha_ndbcluster.cc:
  fix old decimal type mysql vs ndb (re-commit 3)
2005-02-16 12:45:59 +01:00
unknown
d8b0113653 Merge
mysql-test/r/fulltext.result:
  SCCS merged
mysql-test/t/fulltext.test:
  SCCS merged
2005-02-16 04:04:34 -06:00