Commit graph

17697 commits

Author SHA1 Message Date
bar@mysql.com
c6c887b990 # Bug#8785 Problem with nested concats and
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00
lenz@mysql.com
50a6dc4e71 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-03-15 13:48:08 +01:00
lenz@mysql.com
a5d1a98d69 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-03-15 13:44:55 +01:00
ramil@mysql.com
04328c3dfa A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
lenz@mysql.com
c7506fa5f9 - Build fix for Do-solaris-pkg: fixed package name matching regex to be satisfied with
"mysql-pro-gpl-cert" packages as well (thanks to Kent for the suggestion)
2005-03-15 12:27:44 +01:00
lenz@mysql.com
2714f176fb Applied some changes to the mysql.server init script that are already shipped as an additional patch
in the 4.1.10a RPMs for SLES9/RHEL3:

- small improvement: use LSB functions to display startup success and failure, if available.
  Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
2005-03-15 12:23:14 +01:00
ramil@mysql.com
ec775b65f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b8799
2005-03-15 14:13:44 +04:00
ramil@mysql.com
46613bafbe A fix (bug #8489: Strange auto_increment behaviour with HEAP table). 2005-03-15 13:32:12 +04:00
heikki@hundin.mysql.fi
9967ee9d28 buf0flu.c:
Add diagnostics to track why ut_a(block->state == BUF_BLOCK_FILE_PAGE) failed in buf_flush_ready_for_replace() for a user
2005-03-15 08:33:47 +02:00
sergefp@mysql.com
1e1a1b1f82 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 09:33:46 +03:00
paul@snake-hub.snake.net
d5296c39eb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1
2005-03-14 20:22:15 -06:00
paul@snake-hub.snake.net
4db8986006 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-03-14 19:59:59 -06:00
paul@snake-hub.snake.net
4af3c8a23a mysql.1.in:
Fix path that needs no parameterization.
2005-03-14 19:59:00 -06:00
sergefp@mysql.com
e7e2a8c8eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 04:09:41 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
2005-03-14 16:59:09 +02:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
serg@serg.mylan
18343b9454 correct not_null_tables() for XOR and AND
correct top_level_item for XOR
2005-03-13 16:34:40 +01:00
igor@rurik.mysql.com
a90d2bd97c join_outer.result, join_outer.test:
Added a test case for bug #9017.
item_cmpfunc.h:
  A wrong not_null_tables method for Item_cond_xor
  caused a conversion of a left join into an inner join
  that was not valid.
2005-03-12 23:31:52 -08:00
jimw@mysql.com
d114066174 Merge mysql.com:/home/jimw/my/mysql-4.1-8513
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-11 11:08:04 -08:00
jimw@mysql.com
50f9fc3368 Merge test and results 2005-03-11 11:07:32 -08:00
joerg@mysql.com
24716cba44 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-03-11 11:32:56 +01:00
joerg@mysql.com
31eb1c89ee Keep the Perl version of 'mysql-test-run' in sync with the shell script. 2005-03-11 11:08:27 +01:00
mwagner@here.mwagner.org
b6288b1e3f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
2005-03-10 19:56:58 -06:00
mwagner@here.mwagner.org
f1eb5b965a Do-solaris-pkg:
Many changes to improve error handling, and fix problem of multiple packaging processes trampling each other (32 & 64bit at the same time)
2005-03-10 19:42:52 -06:00
sergefp@mysql.com
763039a17b Merge 2005-03-11 02:23:16 +03:00
sergefp@mysql.com
5d865045c9 Fix for BUG#8711: "<=>" may have true value for NULL arguments, so make
Item_func_equal::not_null_tables() always return 0.
2005-03-11 02:17:03 +03:00
joerg@mysql.com
f610930224 Correct "make_win_src_distribution" to not introduce additional directory layers,
adapt the Windows build files accordingly.
2005-03-10 21:13:46 +01:00
joerg@mysql.com
2d0ecfa7c9 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-10 20:31:05 +01:00
timour@mysql.com
abf659dee9 Merge mysql.com:/home/timka/mysql/src/4.1-bug-7425
into mysql.com:/home/timka/mysql/src/4.1-dbg
2005-03-10 11:50:55 +02:00
heikki@hundin.mysql.fi
0b0a9188bf Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-03-10 09:01:02 +02:00
joreland@mysql.com
87c93bc514 Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-10 07:48:44 +01:00
joreland@mysql.com
3aa4349df1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-10 07:47:27 +01:00
joreland@mysql.com
364b3b7b9b bug#9089
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
2005-03-10 07:45:17 +01:00
igor@rurik.mysql.com
6540c59808 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-03-09 13:24:05 -08:00
igor@rurik.mysql.com
4406118cf8 func_str.result:
Correction after manual merge.
2005-03-09 13:20:52 -08:00
igor@rurik.mysql.com
af5d21357e Manual merge 2005-03-09 10:58:52 -08:00
heikki@hundin.mysql.fi
2ec7c5f447 log0recv.c:
Better ibbackup message
  Add a message explaining why we do a 'crash recovery' after an ibbackup restore; suggested by Tim Smith
2005-03-09 20:32:01 +02:00
lars@mysql.com
44412afa2a Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1 2005-03-09 19:32:00 +01:00
lars@mysql.com
5f931f472f Fix to make mysql-test-run.pl work with new system tables definitions 2005-03-09 19:21:57 +01:00
timour@mysql.com
f489e56291 Fix for BUG#7425.
The reported problems were due to two completely unrelated omissions.
1) The file sort procedure didn't correctly create the sort key in
   make_sortkey when the sortkey was an unsigned integer.
2) The name resolution procedure for column references inside a HAVING
   clause did not propagate the unsigned_flag of the resolved references.
This patch corrects both problems.
2005-03-09 16:51:03 +02:00
kent@mysql.com
3ce3295e3f mysqldumpslow.sh:
bug#4914 added --help and usage information
2005-03-09 15:00:40 +01:00
serg@serg.mylan
6121422820 sql/mysqld.cc
preserve backward compatibility
2005-03-09 13:41:57 +01:00
serg@serg.mylan
c64b47fc0e Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-09 13:01:39 +01:00
serg@serg.mylan
0279cd50d9 myisam/myisam_ftdump.c
recalculate stats/gws for the last word in the index too
    remove unused code
2005-03-09 12:59:20 +01:00
igor@rurik.mysql.com
4559fb998b func_str.result, func_str.test:
Added a test case for bug #8669.
item_strfunc.cc:
  Fixed bug #8669.
  Function AES_DECRYPT can return NULL value.
2005-03-09 00:15:51 -08:00
joreland@mysql.com
241c5e1046 bug#9052 - ndb - Use correct length during unique index build
(recommit as 4.1->5.0 merge is not possible)
2005-03-09 07:49:03 +01:00
kent@mysql.com
73eea6dde9 configure.in:
bug#5102, bug#6862 define HAVE_VIS_H to libedit only if header and strvis() exists
2005-03-09 02:53:00 +01:00
kent@mysql.com
c6002966be mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
2005-03-09 01:34:22 +01:00
marko@hundin.mysql.fi
fa001505e3 mysqld.cc:
main(): add missing parameter to printf(ER(ER_READY),...) call
2005-03-08 22:33:11 +02:00
serg@serg.mylan
eb0fc8ff28 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-08 21:33:10 +01:00