hf@deer.(none)
45b90d45e3
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.8915
2005-03-05 00:29:04 +04:00
hf@deer.(none)
d3ee99ad91
Fix for bug #8431 (FLOOR returns incorrect result)
2005-03-04 23:06:00 +04:00
hf@deer.(none)
af329d532f
Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0
...
into deer.(none):/home/hf/work/mysql-5.0.8915
2005-03-04 22:01:21 +04:00
dlenev@brandersnatch.localdomain
c24820834a
Fix for memory leak which was introduced by patch improving locking in SP.
...
Made mysql_make_view() to call destructor for st_lex_local objects before
throwing them away (this happens in case of error).
2005-03-04 20:54:24 +03:00
hf@deer.(none)
7e7d98a291
Fix for bug #8430 (CEILING returns incorrect result)
2005-03-04 20:35:55 +04:00
heikki@hundin.mysql.fi
d565920ba2
ut0mem.c:
...
If InnoDB cannot allocate memory, keep retrying for 60 seconds before we crash mysqld; maybe the memory shortage is just temporary
2005-03-04 18:17:29 +02:00
heikki@hundin.mysql.fi
474a910499
trx0trx.c:
...
Do not assert, but print diagnostics if MySQL tries to free a trx where n_mysql_tables_in_use > 0
2005-03-04 17:58:06 +02:00
dlenev@mysql.com
5b16dbf960
Manual merge SP-locking improvements patch with current tree.
2005-03-04 17:46:45 +03:00
marko@hundin.mysql.fi
a8aced1e64
ha_innodb.cc:
...
write_row(): Detect SQLCOM_OPTIMIZE, so that also OPTIMIZE TABLE
will commit at every 10,000 copied rows.
2005-03-04 15:53:05 +02:00
dlenev@brandersnatch.localdomain
5a6c7027f0
Better approach for prelocking of tables for stored routines execution
...
and some SP-related cleanups.
- We don't have separate stage for calculation of list of tables
to be prelocked and doing implicit LOCK/UNLOCK any more.
Instead we calculate this list at open_tables() and do implicit
LOCK in lock_tables() (and UNLOCK in close_thread_tables()).
Also now we support cases when same table (with same alias) is
used several times in the same query in SP.
- Cleaned up execution of SP. Moved all common code which handles
LEX and does preparations before statement execution or complex
expression evaluation to auxilary sp_lex_keeper class. Now
all statements in SP (and corresponding instructions) that
evaluate expression which can contain subquery have their
own LEX.
2005-03-04 16:35:28 +03:00
marko@hundin.mysql.fi
92d8692495
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-03-04 15:27:07 +02:00
svoj@mysql.com
efa1092c2e
Fix for BUG#8351 (5.0) - Double quote in Boolean Fulltext query causes crash
2005-03-04 16:10:41 +04:00
joerg@mysql.com
4e136e8d1a
Please the Sun C compiler by qualifying 'inline' as 'static inline'.
2005-03-04 12:31:30 +01:00
ingo@mysql.com
9e02be68c8
Merge
2005-03-04 11:38:14 +01:00
ingo@mysql.com
212388bd3c
Merge with after merge fix
2005-03-04 11:37:45 +01:00
joerg@mysql.com
6ccbe89d52
Qualify 'inline' functions as 'static inline' to please the Sun C compiler.
2005-03-04 11:26:08 +01:00
bar@mysql.com
7e8e033290
type_blob.result, func_system.result, func_str.result, ctype_collate.result:
...
fixing test results accordingly.
func_system.test:
New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
safe_charset_converter() was added for system constants.
item_strfunc.cc:
safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
Bug#8291: Illegal collation mix with USER() function.
After discussion with PeterG and Serge, a new coercibility
level for "system constants" was introduced, between
COERRIBLE and IMPLICIT. Thus:
SELECT col1 = USER() FROM t1; - is done according to col1 collation.
SELECT 'string' = USER(); - is done according to USER() collation.
At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
Version is a system constant too.
2005-03-04 14:20:49 +04:00
joerg@mysql.com
136c1ea181
Changed C++ style comment to C style for 'sql/net_serv.cc' which will be symlinked
...
to 'libmysql/net.c'.
2005-03-04 11:07:56 +01:00
ingo@mysql.com
0f3b5b7ccb
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 11:06:41 +01:00
konstantin@mysql.com
6047aeb47d
Fix compilation failure in mi_create.c
2005-03-04 12:39:03 +03:00
joerg@mysql.com
631aac9d00
Prevent a collision with the system's '#define errno ...' by guarding the variable declaration.
2005-03-04 10:22:50 +01:00
ingo@mysql.com
b5775ee16c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-03-04 09:35:21 +01:00
ingo@mysql.com
d68db573e6
Fix for a build bug.
...
Added a missing comma.
2005-03-04 09:30:22 +01:00
jimw@mysql.com
2c6e46f47e
Clean up merge of fix for Bug #3309 .
2005-03-03 17:44:28 -08:00
serg@serg.mylan
f2c414e024
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-04 00:05:52 +01:00
jimw@mysql.com
f7c01cfb76
Merged from 4.1
2005-03-03 15:01:46 -08:00
serg@serg.mylan
3de51f273b
after merge fixes
2005-03-03 23:57:48 +01:00
serg@serg.mylan
08d5ef6507
typos fixed
2005-03-03 23:10:23 +01:00
serg@serg.mylan
e47d0a0e2d
merge
2005-03-03 23:07:20 +01:00
jimw@mysql.com
96e034f50e
Fix symlink test to avoid filenames with paths
2005-03-03 12:36:27 -08:00
serg@serg.mylan
45641ff65c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-03-03 21:13:57 +01:00
serg@serg.mylan
f84bd700b3
uninit variable fixed
2005-03-03 21:13:33 +01:00
serg@serg.mylan
8d9a53a78c
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
2005-03-03 19:51:29 +01:00
jimw@mysql.com
9df04058fe
Merge mysql.com:/home/jimw/my/mysql-4.1-8707
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:50:18 -08:00
jimw@mysql.com
fe065fe78c
Merge mysql.com:/home/jimw/my/mysql-4.1-8136
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:49 -08:00
jimw@mysql.com
0e8a5dbe08
Merge mysql.com:/home/jimw/my/mysql-4.1-3309
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-03 10:47:20 -08:00
jimw@mysql.com
18f13a24a2
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-03 09:59:38 -08:00
gluh@gluh.mysql.r18.ru
e41c59e9ea
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-03 19:51:03 +03:00
jimw@mysql.com
6a082b36ed
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-03 08:34:27 -08:00
gluh@gluh.mysql.r18.ru
7367af4757
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-03 19:21:26 +03:00
gluh@gluh.mysql.r18.ru
104072f154
Fix for bug #8164 : subquery with INFORMATION_SCHEMA.COLUMNS, 100 % CPU
2005-03-03 19:20:16 +03:00
heikki@hundin.mysql.fi
07a0fdeb24
srv0start.c:
...
Work around the AIX 5.1 security patch ML7 problem in errno when it should be EEXIST
2005-03-03 18:00:34 +02:00
heikki@hundin.mysql.fi
c93fcd19a5
Merge
2005-03-03 17:50:04 +02:00
heikki@hundin.mysql.fi
df6d26e4bd
srv0start.c:
...
Work around the AIX 5.1 ML7 patch problem in errno at a higher level, in srv0start.c
os0file.c:
Revert the AIX patch here
2005-03-03 17:46:56 +02:00
heikki@hundin.mysql.fi
80fca0a075
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-03-03 17:26:12 +02:00
heikki@hundin.mysql.fi
47440f4b5a
os0file.c:
...
AIX 5.1 after security patch ML7 seems to contain a bug that instead of EEXIST it sets errno to 0 if a file creation fails because the file already exists. Work around that bug by interpreting errno 0 in AIX as EEXIST.
2005-03-03 17:20:05 +02:00
joerg@mysql.com
5c5ac0e3b1
Ensure that '*.disabled' files are truly optional, so that their non-existence
...
will not cause "make" to fail.
2005-03-03 16:01:39 +01:00
konstantin@mysql.com
fe2d63a060
Fixes for bug#8115 "Server Crash with prepared statement"
...
and bug#8849 "problem with insert statement with table alias's":
make equality propagation work in stored procedures and prepared
statements.
Equality propagation can change AND/OR structure of ON expressions,
so the fix is to provide each execution of PS/SP with it's own
copy of AND/OR tree. We have been doing that already for WHERE clauses,
now ON clauses are also copied.
2005-03-03 17:38:59 +03:00
gluh@gluh.mysql.r18.ru
66bd0447e4
Fix for bug#8740: Server crash at start on Solaris 9 (64 bit)
2005-03-03 17:38:58 +03:00
pekka@mysql.com
59ffe5bdf8
ndb - bug#8876 third and final solution
2005-03-03 12:45:49 +01:00