Commit graph

14085 commits

Author SHA1 Message Date
unknown
8d9dca16e2 subselect test split on two tests because gis extention can be absent 2004-08-24 10:15:39 +03:00
unknown
b2b215d9ce Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-24 00:45:03 +02:00
unknown
4e7cb1ce48 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2004-08-24 01:09:24 +03:00
unknown
7d4ad390e0 Fixed uninitialized variable
Fixed error messages


sql/share/czech/errmsg.txt:
  Fixed error message to us long
sql/share/danish/errmsg.txt:
  Fixed error message to us long
sql/share/dutch/errmsg.txt:
  Fixed error message to us long
sql/share/english/errmsg.txt:
  Fixed error message to us long
sql/share/estonian/errmsg.txt:
  Fixed error message to us long
sql/share/french/errmsg.txt:
  Fixed error message to us long
sql/share/german/errmsg.txt:
  Fixed error message to us long
sql/share/greek/errmsg.txt:
  Fixed error message to us long
sql/share/hungarian/errmsg.txt:
  Fixed error message to us long
sql/share/italian/errmsg.txt:
  Fixed error message to us long
sql/share/japanese/errmsg.txt:
  Fixed error message to us long
sql/share/korean/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian-ny/errmsg.txt:
  Fixed error message to us long
sql/share/norwegian/errmsg.txt:
  Fixed error message to us long
sql/share/polish/errmsg.txt:
  Fixed error message to us long
sql/share/portuguese/errmsg.txt:
  Fixed error message to us long
sql/share/romanian/errmsg.txt:
  Fixed error message to us long
sql/share/russian/errmsg.txt:
  Fixed error message to us long
sql/share/serbian/errmsg.txt:
  Fixed error message to us long
sql/share/slovak/errmsg.txt:
  Fixed error message to us long
sql/share/spanish/errmsg.txt:
  Fixed error message to us long
sql/share/swedish/errmsg.txt:
  Fixed error message to us long
sql/share/ukrainian/errmsg.txt:
  Fixed error message to us long
sql/sql_table.cc:
  Fixed uninitialized variable
2004-08-24 01:08:48 +03:00
unknown
916a028c36 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/rburnett/mysql-4.1
2004-08-23 22:01:16 +02:00
unknown
946c48baa6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:57:07 +03:00
unknown
43821a8336 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-bugs-4.1
2004-08-23 22:32:38 +03:00
unknown
8f405690f1 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/mysql/4.1


configure.in:
  Auto merged
2004-08-23 12:31:03 -07:00
unknown
13f7338a3f after review fixes:
allowed parsing of table fields inside aggregate functions
 added new tests of fields resolving in grouping


mysql-test/r/func_gconcat.result:
  allowed parsing of table fields inside aggregate functions
mysql-test/r/subselect.result:
  added new tests of fields resolving in grouping
mysql-test/t/func_gconcat.test:
  allowed parsing of table fields inside aggregate functions
mysql-test/t/subselect.test:
  added new tests of fields resolving in grouping
sql/item_subselect.cc:
  allowed parsing of table fields inside aggregate functions
2004-08-23 22:31:01 +03:00
unknown
8dd14b45e3 Changing version information.
configure.in:
  Update for gamma status.
2004-08-23 12:28:28 -07:00
unknown
a7c8153116 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:25:25 +02:00
unknown
0971b7ffda Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 21:11:06 +02:00
unknown
a9372bb366 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-08-23 21:03:16 +02:00
unknown
93a894ac86 - removed mysql-test/t/flush_block_commit-master.opt as it collided
with the sleep value we use for the test suite run during the
   release builds


BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
  Delete: mysql-test/t/flush_block_commit-master.opt
2004-08-23 20:58:56 +02:00
unknown
3fc3bb68cc Merge mskold@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-23 20:33:38 +02:00
unknown
e0a12e898c Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
client.c:
  Removed call to clear_slave_vio in end_server().  Removed header declaration of clear_slave_vio
slave.cc:
  Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()


sql/slave.cc:
  Removed clear_slave_vio function and added calls to thd->clear_active_vio before each call to end_server()
sql-common/client.c:
  Removed call to clear_slave_vio in end_server().  Removed header declaration of clear_slave_vio
2004-08-23 18:55:12 +02:00
unknown
614414682f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-08-23 20:18:24 +04:00
unknown
21fa12734f Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results(for 4.1 tree)
mysql-test/r/binary.result:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
mysql-test/t/binary.test:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
sql/sql_select.cc:
  Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
2004-08-23 20:17:14 +04:00
unknown
a3e0b69bfb Fix for bug#5171 2004-08-23 17:24:03 +02:00
unknown
4f1230a5a9 show_check.test, show_check.result:
Don't do this test for now: it fails on Mac OSX.


mysql-test/r/show_check.result:
  Don't do this test for now: it fails on Mac OSX.
mysql-test/t/show_check.test:
  Don't do this test for now: it fails on Mac OSX.
2004-08-23 20:12:40 +05:00
unknown
c3c483e091 Bug#4594: column index make = failed for gbk, but like works
Fix for HEAP+HASH prefix keys.
2004-08-23 20:12:39 +05:00
unknown
8522f83038 reverted default setting of --ndbcluster if --ndb-connectstring is given 2004-08-23 15:12:38 +00:00
unknown
e275e347e3 merge
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-08-23 15:50:59 +03:00
unknown
fdc831da21 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-23 14:07:59 +02:00
unknown
d40349fbf9 bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
fix for bdb not ending up into libmysqld.a


