Commit graph

18972 commits

Author SHA1 Message Date
monty@mysql.com
9ad75d8c75 After merge fixes 2005-01-18 05:07:22 +02:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
monty@mysql.com
edffca827e Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2005-01-18 03:52:15 +02:00
monty@mysql.com
e5b788146a Fixed new bug that caused symlink test to fail 2005-01-18 03:49:39 +02:00
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being
set to a negative value. (Bug #7700)
2005-01-17 16:13:56 -08:00
monty@mysql.com
5ba79d72a7 Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00
bell@sanja.is.com.ua
fd3d976f64 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
2005-01-18 01:11:02 +02:00
guilhem@mysql.com
5e43cf86a6 Fix for BUG#7965 "Slave_IO_State Stuck at 'Checking Master Version'":
Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)
2005-01-17 21:26:14 +01:00
jimw@mysql.com
dbe43d34a6 Print a warning when an old table (with no character set stored) is opened
and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)
2005-01-17 12:22:23 -08:00
reggie@bob.(none)
da9f7c7ec4 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql-4.1
2005-01-17 14:08:36 -06:00
reggie@bob.(none)
e1dc421a04 Bug #7966 query cache doesn't work properly with batch statements
sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query
2005-01-17 13:40:36 -06:00
lenz@mysql.com
b9f3f4a221 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-17 20:33:33 +01:00
paul@kite-hub.kitebird.com
63689a210d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-17 12:38:17 -06:00
lenz@mysql.com
c84180d2c2 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-17 19:09:33 +01:00
lenz@mysql.com
b1cb5ea4dc Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build
2005-01-17 18:53:10 +01:00
bell@sanja.is.com.ua
dcfdf011c6 backported from 5.0 patch initialization of main select for commands where subqueries are possible 2005-01-17 19:52:07 +02:00
joerg@mysql.com
88b1fbaf2f Allow "classic" builds (= without InnoDB) by eliminating an "unresolved reference" (bug#7961). 2005-01-17 18:08:07 +01:00
paul@kite-hub.kitebird.com
43f98d24ee Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
2005-01-17 10:47:43 -06:00
lenz@mysql.com
09a71351e0 - Enabled the handling of architecture extensions e.g. "-64bit" when building
Mac OS X PKGs with Do-pkg
2005-01-17 17:22:17 +01:00
kaa@polly.local
c46f527454 Fixed memory leak in handle_local_infile() 2005-01-17 19:21:01 +03:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
timour@mysql.com
50e0474394 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 15:46:44 +02:00
tomas@poseidon.ndb.mysql.com
9dbe52bdcf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-17 12:53:50 +01:00
tomas@poseidon.ndb.mysql.com
beffd06278 Bug#7937 2005-01-17 12:29:43 +01:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
2005-01-17 12:41:59 +02:00
bar@deer.(none)
2933cd3d35 user_var.result:
after merge fix
2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b func_str.result:
after merge fix
2005-01-17 13:23:56 +04:00
bar@mysql.com
3d4714424c Merge 2005-01-17 12:30:12 +04:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc:
bug#7839 ncorrect collation for char(ascii('a'))
2005-01-17 10:38:35 +04:00
paul@kite-hub.kitebird.com
3b9c5f3a17 mysqldump.c:
Move out-of-order option.
2005-01-17 00:09:47 -06:00
bar@mysql.com
d91cd61a4b Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-17 09:30:30 +04:00
bar@mysql.com
308aec1526 libmysql.c:
bug#7891: mysql_character_set_name() returns collation
2005-01-17 09:27:24 +04:00
tomas@poseidon.ndb.mysql.com
c6e5521bbf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-17 01:42:41 +01:00
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
2005-01-17 00:18:19 +03:00
tomas@poseidon.ndb.mysql.com
b16d58b167 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-16 21:50:31 +01:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
guilhem@mysql.com
6412558d03 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 21:39:20 +01:00
tomas@poseidon.ndb.mysql.com
b34715555f Makefile.am:
Bug#7721
2005-01-16 21:39:19 +01:00
tomas@poseidon.ndb.mysql.com
c0b21df9ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-16 20:13:47 +01:00
serg@serg.mylan
fa38a0d130 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-16 16:41:38 +01:00
serg@serg.mylan
8bea4729fc initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00
guilhem@mysql.com
1cb5d98d85 When we warn that --log-bin alone is dangerous, we give a suggestion. 2005-01-16 15:46:28 +01:00
guilhem@mysql.com
6cc7f39da0 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-16 15:14:06 +01:00
guilhem@mysql.com
c30e600081 Merge 2005-01-16 15:10:42 +01:00
reggie@bob.(none)
68c540f090 Bug #7922 prompt \p fails on Windows for shared-memory connections
Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory
2005-01-15 23:19:34 -06:00
serg@serg.mylan
ef58da5435 don't ignore errors in readlink 2005-01-15 20:08:53 +01:00
jimw@mysql.com
65b800736f Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-15 10:14:34 -08:00
jimw@mysql.com
96f0219de8 Update results after merge 2005-01-15 10:14:12 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49 Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly"
to 5.0 tree (since it was lost during last merge).
2005-01-15 20:02:46 +03:00
monty@mysql.com
8d616390e9 After merge fixes
Fix for BIT(X) field as string
2005-01-15 17:38:43 +02:00