joerg@mysql.com
29a78e7e88
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2005-03-16 16:44:31 +01:00
joerg@mysql.com
ea5899a65d
Add information to the log file written by 'Do-compile' that allows to calculate
...
the time spent in the various steps.
2005-03-16 16:33:06 +01:00
bar@mysql.com
a7b877df78
Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY()
...
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for
debugging purposes.
2005-03-16 17:44:29 +04:00
gluh@gluh.mysql.r18.ru
41487d0b4e
Fix for bug#8656: Crash with group_concat on alias in outer table
...
fixed result_field support of Item_ref
2005-03-16 16:44:28 +03:00
gluh@gluh.mysql.r18.ru
4c3e8b078c
Fix for bug #7100 : relay_log_space_max missing from SHOW VARIABLES
2005-03-16 15:57:57 +03:00
bar@mysql.com
2d8e8c02a5
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
2005-03-16 14:35:44 +04:00
mskold@mysql.com
515bd1fed8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-16 07:47:02 +01:00
reggie@mdk10.(none)
6c00af77a0
Bug #6660 mysqldump creates bad pathnames on Windows
...
sql_show.cc:
changed strdup to thd->memdup per Serg's advice
2005-03-15 16:24:37 -06:00
mskold@mysql.com
d40e154353
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-15 22:20:57 +01:00
mskold@mysql.com
057d78650e
Fix for bug#9166: Cluster compile failure on Solaris 10
2005-03-15 22:19:55 +01:00
reggie@mdk10.(none)
ef86c0af65
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-15 11:37:14 -06:00
reggie@mdk10.(none)
887f2a53fe
Bug #6660 mysqldump creates bad pathnames on Windows
...
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem. With this patch, data directory and index directory will use only forward slashes (/) when on Windows.
mysqldump.c:
Removed fixPaths routine. Was improper fix for bug #6660
sql_show.cc:
Changed append_directory to convert backslashes to foward slashes when on Windows.
2005-03-15 11:33:06 -06:00
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
marko@hundin.mysql.fi
cedaeb4b7c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-15 14:48:09 +02: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
joerg@mysql.com
281af2f9bc
Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX).
2005-03-15 12:40:28 +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
marko@hundin.mysql.fi
dd20809e32
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-15 11:14:57 +02: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
reggie@mdk10.(none)
75e1b9e765
Bug #6660 mysqldump creates bad pathnames on Windows
...
This really should not happen on Windows and part of the problem not fixed here is why show create table includes data directory when being run on Windows. However, this patch fixes the bug in mysqldump.c
mysqldump.c:
Added fixPaths function to convert \ to / in data directory and index directory entries only on Windows
2005-03-14 16:47:35 -06: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
marko@hundin.mysql.fi
d5c1475db6
dict0load.c:
...
dict_load_table(): Refuse to open ROW_FORMAT=COMPACT tables
of MySQL 5.0.3 and later.
2005-03-14 12:43:22 +02: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