jimw@mysql.com
cb0d8aba46
Merge mysql.com:/home/jimw/my/mysql-4.1-8731b
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c
Merge mysql.com:/home/jimw/my/mysql-4.1-13344
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55
Merge mysql.com:/home/jimw/my/mysql-4.1-13619
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-12 13:26:49 -07:00
evgen@moonbone.local
902b06ecb1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/13535-bug-4.1-mysql
2005-10-13 00:16:33 +04:00
guilhem@mysql.com
ab05c75ea7
merge
2005-10-12 13:31:48 +02:00
guilhem@mysql.com
4c1c9db823
Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc;
...
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
2005-10-12 13:29:55 +02:00
grog@mysql.com
c248a36e30
sql_yacc.yy:
...
Bug #10308 : Parse 'purge master logs' with subselect correctly.
subselect.test:
Bug #10308 : Test for 'purge master logs' with subselect.
subselect.result:
Bug #10308 : Test result for 'purge master logs' with subselect.
2005-10-12 09:47:59 +02:00
evgen@moonbone.local
c16410d3a1
Manual merge, fix for bug #7672
2005-10-12 03:32:14 +04:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
jimw@mysql.com
083c032ec3
Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334 )
2005-10-10 19:39:16 -07:00
hf@deer.(none)
83c103ed81
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.13372
2005-10-10 21:09:34 +05:00
lars@mysql.com
998380521f
BUG#12618: Removing fake locking
2005-10-10 15:10:14 +02:00
evgen@moonbone.local
1b15a2d482
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into moonbone.local:/work/7672-bug-4.0-mysql
2005-10-09 23:12:12 +04:00
evgen@moonbone.local
6bfc2d4b89
Fix bug#7672 Unknown column error in order clause
...
When fixing Item_func_plus in ORDER BY clause field c is searched in all
opened tables, but because c is an alias it wasn't found there.
This patch adds a flag to select_lex which allows Item_field::fix_fields()
to look up in select's item_list to find aliased fields.
2005-10-09 23:05:44 +04:00
serg@serg.mylan
da625424e0
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-10-08 16:59:08 +02:00
serg@serg.mylan
ae293f9ac5
Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
...
don't allow STOP SLAVE if global read lock is in taken
2005-10-08 14:46:04 +02:00
ramil@mysql.com
fcc51afb6a
Populate t1 in order to get more predictable explain results.
2005-10-07 20:14:34 +05:00
bar@mysql.com
62ad8922b8
ctype_utf8.result, ctype_utf8.test:
...
Adding test case.
item_func.cc:
Bug#13751 find_in_set: Illegal mix of collations.
Character set conversion was forgotten in find_in_set.
2005-10-07 09:52:15 +05:00
monty@mysql.com
3f73d25fba
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-10-07 04:02:53 +03:00
monty@mysql.com
82855517a1
Review of new code since last pull
...
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
2005-10-07 03:12:15 +03:00
jimw@mysql.com
77fbc72f47
Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619 )
2005-10-06 16:15:53 -07:00
gluh@eagle.intranet.mysql.r18.ru
fbc621e545
Fix for bug#13605 'rpl_openssl' test hangs
2005-10-06 19:51:08 +05:00
bar@mysql.com
5931927708
Bug#12476 Some big5 codes are still missing.
...
ctype-big5.c:
Adding extra cp950 characters into Unicode mapping.
ctype_big5.result, ctype_big5.test:
Adding test case
2005-10-05 19:20:49 +05:00
bar@mysql.com
a98e6dfe44
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-10-05 11:28:08 +05:00
evgen@moonbone.local
5a10244d8b
Fix bug#13535 Incorrect result from SELECT statement after SHOW TABLE STATUS
...
After SHOW TABLE STATUS last_insert_id wasn't cleaned, and next select
erroneously rewrites WHERE condition and returs a row;
5.0 isn't affected because of different SHOW TABLE STATUS handling.
last_insert_id cleanup added to mysqld_extend_show_tables().
2005-10-03 23:22:46 +04:00
sergefp@mysql.com
e9f2f9437a
BUG#12915: Added single-table UPDATE/DELTE ... ORDER BY ... LIMIT
...
optimization: now can use index to find records to update/delete
when there is no WHERE clause.
2005-09-30 15:21:37 +04:00
jonas@perch.ndb.mysql.com
6169d529e5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
f334a14952
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
a30faa3b34
ndb -
...
add support for reading config.ini from ndb_config
(as alternative to contacting ndb_mgmd)
2005-09-30 11:39:49 +02:00
ingo@mysql.com
5c93e799d8
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-29 13:44:17 +02:00
ingo@mysql.com
1af69fca94
Bug#9112 - Merge table with composite index producing invalid results with some queries
...
Second platform fix for floating point rounding.
2005-09-29 13:37:30 +02:00
gluh@eagle.intranet.mysql.r18.ru
f9762c47d0
Fix for bug #7977 in sql_mode=ANSI, show create table ignores auto_increment
...
"CHARACTER SET", "COLLATE", and "DEFAULT" are always
printed(excepting MODE_MYSQL323 and MODE_MYSQL40)
"AUTO_INCREMENT", "ON UPDATE CURRENT_TIMESTAMP" are printed only
if NO_FIELD_OPTIONS is not set.
2005-09-29 16:17:45 +05:00
bar@mysql.com
7fe434098e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-09-29 16:07:33 +05:00
ingo@mysql.com
a9a38f815e
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-28 20:09:13 +02:00
msvensson@neptunus.(none)
324f4be3d4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-28 13:45:42 +02:00
jan@hundin.mysql.fi
dc80450410
Fixed a bug checksum table locks the InnoDB table and does not use a
...
consistent read (Bug #12669 ).
2005-09-28 14:14:49 +03:00
bar@mysql.com
6e88f14eea
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b13046
2005-09-28 11:51:03 +05:00
evgen@moonbone.local
4f4711bd49
Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.
...
resolve_const_item() assumed to be not called for Item_row items. For
ensuring that DBUG_ASSERT(0) was set there.
This patch adds section for Item_row items. If it can it recursively calls
resolve_const_item() for each item the Item_row contains. If any of the
contained items is null then whole Item_row substitued by Item_null. Otherwise
it just returns.
2005-09-28 00:58:12 +04:00
msvensson@neptunus.(none)
1105d4293d
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/fix_mysqltest/my41-fix_mysqltest
2005-09-27 16:48:41 +02:00
ingo@mysql.com
a3618b128b
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-27 15:42:14 +02:00
ingo@mysql.com
d005299a57
Bug#9112 - Merge table with composite index producing invalid results with some queries
...
Reduced the precision of the test numbers.
Not all platforms could reproduce the exact numbers.
2005-09-27 15:26:16 +02:00
hf@deer.(none)
f0dfa19548
additional fix for bug #13372 (decimal union)
2005-09-27 16:23:37 +05:00
hf@deer.(none)
9b88d25247
additional fix to the bug #13372 (decimal union)
2005-09-27 15:31:38 +05:00
hf@deer.(none)
7f3e2dc48d
Fix for bug #13372 (decimal union)
2005-09-27 15:11:39 +05:00
ingo@mysql.com
6c70281789
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-26 09:56:18 +02:00
monty@mysql.com
ea6d5f9ec3
Fixed error found during review of new pushed code
2005-09-25 21:22:23 +03:00
sergefp@mysql.com
d0a97917a2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug13419
2005-09-24 01:55:09 +04:00
sergefp@mysql.com
d90b988da7
BUG#12232: Addressing docs team feedback: s/inequal/unequal/
2005-09-24 01:39:50 +04:00
sergefp@mysql.com
40ba88ca07
Fix for BUG#13419: In "ref" optimizer, take into account that item=Item_func_in(x,y) is
...
not equivalent to "x=y" when item->negated == TRUE.
2005-09-23 13:43:20 +04:00
ingo@mysql.com
bf89c139a4
Merge mysql.com:/home/mydev/mysql-4.0-4000
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-09-23 10:49:08 +02:00