monty@mysql.com
aa84afb983
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-30 03:45:12 +03:00
serg@serg.mylan
328f2e434a
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-29 19:31:56 +02:00
monty@mysql.com
fbf31c4a8c
CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036 )
...
Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467 )
Fix compiler problems with MinGW (Bug #8872 )
2005-04-29 17:03:34 +03:00
serg@serg.mylan
e9b0411110
Merge
2005-04-29 15:44:24 +02:00
jimw@mysql.com
2441da8cd9
Add default configuration files to my_print_defaults usage, and
...
add handling of configuration file in the Windows shared system
directory. (Bug #5354 )
2005-04-28 12:11:48 -07:00
ingo@mysql.com
be34b54e1d
Merge mysql.com:/home/mydev/mysql-4.1-4100
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-04-28 19:34:05 +02:00
ingo@mysql.com
8ccbea47e8
Merge mysql.com:/home/mydev/mysql-4.1-bug5964
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-04-28 18:34:47 +02:00
ingo@mysql.com
1f0d0a6729
BUG#5964 - 4.1 MERGE tables regression from 4.0
...
Changed the creation of the .MRG file so that only the table name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.
2005-04-28 18:28:50 +02:00
svoj@mysql.com
c1fd1d6a5b
WL#2286 Compile MySQL w/YASSL support
...
yaSSL-0.9.7 library bundled.
2005-04-28 18:23:27 +05:00
msvensson@neptunus.(none)
bdb1441a65
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-04-27 21:40:11 +02:00
msvensson@neptunus.(none)
e6293c49c4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 13:30:00 +02:00
msvensson@neptunus.(none)
565e660bd4
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
2005-04-27 13:29:37 +02:00
msvensson@neptunus.(none)
203cdde955
Merge from 4.1 to 5.0
2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
f3c72cc891
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
joerg@mysql.com
74fdb2663c
Final fix for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 13:15:20 +02:00
joerg@mysql.com
1523119091
Post-merge fix of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
2005-04-26 12:16:12 +02:00
joerg@mysql.com
49ac2dac3e
Automerge / manual check of the fixes for NPTL configuration (bug#2173, bug#5871, and bug#9497).
...
Post-merge fix will follow.
2005-04-26 12:03:37 +02:00
joerg@mysql.com
eaa79cb452
Step 2 of the switch to support configuration with NPTL:
...
Define a new CPP symbol that the target OS is Linux, and use it where only the OS matters and not the threads Library.
Until now, 'HAVE_LINUXTHREADS' was used to indicate "Target is Linux" in many places.
When we support configuration with NPTL but no Linuxthreads, this misuse must cease.
2005-04-20 20:38:57 +02:00
msvensson@neptunus.(none)
3416e42903
BUG#9391 mysqlshow prints incorrect "rows" information
...
- Removed use of mysql->extra_info
- Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
mskold@mysql.com
e8f45332bd
Merge
2005-04-08 19:42:57 +02:00
msvensson@neptunus.(none)
7a0e28feb5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-07 20:19:25 +02:00
msvensson@neptunus.(none)
12b6252145
BUG#6762 ALTER TABLE gives weird results and error message
...
- Removed hardcoded error message from 4.1
2005-04-07 20:17:37 +02:00
jimw@mysql.com
43d926029f
Add cp932 and eucjpms character sets to Windows build. (Bug #9479 )
2005-04-07 09:51:56 -07:00
serg@serg.mylan
e1e5b97dea
manually merged
...
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
bar@mysql.com
0134a2b286
Adding a new parameter for well_formed_length to
...
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
serg@sergbook.mylan
2b8ff6949f
delete isam/merge files
2005-04-04 17:58:21 +02:00
serg@serg.mylan
52770e8682
XID SQL syntax
...
minor cleanups
XA tests
2005-04-04 00:50:05 +02:00
joerg@mysql.com
fb643aba56
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
...
Originally contained in 2005/03/03 19:51:29+01:00 serg@serg.mylan ;
contained in MySQL 4.1.10a;
re-committed for archival purposes.
2005-03-31 21:41:07 +02:00
ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05:00
serg@serg.mylan
1b4a815637
Fedora now defines read(2)/write(2) as macros.
...
Argh!
2005-03-29 23:31:56 +02:00
konstantin@mysql.com
eeeedd31b9
Manual merge
2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3
A fix for Bug#8226 "Cannot connect via shared memory":
...
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
2005-03-26 01:21:52 +03:00
serg@serg.mylan
e029e3eb61
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-22 16:11:43 +01:00
heikki@hundin.mysql.fi
2aa44dd98d
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-21 22:29:02 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
a34ee2c900
A fix for Netware.
2005-03-21 18:11:11 +02:00
konstantin@mysql.com
d5af61b1a0
Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t
2005-03-21 15:58:34 +03:00
serg@serg.mylan
54fc6fbfe8
set _XOPEN_SOURCE differently depending on __STDC_VERSION__
...
[sigh]
2005-03-18 14:59:07 +01:00
serg@serg.mylan
5e4944126d
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-17 17:00:31 +01:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
serg@serg.mylan
376a4ee03b
Field::quote_data():
...
don't call escape_string_for_mysql() unnecesary
don't overwrite local buffer
escape_string_for_mysql():
take a length of the destination buffer as an argument
2005-03-17 12:27:45 +01:00
monty@mysql.com
fde941e5b4
Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way
2005-03-16 01:15:45 +02:00
serg@serg.mylan
ed9c9732c9
sun forte does not define __sun__, only __sun and sun (gcc defines all the three)
2005-03-15 18:45:29 +01:00
serg@serg.mylan
caa29b4776
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-15 18:33:43 +01:00
serg@serg.mylan
10c06f257a
include/my_global.h
...
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
remove a cast
2005-03-15 18:31:56 +01:00
ramil@mysql.com
d5e3ba70f3
merging
2005-03-15 19:31:52 +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
jani@ua141d10.elisa.omakaista.fi
8db4423b8c
Fixed Bug#8922.
...
Reverted Jim's patch.
2005-03-08 18:12:12 +02:00
jimw@mysql.com
d22a4e70f9
Clean up merge
2005-03-07 13:26:27 -08:00
joerg@mysql.com
c45cfb7c07
Manual merge of the 4.0.24 compile changes into the 4.1 tree.
2005-03-07 10:27:20 +01:00