serg@serg.mylan
c4c76c5fdb
sql/ha_blackhole.cc
...
bug#10175 - blackhole.test hangs with "Warning: prev link 1 didn't point at previous lock at read: read lock with no write locks"
sql/sql_base.cc
libmysqld/examples/mysql.cc linking problem
2005-05-13 21:43:26 +02:00
monty@mishka.local
3ff39b3704
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-05-13 22:20:07 +03:00
jimw@mysql.com
1436dd8f7c
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:04:15 -07:00
jimw@mysql.com
20037b11fd
Merge mysql.com:/home/jimw/my/mysql-4.1-9603
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-13 10:03:16 -07:00
jimw@mysql.com
6b85ca33a7
Fixup from 4.1 to 5.0 merge
2005-05-13 09:55:03 -07:00
heikki@hundin.mysql.fi
d4bbdad2f6
row0mysql.c:
...
InnoDB wrongly complained in the .err log that MySQL is trying to drop a non-existent table, if tablespace ran out (Bug #10607 )
2005-05-13 18:37:22 +03:00
konstantin@mysql.com
9c6ba43eb1
Add missing commas to errmsg.c
2005-05-13 19:15:03 +04:00
georg@lmy002.wdf.sap.corp
41d284e608
added prototype for mysql_set_character_set function
2005-05-13 15:54:35 +02:00
georg@lmy002.wdf.sap.corp
320d9cb4c2
added function mysql_set_character_set (reviewed by Monty)
...
as a work around for #8317 and #9637
This function sends SET NAMES command and changes mysql->charset
so mysql_real_escape_string will work as expected.
2005-05-13 15:06:11 +02:00
georg@lmy002.wdf.sap.corp
03cd2329eb
reverted last push - as discussed with Monty we will add
...
mysql_set_character_set
2005-05-13 14:57:33 +02:00
ramil@ram-book.(none)
d85e052d71
a fix (bug #6267 : ENUM ... NOT NULL w/o default treated differently than other data types).
...
the behavior of enum changed to be consistent.
2005-05-13 16:44:14 +05:00
konstantin@mysql.com
e5c916f7e8
Merge
2005-05-13 13:26:08 +02:00
ramil@mysql.com
122c72e248
a fix (bug #10339 : Incorrect error is displayed if try to set value of internal ' warning_count ').
2005-05-13 16:18:27 +05:00
monty@mysql.com
b54d7d04bd
Fixes during review
2005-05-13 14:04:32 +03:00
monty@mishka.local
2d4a417330
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-05-13 13:36:02 +03:00
kent@mysql.com
3eebfde644
readline.h:
...
Include <sys/ttydefaults.h> for CodeWarrior and CTRL define
2005-05-13 11:59:17 +02:00
hf@deer.(none)
3dbe7fb2ca
Fix for valgrind bug in decimal code
2005-05-13 14:29:30 +05:00
monty@mishka.local
2d25da2a4b
concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
...
myisam_max_extra_sort_file_size is depricated
Ensure that myisam_data_pointer_size is honoured when creating new MyISAM files
Changed default value of myisam_data_pointer_size from 4 to 6 to get rid of 'table-is-full' errors
2005-05-13 12:08:08 +03:00
ramil@mysql.com
524b988260
a fix (bug #6961 : Traditional: assignment of string to numeric column should fail).
2005-05-13 13:22:27 +05:00
monty@mysql.com
20f969b256
Change create_field->offset to store offset from start of fields, independent of null bits.
...
Count null_bits separately from field offsets and adjust them in case of primary key parts.
(Previously a CREATE TABLE with a lot of null fields that was part of a primary key caused MySQL to wrongly count the number of bytes needed to store null bits)
This is a more complete bug fix for #6236
2005-05-13 11:11:50 +03:00
lenz@mysql.com
27ab139dfa
- don't include sys.h directly in the autogenerated libedit source
...
files - include config.h instead (compile fix for FreeBSD and AIX
4.3/5.2)
2005-05-13 10:04:35 +02:00
konstantin@mysql.com
441379ceab
Add myself to the list of users who don't automatically check out
...
all version controlled files (should speed up bk citool)
2005-05-13 11:35:02 +04:00
bell@book.sanja.is.com.ua
6e71a81915
Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0
...
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-bug-5.0
2005-05-13 09:22:48 +03:00
kent@mysql.com
7209906093
readline.c:
...
Include readline/readline.h earlier, to avoid redifinition of term.h macros on AIX 5.2
search.c:
FreeBSD needs <sys/types.h> to get 'off_t' defined
2005-05-12 19:02:26 +02:00
lenz@mysql.com
f6593cb7d4
- added a check for "u_int32_t" to configure.in that will define
...
HAVE_U_INT32_T when available (needed to fix a double typedef in
libedit)
2005-05-12 18:18:37 +02:00
mleich@mysql.com
1494f0ab68
If the system is under high load 'show full processlist' might report the
...
process of the predecessing test case instead of the current test case.
Shifting the command to the end of the current test case should avoid this problem.
2005-05-12 17:49:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
187ee4712b
Fixed bug 10465.
2005-05-12 17:37:38 +03:00
serg@serg.mylan
047fa11461
Merge
2005-05-12 14:45:24 +02:00
ramil@mysql.com
e4d1964851
--default-extra-file handling code fix.
2005-05-12 17:23:16 +05:00
ramil@mysql.com
152f751831
fix (Bug #8295 and #8296 : varchar and varbinary conversion)
...
select, gis & gis-tree tests fails at the moment, but
I will push this CS because it was tested before and I'm absolutely
sure it's right.
2005-05-12 15:56:04 +05:00
konstantin@mysql.com
7ca3f018e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/media/sda1/mysql/mysql-5.0-9478
2005-05-12 11:17:38 +04:00
konstantin@mysql.com
d0e24153b9
A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
...
(crash on attempt to re-execute a statement with an open cursor) +
post-review fixes.
2005-05-12 11:16:12 +04:00
paul@kite-hub.kitebird.com
2123e95e04
mysqldump.1.in:
...
Remove obsolete section number. (Bug #10534 )
2005-05-11 12:14:46 -05:00
igor@rurik.mysql.com
3351233349
Manual merge
2005-05-10 16:41:47 -07:00
igor@rurik.mysql.com
9d4b228b61
Many files:
...
Fixed bug #8528 .
Representation for single-table views was made similar to
representation for multi-table views.
view.test:
Added test case for bug #8528 .
view.result:
Added test case for bug #8528 . Fixed other test cases.
2005-05-10 16:31:13 -07:00
gbichot@quadita2.mysql.com
3c81444476
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 20:35:12 +02:00
gluh@mysql.com
efaeb069e7
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Devel/mysql-5.0
2005-05-10 18:35:11 +00:00
gluh@mysql.com
75b7fef44f
Bug#10018: use INFORMATION_SCHEMA works, but show tables in it returns error
...
additional fix after review
2005-05-10 18:34:04 +00:00
kent@mysql.com
c82c07dc03
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 18:14:45 +02:00
msvensson@neptunus.(none)
4bf24254ab
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-10 17:52:17 +02:00
msvensson@neptunus.(none)
08a48ac2d4
Fix for Ingo
2005-05-10 17:51:29 +02:00
gbichot@quadita2.mysql.com
b6ca1a1485
comment change (post-review of "replication of triggers"). Btw date_formats segfaults with --ps-protocol - not caused by my changes though; I'll file a bug report.
2005-05-10 15:55:22 +02:00
lenz@mysql.com
da2206d02b
Applied two patches already commited to the main tree to resolve bugs found during the build:
...
- removed an "#error PRAGMA" from sql/item_strfunc.h (msvensson)
- Fixed BUG#10070 (range test failed if InnoDB is not available) (sergefp)
2005-05-10 14:44:03 +02:00
gbichot@quadita2.mysql.com
0fe9b5474a
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 14:04:02 +02:00
bar@noter.(none)
ab41ec313f
ctype-big5.c:
...
additional fix for bug@10493, for sjis
ctype-cp932.c:
additional fix for bug#10493, for cp932
2005-05-10 17:00:54 +05:00
kent@mysql.com
7c65e20e32
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/cw/mysql-4.1
2005-05-10 13:56:08 +02:00
kent@mysql.com
faf8f825b5
Makefile.am, configure.in:
...
Enable creation of embedded lib when --with-darwin-mwcc
2005-05-10 13:53:47 +02:00
jani@ibmlab.site
e7c02801a0
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ibmlab.site:/home/my/bk/mysql-5.0
2005-05-10 13:34:17 +03:00
joreland@mysql.com
0d2cb6c8e4
Merge
2005-05-10 12:34:16 +02:00
gbichot@quadita2.mysql.com
d6e1e5b417
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-05-10 11:31:46 +02:00