pem@mysql.com
d37570daf4
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
2006-02-01 12:31:48 +01:00
msvensson@neptunus.(none)
102aa5a79f
Use common function 'append_field' to output the value of one field to the result.
...
Fix for extra zero in exponent of double values on windows.
2006-02-01 11:36:32 +01:00
igor@rurik.mysql.com
d6370b48a7
FIxed bug #14927 .
...
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
2006-01-31 21:48:32 -08:00
aivanov@mysql.com
bba8155516
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/alexi/innodb/mysql-5.0-ss162
2006-01-31 21:49:20 +03:00
aivanov@mysql.com
9296fb241d
Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.
...
Applied innodb-5.0-ss149/162 snapshots.
2006-01-31 21:41:48 +03:00
pem@mysql.com
b3ebd755cc
Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is
...
no order by clause
which was fixed by earlier changesets.
The error message is now the more generic "Unknown table ... in field list".
2006-01-31 17:00:50 +01:00
pem@mysql.com
af11dc3cbe
Added test case for BUG#14270: Stored procedures: crash if load index
...
which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.
2006-01-31 16:27:57 +01:00
knielsen@mysql.com
a6b86d8962
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-01-31 16:24:25 +01:00
aelkin@mysql.com
8c9a6cd7c9
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-01-31 16:11:33 +02:00
dlenev@mysql.com
7715538018
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg16829
2006-01-31 15:51:55 +03:00
dlenev@mysql.com
a25ca5fa63
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg16829
2006-01-31 14:43:41 +03:00
pem@mysql.com
c9476999ef
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-31 09:49:54 +01:00
knielsen@mysql.com
a002d316ed
Fix missing --replace_result on $SLAVE_MYPORT in federated.
2006-01-31 09:15:28 +01:00
patg@govinda.patg.net
1ab24c0b55
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.0
2006-01-30 10:55:24 -08:00
aelkin@mysql.com
f40434a772
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
2006-01-30 20:37:04 +02:00
pem@mysql.com
1043e1ba84
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15737/mysql-5.0
2006-01-30 15:06:33 +01:00
aelkin@mysql.com
53dd7f61f7
BUG#13227 test case to examine that local slave's triggers that use select work ok even if they fire
...
for replicated update.
2006-01-30 14:33:15 +02:00
aivanov@mysql.com
efe8b884e5
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb/mysql-4.1-merged
2006-01-30 15:31:35 +03:00
aivanov@mysql.com
fe518520be
Fixed BUG#16387.
...
Applied innodb-4.1-ss17 snapshot.
Do not mistake TABLENAME_ibfk_0 for auto-generated id.
2006-01-30 15:17:33 +03:00
msvensson@neptunus.(none)
ae9b056d9b
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-30 10:45:45 +01:00
paul@snake-hub.snake.net
b4f8b1b376
information_schema_db.result, information_schema.result:
...
Fix test result.
table.h, sql_show.cc:
Put I_S tables in lexical order.
2006-01-28 19:44:51 -06:00
dlenev@mysql.com
737084b229
Fix for bug #16829 "Firing trigger with RETURN crashes the server"
...
We should disallow usage of RETURN statement in triggers and emit
error at parsing time (instead of crashing when trigger is fired).
2006-01-28 12:50:16 +03:00
igor@rurik.mysql.com
eb8507208e
Fixed bug #16260 .
...
The problem has manifested itself in the cases when we have a nested outer join
for which it can be inferred that one of the inner tables is a single row table.
2006-01-27 21:20:28 -08:00
patg@govinda.patg.net
15ec4431bc
BUG# 14768
...
Added fixes to make last_insert_id() to work.
2006-01-27 15:43:44 -08:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
2006-01-27 09:29:59 -05:00
msvensson@neptunus.(none)
54af4e6d0c
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-27 10:49:07 +01:00
bell@sanja.is.com.ua
8eee147e0f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 19:01:54 +02:00
msvensson@neptunus.(none)
9304785c10
Add new option "check-testcases" to mysql-test-run.pl
...
Cleanup the sideeffects from most of the testcases with sideeffects.
2006-01-26 17:54:34 +01:00
pem@mysql.com
ff4e2892b7
Fixed on BUG#16568: Continue handler with simple CASE not working correctly
...
After trying multiple inheritance (to messy and hard make it work) and
sublassing jump_if_not (worked, but ugly), decided to on this solution
instead:
Inserting an abstract sp_instr_opt_meta class as parent for all instructions
with destinations makes it possible to handle a continuation pointer for
sp_instr_set_case_expr too.
Note: No special test case; the fix is captured by the changed behaviour of
bug14643_2, and bug14498_4 (formerly disabled), in sp.test.
2006-01-26 17:26:25 +01:00
bell@sanja.is.com.ua
43e281d79c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-26 16:00:49 +02:00
pem@mysql.com
5b1fdbec53
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
...
Use a special lookup function for DROP, which doesn't attempt to parse the
definition.
2006-01-26 13:29:46 +01:00
msvensson@neptunus.(none)
169f1ecee6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-26 12:51:27 +01:00
aelkin@mysql.com
2fbdc5483a
BUG#15699 importing the fix from 5.0
2006-01-26 12:49:55 +02:00
sergefp@mysql.com
cfce3d823b
Merge
2006-01-26 00:06:20 +03:00
sergefp@mysql.com
5d0e8d81ee
BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan.
2006-01-25 23:25:23 +03:00
pem@mysql.com
998f0c0aa3
Fixed BUGS#15011: error handler for mysql errno in nested block not activated
...
For nested sql errno handlers (unlike sqlexception and other), we didn't stop
searching when the innermost handler was found - now make sure we do.
2006-01-25 17:19:54 +01:00
lars@mysql.com
865d8f8e89
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
...
into mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
2006-01-25 17:17:16 +01:00
lars@mysql.com
c88dbea689
BUG#16487: New test for ignored table and multi-update
2006-01-25 16:14:27 +01:00
pem@mysql.com
f60a763208
Fixed BUG#15737: Stored procedure optimizer bug with LEAVE
...
Second version.
The problem was that the optimizer didn't work correctly with forwards jumps
to "no-op" hpop and cpop instructions.
Don't generate "no-op" instructions (hpop 0 and cpop 0), it isn't actually
necessary.
2006-01-25 15:11:49 +01:00
evgen@moonbone.local
baed6da5bc
Manually merged
2006-01-24 22:10:39 +03:00
anozdrin@mysql.com
378147a23d
Fix for the following bugs:
...
- BUG#15166: Wrong update permissions required to execute triggers
- BUG#15196: Wrong select permission required to execute triggers
The idea of the fix is to check necessary privileges
in Item_trigger_field::fix_fields(), instead of having "special variables"
technique. To achieve this, we should pass to an Item_trigger_field instance
a flag, which will indicate the usage/access type of this trigger variable.
2006-01-24 20:15:12 +03:00
msvensson@neptunus.(none)
9f2a17816f
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 14:53:47 +01:00
aelkin@mysql.com
cf6becdebe
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-24 14:49:25 +02:00
gluh@eagle.intranet.mysql.r18.ru
b4f7c9bbd5
Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
...
Fill schema tables with data before filesort if it's necessary
2006-01-24 16:48:19 +04:00
gluh@eagle.intranet.mysql.r18.ru
fa776a6f67
Fix for bug#15851 Unlistable directories yield no info from information_schema
...
to skip directories which are not allowed for read
2006-01-24 15:59:08 +04:00
msvensson@neptunus.(none)
3d5f530caa
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
...
into neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
2006-01-24 08:43:34 +01:00
msvensson@neptunus.(none)
09ec2919a1
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
aelkin@mysql.com
4ba60488f6
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-23 22:32:05 +02:00
evgen@moonbone.local
b1967ad723
Fixed bug #16510 : Updating field named like '*name' caused server crash.
...
When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record()
function crashes by dereferencing null when there is left fields to update,
but no more values.
Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.
2006-01-23 21:51:32 +03:00
svoj@april.(none)
18681229a0
Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
...
into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
2006-01-23 20:07:26 +04:00
aelkin@mysql.com
0fc8284de8
BUG#15699, failure to apply ignore rule for unexisting table.
...
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found)
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.
2006-01-23 18:03:09 +02:00
gvb@phoenix.(none)
5b9d686e87
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 16:34:53 +01:00
svoj@april.(none)
4dc4502ab3
BUG#16489 - utf8 + fulltext leads to corrupt index file.
...
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
2006-01-23 17:15:33 +04:00
gvb@phoenix.(none)
66cb90410c
Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into phoenix.(none):/data/mysql-4.1-BK
2006-01-23 11:18:06 +01:00
holyfoot@eagle.intranet.mysql.r18.ru
12fcabbbf2
Merging
2006-01-21 21:50:54 +04:00
hf@eagle.intranet.mysql.r18.ru
4f368f9f93
Merging
2006-01-21 18:50:06 +04:00
hf@eagle.intranet.mysql.r18.ru
b91380456f
Merge hf@192.168.21.12:work/mysql-4.1.9855
...
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
2006-01-21 17:53:29 +04:00
anozdrin@mysql.com
f2c3ed8e7b
Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
...
in the Binary Log.
2006-01-20 17:21:39 +03:00
anozdrin@mysql.com
145fd62bc1
Fix for BUG#15588: String overrun during sp-vars.test
...
The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).
2006-01-20 15:59:22 +03:00
pem@mysql.com
2c6ea2d2df
Fix of fix for BUG#15866. (Actually change the fib() call in sp.test)
2006-01-20 08:32:22 +01:00
pem@mysql.com
28f3989c8a
Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)"
...
Lowered the parameter to 10, and also renamed non-standard table names to t3.
2006-01-19 17:55:54 +01:00
pem@mysql.com
3a753667dd
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15658/mysql-5.0
2006-01-19 11:48:07 +01:00
pem@mysql.com
6fad448a49
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14834/mysql-5.0
2006-01-18 17:09:23 +01:00
aivanov@mysql.com
5f7279d0d5
Applied patch recieved from Marko:
...
Make innodb_thread_concurrency 0 by default, and extend the usable
range from 0 to 1000 (0 disables the thread throttling).
2006-01-18 15:20:56 +03:00
bell@sanja.is.com.ua
e87d5e9a83
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
2006-01-18 13:49:37 +02:00
bell@sanja.is.com.ua
4e931d3c45
Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851).
2006-01-18 13:48:57 +02:00
msvensson@neptunus.(none)
e55af5271c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:46:02 +01:00
konstantin@mysql.com
8d6c98ed90
Bug#15206: "Misleading message "No data to FETCH":
...
reword the misleading message.
2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799
Fix for connection not being added to connection pool if "disable_abort_on_error" was used.
2006-01-17 19:02:42 +01:00
pem@mysql.com
7817b99857
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug15231/mysql-5.0
2006-01-17 12:44:51 +01:00
pem@mysql.com
2f44b60752
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-17 10:04:11 +01:00
konstantin@mysql.com
739ba76d64
A fix for Bug#13337 "ps test fails if configure wo/ usc2"
2006-01-17 01:03:03 +03:00
konstantin@mysql.com
34c37d1ac9
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-17 00:44:43 +03:00
konstantin@mysql.com
3d16758311
A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat)
2006-01-17 00:28:00 +03:00
konstantin@mysql.com
f693473fff
A test case for Bug#7670 "Loss of precision for some integer
...
values stored into DOUBLE column" (Can't repeat)
2006-01-16 22:31:13 +03:00
pem@mysql.com
5863337b8f
Post-merge fixes (BUG#14498)
2006-01-16 17:55:22 +01:00
andrey@lmy004.
7b2238d484
Merge
2006-01-16 16:21:41 +01:00
gvb@phoenix.(none)
8c69d6abaf
date_formats.test:
...
fix for bug #15828 after review
doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values
2006-01-16 15:46:37 +01:00
pem@mysql.com
559a243686
Merge mysql.com:/extern/mysql/bk/mysql-5.0
...
into mysql.com:/extern/mysql/work/bug14498/mysql-5.0
2006-01-16 15:37:25 +01:00
aivanov@mysql.com
708f9b3ceb
Changes from the innodb-5.0-ss115 snapshot.
...
Fixed bugs:
BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
BUG#15650: "DELETE with LEFT JOIN crashes server"
BUG#15308: "Problem of Order with Enum Column in Primary Key"
BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
2006-01-16 14:32:43 +03:00
aivanov@mysql.com
c46f11fa96
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751
Changes from innodb-4.1-ss14 snapshot
...
Fixed BUG#14056: Column prefix index on UTF-8 primary key
causes "Can't find record.."
Also fixed bug 15991.
2006-01-15 14:50:47 +03:00
konstantin@mysql.com
750f9fee90
A post-merge fix (Bug#12734)
2006-01-14 21:20:42 +03:00
konstantin@mysql.com
48d48bc936
A fix and a test case for Bug#12734 " prepared statement may
...
return incorrect result set for a select SQL request"
2006-01-14 04:55:07 +03:00
sergefp@mysql.com
86daf2d493
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
2006-01-14 01:28:42 +03:00
sergefp@mysql.com
e58314d482
BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct
...
'ref' accesses to all tables that are direct children of the nested join and are
not inner wrt their siblings.
2006-01-13 23:55:30 +03:00
svoj@april.(none)
d0a5e3db9f
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
2006-01-13 21:30:05 +04:00
svoj@april.(none)
5581ef960a
BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
...
Allow fulltext index on VARCHAR columns longer than max key length.
2006-01-13 21:25:12 +04:00
evgen@moonbone.local
ceb1932984
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15347-bug-5.0-mysql
2006-01-13 18:42:15 +03:00
gvb@phoenix.(none)
45db1c24b0
fix for bug#15828
...
problem was not checking 2nd parameter of str_to_date against NULL
2006-01-13 14:42:46 +01:00
evgen@moonbone.local
cea01c7387
Merge
2006-01-13 16:27:38 +03:00
bar@mysql.com
0e2fac2d8c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 17:21:38 +04:00
bar@mysql.com
949aced164
Merge mysql.com:/usr/home/bar/mysql-4.1.b15377
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 16:39:33 +04:00
evgen@moonbone.local
02570c20bf
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into moonbone.local:/work/15538-bug-5.0-mysql
2006-01-13 14:30:20 +03:00
bar@mysql.com
78e93fbbcf
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:22:53 +04:00
bar@mysql.com
b061cacb0b
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 14:16:16 +04:00
evgen@moonbone.local
8dbedc9ffd
Merge
2006-01-13 12:13:50 +03:00
jonas@perch.ndb.mysql.com
8c41e2ae2c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-13 07:31:35 +01:00
dlenev@mysql.com
f9ea947bdc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446
Fix for bug #12198 "Temporary table aliasing does not work inside stored
...
functions".
We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
2006-01-13 01:51:56 +03:00
bar@mysql.com
6301568290
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 16:07:06 +04:00
bar@mysql.com
832148ded2
ctype_utf8.result:
...
After merge fix:
fixing order of results.
2006-01-12 13:08:49 +04:00
sergefp@mysql.com
40b7fab55d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
2006-01-12 11:55:34 +03:00
sergefp@mysql.com
e40759e370
BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into
...
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7
Merge mysql.com:/usr/home/bar/mysql-4.1.b15581
...
into mysql.com:/usr/home/bar/mysql-5.0
2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1.b15581
2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
dae00c191f
Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem.
2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c
Fixed bug #15538 : unchecked table absence caused server crash.
...
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.
Modified rules:
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9
Fixed bug #15347 : Wrong result of subselect when records cache and set
...
functions are involved.
When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions
to calculate their values correctly. Normally this null_row flag is cleared for
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are
always evaluated as nulls and whole select produces wrong result.
flush_cached_records() now clears null_row flag at the very beginning.
2006-01-11 23:16:21 +03:00
evgen@moonbone.local
605f62fce8
Fixed bug #15633 : Evaluation of Item_equal for non-const table caused wrong
...
select result
Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated. Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.
Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
2006-01-11 22:49:43 +03:00
pem@mysql.com
0cc1acd51c
Fixing BUG#15658: Server crashes after creating function as empty string
...
Empty strings (and names with trailing spaces) should not be allowed.
2006-01-11 15:11:05 +01:00
msvensson@neptunus.(none)
4b913614fc
Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
2f48e4f1dc
Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
2006-01-11 11:06:26 +01:00
msvensson@neptunus.(none)
d42d399464
Disable code for "let" to assign each column from query to it's own variable
2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9
Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
...
There are two main idea of this fix:
- introduce a common function for server and client to split user value
(<user name>@<host name>) into user name and host name parts;
- dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
aivanov@mysql.com
2871e85f2e
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
...
into mysql.com:/home/alexi/dev/mysql-5.0-15805
2006-01-10 19:22:47 +03:00
aivanov@mysql.com
16004acce1
Commenting out testcases which cause type_time.test failure.
...
To be uncommented after fixing bug 15805.
2006-01-10 17:57:46 +03:00
aelkin@mysql.com
9f0b5092e3
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439
BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
...
There is a specific rpl_ignore_grant test case for GRANT.
2006-01-10 13:44:08 +02:00
msvensson@neptunus.(none)
86e8958a4e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
igor@rurik.mysql.com
32c7a0b62f
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
e4b1399b5a
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
msvensson@neptunus.(none)
e0d3410a3e
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
33d5dc041d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799
Bug #15598 Server crashes in specific case during setting new password
...
- Comparing host string against NULL caused crash.
- If host.hostname is NULL treat it as ""
2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
7bda1e9191
Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
...
into neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55
Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
...
into devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87
Bug #15598 Server crashes in specific case during setting new password
...
- When acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
igor@rurik.mysql.com
bf78fd5438
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916
Fixed bug #14274 : a query with a having clause containing only set function returned a wrong result set.
2006-01-07 23:00:06 -08:00
igor@rurik.mysql.com
d2cfad167b
Fixed bug #16016 : MIN/MAX optimization was not applied to views.
2006-01-06 22:28:26 -08:00
jimw@mysql.com
d8a4aafe33
Merge mysql.com:/home/jimw/my/mysql-5.0-14212
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2006-01-06 08:34:55 -08:00
monty@mysql.com
b0a5ea01ef
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6
Review fixes of new pushed code
...
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
- #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
- #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
2006-01-06 00:47:49 +02:00
knielsen@mysql.com
85575904fa
BUG#14931: Temporarily add synchronization to avoid sporadic test failures until
...
the bug is fixed.
2006-01-04 15:25:32 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca
Fix for bug#15533 crash, information_schema, function, view
...
enable view prepared mode during getting metedata for I_S table
2006-01-03 14:25:19 +04:00
jonas@perch.ndb.mysql.com
8d756c5bdd
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-02 14:49:02 +01:00
jonas@perch.ndb.mysql.com
805655d889
bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled)
2006-01-02 14:38:38 +01:00
msvensson@neptunus.(none)
43a559ac70
Improved error message for failing with wrong error
2005-12-29 09:48:43 +01:00
msvensson@neptunus.(none)
6de9519966
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
2005-12-29 09:19:25 +01:00
msvensson@devsrv-b.mysql.com
45864dbf4b
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
...
into devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
2005-12-28 17:37:28 +01:00
evgen@moonbone.local
45abf0dabd
Manual merge
2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
e1ef24e38c
Bug #15775 "drop user" command does not refresh acl_check_hosts
...
- Update patch for 5.0
- Added common function to be called when 'acl_users' has been modified
2005-12-28 14:43:50 +01:00
evgen@moonbone.local
535b23bec5
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/14583-bug-4.1-mysql
2005-12-28 16:00:10 +03:00
msvensson@neptunus.(none)
cdd1f5c6fc
Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
...
into neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a
BUG#15775 "drop user" command does not refresh acl_check_hosts
...
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent
connect's via TCP to fail randomly.
- 4.1 version
2005-12-28 09:23:27 +01:00
ingo@mysql.com
bd1b724bbf
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-bug5390
2005-12-27 19:25:54 +01:00
evgen@moonbone.local
d91cbf34ff
Fix bug#14583
...
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result.
Because my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.
my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
2005-12-27 20:16:59 +03:00