Commit graph

19840 commits

Author SHA1 Message Date
unknown
8ff8fac53d BUG#12915: post-review fixes 2005-10-18 14:04:14 +04:00
unknown
3867a5db37 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:56:56 +02:00
unknown
e893703cee Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-10-17 09:55:30 +02:00
unknown
1f844d35ef ndb - hugo
Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported
2005-10-17 09:51:16 +02:00
unknown
326544b8ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-4.1
2005-10-14 15:35:57 +02:00
unknown
5dfd72a038 fix for Valgrind errors: query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
because they are used by net_printf() and push_warning(), which can be called if check_connection() fails.


sql/mysqld.cc:
  not needed anymore
sql/repl_failsafe.cc:
  not needed anymore
sql/slave.cc:
  not needed anymore
sql/sql_class.cc:
  query_id needs to be inited early (already fixed in 5.0 by Konstantin) and so does client_capabilities (not fixed in 5.0);
  because they are used by net_printf() and push_warning(), which may be called if check_connection() fails.
2005-10-14 15:34:52 +02:00
unknown
81766b9ab7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-10-14 11:52:52 +02:00
unknown
e2cd597dca Fix for Bug #13961 Triggers on tables with auto_increment insert bogus values into table (clean version) 2005-10-14 11:23:02 +02:00
unknown
08bf55c71f Merge mysql.com:/usr/home/bar/mysql-4.1.b13487
into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged
2005-10-14 14:07:22 +05:00
unknown
05414133af Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged
2005-10-14 13:57:38 +05:00
unknown
9cc7d75ea3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 11:54:10 +05:00
unknown
1e11d278c3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
2005-10-14 09:09:25 +05:00
unknown
ca541b9ce1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into moonbone.local:/work/13855-bug-4.0-mysql
2005-10-14 03:12:32 +04:00
unknown
0390de8672 Fix bug #13855 select distinct with group by caused server crash
DISTINCT wasn't optimized away and caused creation of tmp table in wrong
case. This result in integer overrun and running out of memory.

Fix backported from 4.1. Now if optimizer founds that in result be only 1
row it removes distinct.


sql/sql_select.cc:
  Fix bug #13855 select distinct with group by caused server crash
mysql-test/r/select.result:
  Test case for bug#13855 select distinct with group by caused server crash
mysql-test/t/select.test:
   Test case for bug#13855 select distinct with group by caused server crash
2005-10-14 01:22:24 +04:00
unknown
0dc3105ada Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2005-10-14 00:04:40 +03:00
unknown
0069549021 - set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)
2005-10-14 00:02:38 +03:00
unknown
eb8be3261d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-10-13 22:29:50 +02:00
unknown
74121f4648 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-10-13 22:29:29 +02:00
unknown
507dc62acc Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
support-files/mysql.spec.sh:
  Auto merged
