evgen@moonbone.local
ace038ef1f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
2006-07-13 18:03:43 +04:00
gkodinov/kgeorge@macbook.gmz
8f71e47a0d
Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B14553-5.0-opt
2006-07-10 16:44:05 +03:00
gkodinov/kgeorge@macbook.gmz
893e92761f
Merge rakia:mysql/4.1/B14553
...
into macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
2006-07-10 16:27:04 +03:00
gkodinov/kgeorge@mysql.com/rakia.(none)
2c9f5cc706
BUG#14553: NULL in WHERE resets LAST_INSERT_ID
...
To make MySQL compatible with some ODBC applications, you can find
the AUTO_INCREMENT value for the last inserted row with the following query:
SELECT * FROM tbl_name WHERE auto_col IS NULL.
This is done with a special code that replaces 'auto_col IS NULL' with
'auto_col = LAST_INSERT_ID'.
However this also resets the LAST_INSERT_ID to 0 as it uses it for a flag
so as to ensure that only the first SELECT ... WHERE auto_col IS NULL
after an INSERT has this special behaviour.
In order to avoid resetting the LAST_INSERT_ID a special flag is introduced
in the THD class. This flag is used to restrict the second and subsequent
SELECTs instead of LAST_INSERT_ID.
2006-07-10 16:27:03 +03:00
igor@olga.mysql.com
f6d6ac1e0f
Merge olga.mysql.com:/home/igor/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2006-07-06 13:40:08 -07:00
igor@olga.mysql.com
6e1c8ad830
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt
...
into olga.mysql.com:/home/igor/mysql-4.1-opt
2006-07-06 11:38:48 -07:00
igor@olga.mysql.com
0e3d2dafd6
Fixed bug #18243 .
...
The implementation of the method Item_func_reverse::val_str
for the REVERSE function modified the argument of the function.
This led to wrong results for expressions that contained
REVERSE(ref) if ref occurred somewhere else in the expressions.
2006-07-06 11:11:49 -07:00
knielsen@rt.int.sifira.dk
7062993817
Merge mysqldev@production:my/mysql-5.0-release
...
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.0
2006-07-04 12:08:58 +02:00
tomas@poseidon.ndb.mysql.com
1e4ccec835
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-release
2006-07-04 12:08:57 +02:00
tomas@poseidon.ndb.mysql.com
98874725e0
Bug #20784 Uninitialized memory in update on table with PK not on first column
...
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
2006-07-04 11:43:06 +02:00
sergefp@mysql.com
d581287b34
Better comments for void Item::top_level_item()
2006-07-04 13:28:30 +04:00
gkodinov@mysql.com
ae0a3e0dbb
Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
...
into mysql.com:/home/kgeorge/mysql/5.0/B16110
2006-07-04 12:20:45 +03:00
gkodinov@mysql.com
b64089e655
Bug #16110 : insert permitted into view col w/o default value
...
When compiling INSERT statements the check whether columns are provided values
depends on the flag whether a field is used in that query (Field::query_id).
However the check for updatability of VIEW columns (check_view_insertability())
was calling fix_fields() and thus setting the Field::query_id even for the
view fields that are not referenced in the current INSERT statement.
So the correct check for columns without default values
( check_that_all_fields_are_given_values() ) is assuming that all the VIEW
columns were mentioned in the INSERT field list and was issuing no
warnings or errors.
Fixed check_view_insertability() to turn off the flag whether or not to set
Field::query_id (THREAD::set_query_id) before calling fix fields and restore
it when it's done.
2006-07-04 12:10:12 +03:00
tnurnberg@mysql.com
b3e368df19
Bug#20783: Valgrind uninitialised warning in test case ctype_uca
...
Two functions have different ideas of what a string should look like;
one of them reads memory it assumes the other one may have written.
And "if you assume ..."
We now use a more defensive variety of the assuming function, this fixes
a warning thrown by the valgrind tool.
2006-07-03 21:41:15 +02:00
gluh@mysql.com
d2b378d57f
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
2006-07-03 13:19:18 +05:00
konstantin@mysql.com
1c4dffc8ca
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-07-01 22:13:42 +04:00
sergefp@mysql.com
f863685241
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 07:04:27 +04:00
sergefp@mysql.com
784b3118a5
Merge mysql.com:/home/psergey/mysql-4.1-bug16168-push
...
into mysql.com:/home/psergey/mysql-5.0-bug16168-merge
2006-07-01 01:25:59 +04:00
konstantin@mysql.com
fbeb42a9e1
Remove an unused variable.
2006-07-01 00:33:47 +04:00
konstantin@mysql.com
41fea3d763
Remove a couple of unused/barely used names.
2006-07-01 00:14:28 +04:00
joerg@mysql.com
34d5c36c2b
Manual transfer of the following changeset into the 5.0.23 release clone:
...
1.2525 06/06/30 18:29:27 monty@mysql.com +3 -0
Reverted wrong bug fix (Bug#11228)
2006-06-30 19:37:11 +02:00
monty@mysql.com
f62829636b
After merge fixes
2006-06-30 20:07:33 +03:00
monty@mysql.com
2f86009c9e
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 19:15:18 +03:00
monty@mysql.com
445dfdc3a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-06-30 19:15:17 +03:00
monty@mysql.com
2bec1b86bb
Reverted wrong bug fix (Bug#11228)
2006-06-30 18:29:27 +03:00
tomas@poseidon.ndb.mysql.com
e61bfafaa9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-30 16:26:33 +02:00
tomas@poseidon.ndb.mysql.com
9f542ef0f4
adopted ndb handler code for tables without primary key and with unique index
...
- added missing retrieval of hidden primary key
2006-06-30 16:25:07 +02:00
kroki@mysql.com
96bddcafe7
Bug#17226: Variable set in cursor on first iteration is assigned
...
second iterations value
During assignment to the BLOB variable in routine body the value
wasn't copied.
2006-06-30 18:14:22 +04:00
knielsen@mysql.com
a5f362cb94
Merge mysqldev@production:my/mysql-5.0-release
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-06-30 11:11:49 +02:00
knielsen@mysql.com
af48a16ce3
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/usr/local/mysql/mysql-5.0-release
2006-06-30 09:28:06 +02:00
knielsen@mysql.com
1d56a9720c
BUG#20769: Dangling pointer in ctype_recoding test case.
...
In some functions dealing with strings and character sets, the wrong
pointers were saved for restoration in THD::rollback_item_tree_changes().
This could potentially cause random corruption or crashes.
Fixed by passing the original Item ** locations, not local stack copies.
Also remove unnecessary use of default arguments.
2006-06-30 09:26:36 +02:00
sergefp@mysql.com
611e20d8e1
BUG#16168: Wrong results from range optimizer, "Use_count: Wrong count for key ..." warnings:
...
- Added comments.
- Make SEL_ARG::clone() set SEL_ARG::elements in the created copy.
2006-06-30 09:05:12 +04:00
monty@mysql.com
f25b4e0464
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2006-06-30 04:27:19 +03:00
monty@mysql.com
a267b8f33c
Don't read ~/.my.cnf in mysqldump.test
2006-06-30 04:10:27 +03:00
evgen@moonbone.local
3cc6d95d18
Merge
2006-06-30 02:03:09 +04:00
evgen@moonbone.local
9fd38baf13
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
...
into moonbone.local:/work/merge-5.0
2006-06-30 02:02:20 +04:00
tomas@poseidon.ndb.mysql.com
5f5c3f9ceb
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
...
into poseidon.ndb.mysql.com:/home/tomas/5.0-merge
2006-06-30 00:02:17 +02:00
evgen@moonbone.local
83bc48f38e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/merge-4.1
2006-06-30 01:12:16 +04:00
tomas@poseidon.ndb.mysql.com
747c17ffa3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-29 23:12:15 +02:00
tomas@poseidon.ndb.mysql.com
97a19c1b9b
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 22:54:49 +02:00
kroki@mysql.com
21e1655f4d
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
...
into mysql.com:/home/tomash/src/mysql_ab/mysql-5.0-bug20230
2006-06-30 00:24:47 +04:00
kroki@mysql.com
1bcf6b1d09
Bug#20230: routine_definition is not null
...
SHOW CREATE PROCEDURE and SHOW CREATE FUNCTION are fixed as well as
INFORMATION_SCHEMA.ROUTINES.ROUTINE_NAME.
2006-06-30 00:21:55 +04:00
tomas@poseidon.ndb.mysql.com
5d67b05203
corrected merge error
2006-06-29 22:11:29 +02:00
tomas@poseidon.ndb.mysql.com
65cec4da00
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 21:07:07 +02:00
tomas@poseidon.ndb.mysql.com
6f318d1658
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-29 21:05:43 +02:00
tomas@poseidon.ndb.mysql.com
87460ec76a
Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
2006-06-29 20:55:21 +02:00
konstantin@mysql.com
7ca3749f59
Merge mysql.com:/opt/local/work/tmp_merge
...
into mysql.com:/opt/local/work/mysql-5.0-merge
2006-06-29 18:34:49 +04:00
konstantin@mysql.com
3010430ddf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 18:17:37 +04:00
gluh@eagle.intranet.mysql.r18.ru
a230166f28
Fix for bug#13934 Silent truncation of table comments
...
Table comment: issue a warning(error in traditional mode) if length of comment > 60 symbols
Column comment: issue a warning(error in traditional mode) if length of comment > 255 symbols
Table 'comment' is changed from char* to LEX_STRING
2006-06-29 18:39:34 +05:00
lars@mysql.com
f24851ee71
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into mysql.com:/users/lthalmann/bkroot/mysql-5.0-release
2006-06-29 15:15:21 +02:00