petr@mysql.com
4fb6f4dddf
Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory
...
and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.
2005-08-18 11:23:54 +02:00
bell@sanja.is.com.ua
fc070c2bcb
stop on NULL comparison only if it is allowed (BUG#12509)
2005-08-18 12:07:14 +03:00
timour@mysql.com
76cacf4522
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-18 11:29:29 +03:00
timour@mysql.com
f31f5eabc7
WL#2486 - natural and using join
...
Fixed debug printout.
2005-08-18 11:28:50 +03:00
timour@mysql.com
8d975efc72
WL#2486 - natural and using join according to SQL:2003
...
- Fixed minor error after Monty's review.
2005-08-18 11:24:59 +03:00
igor@rurik.mysql.com
fd5461ac12
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-08-17 22:24:20 -07:00
igor@rurik.mysql.com
5ac7d86793
view.test:
...
Added a test case for bug #10970 .
view.result:
Added a test case for bug #10970 .
Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
Fixed bug #10970 .
In the function mysql_create_view if a view does not refer
any tables directly the variable table must be updated
after the call of open_and_lock_tables.
errmsg.txt:
Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
(when fixing bug #10970 ).
2005-08-17 22:19:12 -07:00
jimw@mysql.com
1eb0f45d17
Fix minor typo in handling of error conditions and return of SLEEP().
2005-08-17 19:57:07 -07:00
jimw@mysql.com
15f97778ff
Revert patch for Bug #12595 , it causes the sql_mode test to fail.
2005-08-17 19:56:14 -07:00
jimw@mysql.com
e7656ffecc
Merge mysql.com:/home/jimw/my/mysql-5.0-12582
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-17 18:45:36 -07:00
jimw@mysql.com
19ed563cd5
Fix bad merge of sql/item_strfunc.cc by aivanov
2005-08-17 18:42:07 -07:00
monty@mysql.com
c726451abb
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-18 03:41:11 +03:00
monty@mysql.com
3eaa953529
Cleanups and optimization during review of new code
2005-08-18 03:12:42 +03:00
evgen@moonbone.local
6d8bd17c3a
Fix bug #11718 query with function, join and order by returns wrong type.
...
create_tmp_field_from_item() was creating tmp field without regard to
original field type of Item. This results in wrong type being reported to
client.
To create_tmp_field_from_item() added special handling for Items with
DATE/TIME field types to preserve their type.
2005-08-17 23:53:12 +04:00
sasha@asksasha.com
76a59be6fb
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-17 12:39:30 -06:00
andrey@lmy004.
4ff51a5743
fix for bug #12591 (SHOW TABLES FROM dbname produces wrong error message)
2005-08-17 17:51:10 +02:00
aivanov@mysql.com
c3de1aa84a
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-1
2005-08-17 18:46:20 +04:00
aivanov@mysql.com
8a80193e0a
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/mysql-5.0
2005-08-17 18:41:19 +04:00
timour@mysql.com
a55786ca70
WL#2486 - natural and using join according to SQL:2003
...
- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak
2005-08-17 17:19:31 +03:00
timour@mysql.com
0671228b05
Fixed code formatting.
2005-08-17 14:20:01 +03:00
timour@mysql.com
066e3c4209
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-2486
2005-08-17 13:47:16 +03:00
timour@mysql.com
c8e55a35b3
WL#2486 - Process NATURAL and USING joins according to SQL:2003
...
- Applied Monty's patch after his review of sql_base.cc
2005-08-17 13:46:36 +03:00
elliot@mysql.com
1664e31f12
Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
...
into mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338
2005-08-17 04:32:29 -04:00
elliot@mysql.com
197782605f
BUG#11338 (logging of prepared statement w/ blob type)
...
In cp932, '\' character can be the second byte in a
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.
2005-08-17 04:26:32 -04:00
osku@127.(none)
3809fdac6d
Merge osalerma@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into 127.(none):/home/osku/mysql-5.0
2005-08-17 11:11:50 +03:00
osku@127.(none)
fb48039444
Fix bug #11946 , truncate not always resetting the auto-increment counter
...
in InnoDB tables.
2005-08-17 11:00:20 +03:00
jimw@mysql.com
054e78943e
Fix SLEEP() to be interruptable. (Bug #12582 )
2005-08-16 16:31:16 -07:00
aivanov@mysql.com
df00bbc862
Merge mysql.com:/home/alexi/mysql-5.0
...
into mysql.com:/home/alexi/dev/mysql-5.0-1
2005-08-16 23:33:06 +04:00
aivanov@mysql.com
0a1fa93190
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/mysql-5.0
2005-08-16 23:27:00 +04:00
aivanov@mysql.com
ed6cd805dc
information_schema.test:
...
Added a comment line for a test case used for bug #12301 .
information_schema.result:
Fixed some test cases results (bug #12301 ).
sql_show.cc:
Fixed bug #12301 .
The bug was due to a missing value setting for the NUMERIC_SCALE column
in the get_schema_column_record() function (sql_show.cc).
2005-08-16 23:11:04 +04:00
andrey@lmy004.
41c93e368b
Merge lmy004.:/work/mysql-5.0-clean
...
into lmy004.:/work/mysql-5.0-bug12595
2005-08-16 20:59:18 +02:00
andrey@lmy004.
7269045b82
after review fix for bug #12595
2005-08-16 20:54:53 +02:00
evgen@moonbone.local
eb6135a765
Fix bug #11398 Bug in field_conv() results in wrong result of join with index
...
When copying varchar fields with field_conv() it's not taken into account
that length_bytes of source and destination fields may be different.
This results in saving wrong data in field and making wrong key later.
Added check so if fields are varchar and have different length_bytes they
are not copied by memcpy().
2005-08-16 22:13:43 +04:00
andrey@lmy004.
a7a762e27d
fix for bug #12595 (Escape character has to be exactly one)
2005-08-16 15:39:40 +02:00
jani@ua141d10.elisa.omakaista.fi
c7bdc5bb12
Fixed indentations in error and warning messages.
2005-08-16 15:32:41 +03:00
aivanov@mysql.com
246c0e687c
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/mysql-5.0
2005-08-16 15:35:39 +04:00
andrey@lmy004.wdf.sap.corp
c896ca1a10
fix for bug #12183 "SHOW OPEN TABLES behavior doesn't match grammar"
...
(after review commit)
2005-08-16 11:18:35 +02:00
igor@rurik.mysql.com
9693dc6a6b
sql_select.cc:
...
Fixed bug #11479 .
The JOIN::reinit method cannot call setup_tables
after the optimization phase since this function
removes some optimization settings for joined
tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
Added a test case for bug #11479 .
2005-08-15 21:33:58 -07:00
jimw@mysql.com
68d5420d7c
Clean up merge from 4.1
2005-08-15 14:19:56 -07:00
aivanov@mysql.com
405f03f389
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/mysql-5.0
2005-08-16 00:03:50 +04:00
jimw@mysql.com
2d34276417
Merge mysql.com:/home/jimw/my/mysql-5.0-12318
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:39:36 -07:00
jimw@mysql.com
55eebfb776
Merge mysql.com:/home/jimw/my/mysql-5.0-10627
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:38:56 -07:00
jimw@mysql.com
a3eaf4eec2
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00
evgen@moonbone.local
69319f17e7
Fix bug #10624 Views with multiple UNION and UNION ALL produce incorrect
...
results.
st_select_lex_unit::print() was losing UNION ALL if in statement were present
UNION DISTINCT.
2005-08-15 23:05:05 +04:00
monty@mysql.com
8589f14d45
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-08-15 20:12:28 +03:00
monty@mysql.com
c10f05552f
Don't clear warnings for functions or triggers
...
Fixed failing test
2005-08-15 20:08:58 +03:00
jimw@mysql.com
df25928983
Merge mysql.com:/home/jimw/my/mysql-4.1-11796
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:59:11 -07:00
jimw@mysql.com
e21a025c65
Merge mysql.com:/home/jimw/my/mysql-4.1-12327
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-15 09:58:05 -07:00
acurtis@xiphis.org
c414bb1520
Bug#12518
...
"COLUMN_DEFAULT has wrong value if NOT NULL is set"
Show NULL instead of empty string when no default value is set
2005-08-15 17:14:55 +01:00
lars@mysql.com
b6a65715d6
BUG#12542: Prevous patch was incorrect. This removed the patch.
2005-08-15 17:53:38 +02:00