2005-10-13 22:11:49 +02:00
unknown
124b0a594c - added a usermod call in the postinstall section of the RPM spec file
to assign a potential existing mysql user to the correct user group (BUG#12823) 


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
2005-10-13 22:10:54 +02:00
unknown
4b51051d99 RPM spec file fixes:
- added a usermod call to assign a potential existing mysql user to the
   correct user group (BUG#12823)
 - Save the perror binary built during Max build so it supports the NDB
   error codes (BUG#13740)
 - added a separate macro "mysqld_group" to be able to define the
   user group of the mysql user seperately, if desired.


support-files/mysql.spec.sh:
   - added a usermod call to assign a potential existing mysql user to the
     correct user group (BUG#12823)
   - Save the perror binary built during Max build so it supports the NDB
     error codes (BUG#13740)
   - added a separate macro "mysqld_group" to be able to define the
     user group of the mysql user seperately, if desired.
2005-10-13 22:01:02 +02:00
unknown
c8067ec848 Fixes during review of new code
sql/slave.cc:
  Moved mutex_unlock to handle 'err' case properly
vio/vio.c:
  Made code clearer (fcntl_mode is always 0 here)
2005-10-13 19:24:01 +03:00
unknown
0e9f9498ea Use 4.1 code 2005-10-13 18:48:58 +03:00
unknown
854fd32827 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 16:53:46 +02:00
unknown
94d51833ef Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2005-10-13 19:53:45 +05:00
unknown
3d332ea76f merging 2005-10-13 19:51:07 +05:00
unknown
f4e6fca1bd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into  mysql.com:/home/my/mysql-4.0
2005-10-13 17:42:15 +03:00
unknown
d853ecd67c Review of new pushed code
- No need to check *ref when ref is checked (Simple optimization fix)


sql/item.cc:
  No need to check *ref
2005-10-13 17:41:55 +03:00
unknown
2a0183b54d merging
sql/sql_select.cc:
  Auto merged
2005-10-13 19:31:09 +05:00
unknown
2e887f794a Fix for bug #3874 (Group by field is not considered)
mysql-test/r/select.result:
  test result fixed
mysql-test/t/select.test:
  test case added
sql/sql_select.cc:
  do the same for nullable
2005-10-13 19:23:52 +05:00
unknown
0d89774756 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
2005-10-13 17:21:54 +03:00
unknown
cd04dcd7bc Some Netware related fixes and fixes for Metrowerks compiler.
netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.
2005-10-13 17:21:14 +03:00
unknown
7eee194d6e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into  neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
2005-10-13 15:53:02 +02:00
unknown
ab87b08973 Bug #12698 abnormal program termination running mysql_client_test
- Move test for bug#93 from mysql_client_test.c to show_check.test
 - No need for test written in c


mysql-test/r/show_check.result:
  Add test case for bug#93, moved from mysql_client_test.c
mysql-test/t/show_check.test:
  Add test case for bug#93, moved from mysql_client_test.c
tests/mysql_client_test.c:
  Remove test for bug#95 to show_check.test
2005-10-13 15:52:22 +02:00
unknown
8b6ba46c2c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/13535-bug-4.1-mysql


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2005-10-13 17:17:32 +04:00
unknown
10ad813d4f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 14:32:10 +02:00
unknown
341fbced18 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-10-13 14:23:37 +02:00
unknown
8009bdd26d Bug #12698 abnormal program termination running mysql_client_test
- The testcase create a .frm file consisting of "junk". Unfortunately the "junk" wasn't
   written to the .frm file if mysql_client_test was run with -s option to make it run silent.
   This most likely caused the file never to be created on windows, and thus the 
    test case failed.


tests/mysql_client_test.c:
  Always write "junk" to the test file.
2005-10-13 13:37:10 +02:00
unknown
1bfdbfca27 Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1
scripts/make_binary_distribution.sh:
  Auto merged
2005-10-13 12:36:41 +02:00
unknown
787318dc7b Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
2005-10-13 13:38:15 +05:00
unknown
3657f600df memcpy_overlap() replaced with memmove() during the merging.
strings/ctype-tis620.c:
  memcpy_overlap() replaced with memmove() during the merge.
2005-10-13 13:25:07 +05:00
unknown
5de7ba46e8 Merge mysql.com:/usr/home/ram/work/mysql-4.0
into  mysql.com:/usr/home/ram/work/mysql-4.1


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged
2005-10-13 12:48:30 +05:00
unknown
3818980eb9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b12476


sql/item_cmpfunc.cc:
  Auto merged
2005-10-13 11:25:08 +05:00
unknown
62002fdc00 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 16:07:16 -07:00
unknown
ce48949ef9 Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 14:38:32 -07:00
unknown
d68f16e215 Manual merged
sql/item.cc:
  Auto merged
2005-10-13 01:14:58 +04:00
unknown
a46e8e230e select.test, sql_select.cc, sql_lex.cc, item.cc:
Bug #7672 after merge fix


sql/item.cc:
  Bug #7672 after merge fix
sql/sql_lex.cc:
  Bug #7672 after merge fix
sql/sql_select.cc:
  Bug #7672 after merge fix
mysql-test/t/select.test:
  Bug #7672 after merge fix
2005-10-13 00:58:59 +04:00
unknown
0d5af53ccc Merge mysql.com:/home/jimw/my/mysql-4.1-6413
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:31:01 -07:00
unknown
77ad01c270 Merge mysql.com:/home/jimw/my/mysql-4.1-12136
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:29:49 -07:00
unknown
3b3712fda3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.
mysql-test/t/rpl_dual_pos_advance-master.opt:
  the option file must be non-empty (because there's a -z test in mysql-test-run)
2005-10-12 22:29:36 +02:00