bdb/dist/configure.ac:
  bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
configure.in:
  build bdb with --disable-shared for libdb.a to go into libmysqld.a
libmysqld/examples/Makefile.am:
  incorrect "bugfix" undone. bdb should be in libmysqld.a
2004-08-23 13:55:40 +02:00
unknown
38b8c98543 unnecessary LINT_INIT removed 2004-08-23 13:43:55 +02:00
unknown
f0c1dadbdb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


mysys/mf_keycache.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-08-23 13:47:52 +03:00
unknown
f7d0dfd9e8 Changed %lx -> 0x%lx (for easier comparison of debug files)
Cosmetic cleanups
Don't call 'delete_elements' on copy_funcs as this causes elements to be freed twice


mysys/hash.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/list.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/mf_iocache.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/mf_keycache.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
  Changed debug messages to be more consistent with other mysys files.
mysys/mf_keycaches.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_alloc.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_fopen.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_fstream.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_getwd.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_lib.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_lwrite.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_malloc.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_pread.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_read.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_realloc.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/my_write.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/safemalloc.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_alarm.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_lock.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/thr_mutex.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/tree.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
mysys/typelib.c:
  Changed %lx -> 0x%lx (for easier comparison of debug files)
sql/examples/ha_archive.cc:
  Changed to return error number for some functions (instead of -1)
  Updated function comments & some other minor cleanups
  Ensure that free_share() and gzclose() are always called
  Use 'TRUE' and 'FALSE' instead of 'true' and 'false'
  Removed some compiler warnings
sql/examples/ha_archive.h:
  Fixed to use new prototypes for records_in_range
sql/sql_select.cc:
  Don't call 'delete_elements' on copy_funcs
2004-08-23 13:46:51 +03:00
unknown
40f282d593 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
2004-08-23 11:15:44 +02:00
unknown
1ffda90b83 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-root-root
2004-08-23 13:15:43 +04:00
unknown
b6d9222da3 small ndb switch fix 2004-08-23 09:15:42 +00:00
unknown
e66e0c1a04 better for for bug#4767 2004-08-23 10:53:53 +02:00
unknown
355004e0d6 stylistic fixes 2004-08-23 08:42:31 +00:00
unknown
34c8e46dc3 Fix for bug#5088:
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
 * In remove_const, don't remove conditions that depend on some-const-table and current-table.


mysql-test/r/join_outer.result:
  Testcase for bug#5088
mysql-test/t/join_outer.test:
  Testcase for bug#5088
2004-08-23 12:31:56 +04:00
unknown
92224a13c1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1


mysql-test/t/func_gconcat.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2004-08-23 10:59:35 +03:00
unknown
e68a881395 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1


sql/mysqld.cc:
  Auto merged
2004-08-23 07:33:40 +00:00
unknown
83e3d3f9a3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-08-22 14:24:45 +02:00
unknown
dcf98760ae check for mysql_bin_log.is_open() before my_b_tell(&thd->transaction.trans_log
in ha_commit_trans - why it didn't crash earlier ?


mysql-test/r/null.result:
  after merge fix
2004-08-22 14:23:52 +02:00
unknown
6f6f7ba94d merged
sql/item_cmpfunc.h:
  Auto merged
mysql-test/r/join_outer.result:
  merged with 'ul'
mysql-test/r/null.result:
  merged with 'ul'
2004-08-22 12:47:11 +02:00
unknown
cb6dc5738c after merge fixes 2004-08-22 12:43:26 +02:00
unknown
24c008a5fb ported bugfix for #2408 from 3.23
(cannot call it a "merge" :)
2004-08-22 10:22:59 +02:00
unknown
35d5744e8a bug#2408 - Multiple threads altering MERGE table UNIONs hang/crash.
Abandoned improper use of MyISAM data.
Thanks Ingo!
2004-08-22 09:36:17 +02:00
unknown
fe450cd719 libedit safety fix: account for closing \0
cmd-line-utils/libedit/history.c:
  account for closing \0
2004-08-21 23:53:42 +02:00
unknown
c5677d9a3e Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-21 12:35:33 -05:00
unknown
5803d60379 Fix to skip flush_block_commit test if the server was compiled
without InnoDB.
2004-08-21 11:30:41 +04:00
unknown
c1fd20bb5e null.test, null.result:
Added test case for bug #4256.
join_outer.result:
  Fixed bug #4256.
item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.


sql/item_cmpfunc.h:
  Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects.
  This inconsistency caused bug #4256.
mysql-test/r/join_outer.result:
  Fixed bug #4256.
mysql-test/r/null.result:
  Added test case for bug #4256.
mysql-test/t/null.test:
  Added test case for bug #4256.
2004-08-20 23:48:30 -07:00
unknown
2eb954a27a Bug #4629 Crash after SLAVE STOP, if the IO thread is in special state.
client.c:
  Added call to clear_slave_vio inside end_server only when under Windows with repliaction
slave.cc:
  Added clear_slave_vio function for clearing active vio on THD under Windows replication


sql/slave.cc:
  Added clear_slave_vio function for clearing active vio on THD under Windows replication
sql-common/client.c:
  Added call to clear_slave_vio inside end_server only when under Windows with repliaction
2004-08-21 05:07:32 +02:00
unknown
7c46252467 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1


sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2004-08-20 16:32:40 -07:00
unknown
14f8afc9a0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-08-20 17:22:56 -05:00
unknown
6bccd36664 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2004-08-20 15:10:12 -07:00