bar@mysql.com/bar.intranet.mysql.r18.ru
413d18658f
Bug#22646 LC_TIME_NAMES: Assignment to non-UTF8 target fails
...
Problem: After introducing of LC_TIME_NAMES variable, the
function date_format() can return international non-ascii
characters in month and weekday names. Thus, it cannot return
a binary string anymore, because inserting a result of date_format()
into a column with non-utf8 character set produces garbage.
Fix: date_format() now returns a character string, using
"collation_connection" to detect character set and collation
for the returned value. This allows to insert
results of date_format() properly into columns with
various character sets.
2006-11-08 15:37:54 +04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
db8aa4ab6c
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-11-07 12:00:55 +01:00
msvensson@neptunus.(none)
570f603988
Don't warn about "Found non pid file" for elements that are not files.
2006-11-03 15:26:42 +01:00
cmiller@zippy.cornsilk.net
e235c8c421
Fix merge collision.
2006-11-02 18:27:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-11-02 17:27:42 -05:00
msvensson@shellback.(none)
15835edddd
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-02 23:09:32 +01:00
kent/mysqldev@mysql.com/production.mysql.com
27f3bb1065
configure.in:
...
Raise version number to 4.1.23
2006-11-02 21:58:42 +01:00
thek@kpdesk.mysql.com
3542d83a71
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-02 13:35:28 +01:00
thek@kpdesk.mysql.com
3f16931527
Bug#22828 complementary patch:
...
- 'false' not defined in C, use FALSE instead.
2006-11-02 13:33:26 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
9658dc9127
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug22913/my41-bug22913
2006-11-02 16:25:01 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a072688eea
Fix for bug #22913 : mysql --quick doesn't report some errors.
...
We don't check for errors that may occur during data printing.
2006-11-02 14:32:00 +04:00
kostja@bodhi.local
6a28c436f7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-02 01:08:39 +03:00
msvensson@shellback.(none)
8d29d65cf3
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:16:34 +01:00
msvensson@shellback.(none)
c4369f2494
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-01 16:08:17 +01:00
thek@kpdesk.mysql.com
df82f58477
Merge kpdesk.mysql.com:/home/thek/dev/bug22828/my41-bug22828
...
into kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
2006-11-01 09:24:57 +01:00
msvensson@shellback.(none)
2754edbaf3
Improve the reading of .pid files from var/run
...
- Only read *.pid
- Only allow it to contain a number
2006-10-31 19:02:33 +01:00
msvensson@shellback.(none)
64eb65533e
Make variables static to please Netware compiler
2006-10-31 18:51:23 +01:00
msvensson@shellback.(none)
c6c0dcdc0d
Remove warning, exe_mysql_fix_system_tables are not available on windows
2006-10-31 17:16:07 +01:00
thek@kpdesk.mysql.com
12d8f2bf31
Bug#22828 _my_b_read() ignores return values for my_seek() calls
...
- Because my_seek actually is capable of returning an error code we should
exploit that in the best possible way.
- There might be kernel errors or other errors we can't predict and capturing
the return value of all system calls gives us better understanding of
possible errors.
2006-10-31 09:26:16 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2d22e2ec84
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
2006-10-31 10:21:18 +04:00
kroki/tomash@moonlight.intranet
77f1d01fbb
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21915
2006-10-30 17:58:56 +03:00
kroki/tomash@moonlight.intranet
1bfe00e0da
BUG#21915: Changing limits of table_cache when setting max_connections
...
If the user has specified --max-connections=N or --table-open-cache=M
options to the server, a warning could be given that some values were
recalculated, and table-open-cache could be assigned greater value.
Note that both warning and increase of table-open-cache were totally
harmless.
This patch fixes recalculation code to ensure that table-open-cache will
be never increased automatically and that a warning will be given only if
some values had to be decreased due to operating system limits.
No test case is provided because we neither can't predict nor control
operating system limits for maximal number of open files.
2006-10-30 17:47:02 +03:00
msvensson@shellback.(none)
2fd830c4ea
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-30 15:03:04 +01:00
msvensson@shellback.(none)
9f223873cf
Bug#18654 Test is timing-dependent and fails from scheduling effects (?)
...
- Wait in loop with small sleep until tables has been renamed
2006-10-30 14:42:28 +01:00
jonas@perch.ndb.mysql.com
dc2ca8ca10
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:56:51 +02:00
jonas@perch.ndb.mysql.com
f4af143fcb
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:57 +02:00
jonas@perch.ndb.mysql.com
85b0e1f80b
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-27 23:54:24 +02:00
jonas@perch.ndb.mysql.com
0cbb309b1a
ndb - valgrind
...
Still leakage, make sure all unlinked operations are put back so they will be release
(on failing blob operations, when AO_IgnoreError)
2006-10-27 16:32:59 +02:00
msvensson@neptunus.(none)
abc1c05449
Update the rules for abi_check
2006-10-27 15:57:00 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6ee81f0ed
Fix for bug #23412 : delete rows with null date field
...
Backport of the fix for bug #8143 : A date with value 0 is treated as a NULL value
2006-10-27 18:08:50 +05:00
kroki/tomash@moonlight.intranet
fa60a03073
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
2006-10-25 20:13:07 +04:00
kroki/tomash@moonlight.intranet
b7b991cec3
BUG#18819: DELETE IGNORE hangs on foreign key parent delete
...
If the error happens during DELETE IGNORE, nothing could be send to the
client, thus leaving it frozen expecting the reply.
The problem was that if some error occurred, it wouldn't be reported to
the client because of IGNORE, but neither success would be reported.
MySQL 4.1 would not freeze the client, but will report
ERROR 1105 (HY000): Unknown error
instead, which is also a bug.
The solution is to report success if we are in DELETE IGNORE and some
non-fatal error has happened.
2006-10-25 19:53:26 +04:00
lars/lthalmann@mysql.com/dl145h.mysql.com
31abddb5e1
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
2006-10-25 17:08:57 +02:00
msvensson@neptunus.(none)
8f118827c4
Skip innodb test if mysqld doesn't have innodb support
2006-10-25 16:50:06 +02:00
mskold/marty@mysql.com/linux.site
7ad30e80f1
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-25 15:17:44 +02:00
msvensson@neptunus.(none)
de932f2a5f
Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified
2006-10-25 14:56:36 +02:00
msvensson@neptunus.(none)
a6d87b4c00
Add valgrinding support for mysql_client_test
...
Fix two memory leaks in mysql_client_test
2006-10-25 14:34:18 +02:00
msvensson@neptunus.(none)
4969081589
Set flag opt_skip_ndbcluster_slave if no slaves are being used.
...
Add comments
Deperlify
2006-10-25 12:40:33 +02:00
mskold/marty@mysql.com/linux.site
deb26a93e5
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-4.1-ndb
2006-10-25 11:45:47 +02:00
mskold/marty@mysql.com/linux.site
44e55e3b43
Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
2006-10-25 11:44:40 +02:00
knielsen@ymer.(none)
df8c9272e8
Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
...
into ymer.(none):/usr/local/mysql/mysql-4.1-ndb
2006-10-25 10:46:00 +02:00
knielsen@ymer.(none)
44aa0f4de1
Fix two small problems in the source, potentially causing user-visible
...
bugs.
2006-10-25 10:37:53 +02:00
stewart@willster.(none)
a4faddc64f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
2006-10-25 17:24:20 +10:00
jonas@perch.ndb.mysql.com
0f74244d86
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-25 08:40:34 +02:00
msvensson@neptunus.(none)
1f780b77e7
Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default
2006-10-24 23:39:46 +02:00
msvensson@neptunus.(none)
ac5b37ef00
Pass --core-file option to mysqld when bootstrapping
2006-10-24 21:02:04 +02:00
msvensson@neptunus.(none)
e4b65a9947
Merge neptunus.(none):/home/msvensson/mysql/bug23427/my41-bug23427
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-10-24 20:41:48 +02:00
msvensson@neptunus.(none)
1a7676fa65
WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaks
...
BUG#23427 incompatible ABI change in 5.0.26?
- Use the icheck tool if avaliable and compare the current mysql.h to a version
controlled reference file
2006-10-24 20:32:07 +02:00
msvensson@neptunus.(none)
844369130f
Remove debug printout
2006-10-24 19:22:27 +02:00
msvensson@neptunus.(none)
a8d1c62e5f
Run mysql_client_test without --silent
...
Flush both stdout and stderr before abort'ing mysql_client_test
2006-10-24 18:49:19 +02:00