mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
28567 commits 2781 branches 343 tags 1.6 GiB
Commit graph

9278 commits

Author SHA1 Message Date
pem@mysql.com
a0ed1d5aba Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14233/mysql-5.0
 2005-12-06 13:34:18 +01:00
joerg@mysql.com
56e35734c2 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-12-05 20:42:44 +01:00
mleich@mysql.com
4024577205 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-Z
 2005-12-05 19:47:18 +01:00
serg@serg.mylan
6b5320d617 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-12-05 18:18:56 +01:00
mleich@mysql.com
2fd30b61d5 Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs 
Solution according to the comments made by Guilhem
- rpl_relayrotate  Remove the SHOW SLAVE STATUS  It is not needed.
- rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value
 2005-12-05 17:57:48 +01:00
joerg@mysql.com
b5293c415f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-12-05 16:42:28 +01:00
msvensson@neptunus.(none)
0a45078dd8 Fix for mysqltest.test failing with mysql-test-run.pl and --ps-protocol 2005-12-05 16:00:23 +01:00
serg@serg.mylan
719089a819 better error for optimize/repair/etc a view 2005-12-05 12:08:30 +01:00
serg@serg.mylan
9c0a8bbd17 this has nothing to do with the bug#13012. 
it's about mysql_admin_commands not being reexecution-safe
(and CHECK still isn't)
 2005-12-03 15:02:09 +01:00
igor@rurik.mysql.com
09e6597015 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-02 20:42:36 -08:00
msvensson@devsrv-b.mysql.com
997f7027ae Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 23:37:38 +01:00
serg@serg.mylan
b3b72c6329 Bug#13012: REPAIR/BACKUP/RESTORE TABLE cause "packet out of order" in SP. 
Mark them properly as result-returning statements
 2005-12-02 22:59:45 +01:00
bell@sanja.is.com.ua
58c581ab62 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 22:59:29 +02:00
msvensson@devsrv-b.mysql.com
75bd92f1c6 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 21:06:35 +01:00
konstantin@mysql.com
6f63650d72 Add a test case for Bug#5967 "Stored procedure declared variable 
used instead of column", the bug is to be fixed later.
 2005-12-02 22:43:56 +03:00
bell@sanja.is.com.ua
b1f0e78146 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 21:20:25 +02:00
bell@sanja.is.com.ua
45e59f3d76 Now we shall store only position (index of first character) 
of SELECT from query begining, to be independet of query buffer
allocation.
Correct procedure used to find beginning of the current statement
during parsing (BUG#14885).
 2005-12-02 21:18:12 +02:00
bell@sanja.is.com.ua
54b7e6e3dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 20:50:54 +02:00
evgen@moonbone.local
b7d7f78fd0 query_cache.result: 
After merge fix
 2005-12-02 21:05:23 +03:00
msvensson@devsrv-b.mysql.com
17cc99470b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug11731/my50-bug11731 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 18:37:16 +01:00
msvensson@neptunus.(none)
c753df999c Bug #11731 mysqltest in multi-statement queries ignores errors in non-1st queries 
- Add tests to mysqltest.test
 - Problem no longer exists
 2005-12-02 18:29:15 +01:00
evgen@moonbone.local
00b902b065 Manually merged 2005-12-02 19:42:14 +03:00
evgen@moonbone.local
151350536c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/15028-bug-4.1-mysql
 2005-12-02 18:42:05 +03:00
pem@mysql.com
035c24beeb Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14376/mysql-5.0
 2005-12-02 15:04:50 +01:00
bell@sanja.is.com.ua
68a20f3ef7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 14:00:12 +02:00
ramil@mysql.com
681252c82d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12956
 2005-12-02 11:57:26 +04:00
bell@sanja.is.com.ua
c98fbc0320 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 08:43:05 +02:00
jimw@mysql.com
3d223afb28 Post-merge result file cleanup 2005-12-01 15:10:35 -08:00
evgen@moonbone.local
3f72e7645f Fix bug#15028 Multitable update returns different numbers of matched rows 
depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.
 2005-12-01 23:22:20 +03:00
jimw@mysql.com
beed6147ad Merge mysql.com:/home/jimw/my/mysql-4.1-13318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:21:29 -08:00
jimw@mysql.com
fb1200a0a3 Merge mysql.com:/home/jimw/my/mysql-4.1-12612 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:07:25 -08:00
jimw@mysql.com
e7fe779ddf Merge mysql.com:/home/jimw/my/mysql-5.0-keysize 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:03:46 -08:00
jimw@mysql.com
e86048ce59 Enable key lengths of up to 3K on 32-bit platforms. 2005-12-01 11:11:03 -08:00
SergeyV@selena.
22b43351f8 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14902-mysql-5.0
 2005-12-01 20:29:48 +03:00
bell@sanja.is.com.ua
ac26e14e99 postmerge fix 2005-12-01 17:13:54 +02:00
bell@sanja.is.com.ua
8cbf1e5119 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 17:12:42 +02:00
bell@sanja.is.com.ua
7796a79477 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 14:38:29 +02:00
bell@sanja.is.com.ua
e3f2a63308 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 14:29:12 +02:00
bell@sanja.is.com.ua
12d1bf1231 We should skip beggining '(' characters when test query on possibility 
to be in the query cache. (BUG#14652)
 2005-12-01 14:26:19 +02:00
ramil@mysql.com
ab04ceafc7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2005-12-01 14:31:28 +04:00
ramil@mysql.com
37cfade0b4 Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select). 2005-12-01 14:26:46 +04:00
bell@sanja.is.com.ua
2c666b32db Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug3-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 12:16:45 +02:00
bell@sanja.is.com.ua
2ff98e0586 View creation code fixed to expect empty TABLE_LIST::table pointer (BUG#15096). 2005-12-01 12:15:48 +02:00
bell@sanja.is.com.ua
513d055076 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug5-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-01 12:04:01 +02:00
bell@sanja.is.com.ua
39689634ac We should not skip temptable view along with other derived 
tables during query tables registration. (BUG#15119)
 2005-12-01 12:01:38 +02:00
timour@mysql.com
d80feb9e21 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14920
 2005-12-01 09:26:17 +02:00
gluh@eagle.intranet.mysql.r18.ru
1faac904f5 Fix for bug#14476 information_schema.TABLES.TABLE_TYPE with empty value 
store TABLES.TABLE_TYPE in case of error during table opening
 2005-12-01 11:00:33 +04:00
jimw@mysql.com
37ff730866 Fix union.result 2005-11-30 13:10:08 -08:00
jimw@mysql.com
70c30c8d93 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-30 10:18:11 -08:00
timour@mysql.com
ecb78b4d10 WL#2486 - natural/using join according to SQL:2003 
Commented out one failing query in the regression test (reported as a bug).
 2005-11-30 19:13:29 +02:00
timour@mysql.com
3b672d7e67 WL#2486 - natural/using join according to SQL:2003. 
Implemented specialized regression test for the WL.
 2005-11-30 19:06:58 +02:00
timour@mysql.com
999a73ace5 Fix for BUG#14920 Ordering aggregated result sets corrupts resultset. 
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).

The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.
 2005-11-30 12:52:12 +02:00
jimw@mysql.com
f8afbe6f0c Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-29 15:33:58 -08:00
jimw@mysql.com
f353bec511 Merge mysql.com:/home/jimw/my/mysql-4.1-14216 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-29 11:52:58 -08:00
knielsen@mysql.com
6246425ef1 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2005-11-29 14:08:49 +01:00
holyfoot@deer.(none)
655c9b93a0 test fixed 2005-11-29 16:46:51 +04:00
knielsen@mysql.com
4fc659bf49 Moved long running query to type_newdecimal-big.test 
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
 2005-11-29 13:42:45 +01:00
holyfoot@mysql.com
c60b8e3027 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.14693
 2005-11-29 13:33:56 +04:00
bar@mysql.com
0f73558ee3 Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-11-29 09:25:51 +04:00
bar@mysql.com
5c1ba75cfd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b10446
 2005-11-29 09:21:57 +04:00
jimw@mysql.com
9df4951acb Merge mysql.com:/home/jimw/my/mysql-5.0-14956 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:51:54 -08:00
jimw@mysql.com
99297e44d4 Merge mysql.com:/home/jimw/my/mysql-4.1-14155 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-28 10:50:23 -08:00
joerg@mysql.com
379d3ee98c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-28 17:26:56 +01:00
joerg@mysql.com
fc57b9c548 Merge mysql.com:/M50/testbugs-5.0 into mysql.com:/M50/mysql-5.0 2005-11-28 17:17:17 +01:00
joerg@mysql.com
41e9dc8352 mysql-test/t/alter_table.test 
Care for case-insignificant platforms (Mac OS X, Windows).
 2005-11-28 17:07:54 +01:00
pem@mysql.com
341f941209 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 15:11:26 +01:00
bar@mysql.com
2b18be14ca Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 17:16:39 +04:00
bar@mysql.com
814f6c6cf0 grant.result: 
After merge fix.
 2005-11-28 17:06:57 +04:00
pem@mysql.com
df553710df Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14643/mysql-5.0
 2005-11-28 13:20:15 +01:00
bar@mysql.com
8f33adc13d Merge mysql.com:/usr/home/bar/mysql-4.1.b14406 
into  mysql.com:/usr/home/bar/mysql-5.0
 2005-11-28 15:31:11 +04:00
ramil@mysql.com
65e6ecb861 Fix for bug #12956: cast make differ rounding. 2005-11-28 14:52:38 +04:00
bar@mysql.com
63b038f2e6 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b14406
 2005-11-28 12:45:40 +04:00
kent@mysql.com
114cf11218 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-28 09:44:47 +01:00
serg@serg.mylan
8d6811def7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-27 09:39:45 +01:00
igor@rurik.mysql.com
5c93bf90f3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2005-11-26 13:54:21 -08:00
serg@serg.mylan
1cf71d0585 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 20:56:05 +01:00
serg@serg.mylan
c246aa1635 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-11-26 20:50:22 +01:00
serg@serg.mylan
6a83b75764 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-26 20:23:20 +01:00
serg@serg.mylan
701de9be0a followup for for the bug#5686 2005-11-26 19:36:11 +01:00
dlenev@mysql.com
ca8c984e50 Enabled back bunch of tests for stored routines which were disabled 
earlier because of various features/checks missing (these features/checks
are now implemented).
 2005-11-26 19:15:17 +03:00
igor@rurik.mysql.com
881e6e681c Fixed bug #15106. 
A typo bug caused loss of a predicate of the form field=const in some cases.
 2005-11-25 18:51:44 -08:00
konstantin@mysql.com
c779c2c809 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 19:27:20 +03:00
pem@mysql.com
eb5bf2ec33 Fixed BUG#14233: Crash after tampering with the mysql.proc table 
Post-review version. Some minor review fixes, but also changed the way
  some errors are handled: Don't return specific parse errors; instead
  always use the more general "table corrupt" error (amended accordingly).
 2005-11-25 17:09:26 +01:00
konstantin@mysql.com
463175c4e8 Post-merge fixes. 2005-11-25 18:53:55 +03:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2005-11-25 13:57:13 +03:00
konstantin@mysql.com
f57dffe453 A fix and a test case for Bug#14410 "Crash in Enum or Set type in 
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are 
created in the statement memory root.
 2005-11-25 13:25:31 +03:00
mskold@mysql.com
6d5ef98adc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-25 10:56:01 +01:00
mskold@mysql.com
c2acc2da99 Updated expected error 2005-11-25 10:41:22 +01:00
bar@mysql.com
e6708aa0df Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14146
 2005-11-25 10:08:00 +04:00
evgen@moonbone.local
7a21129691 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13293-bug-5.0-mysql
 2005-11-24 22:41:52 +03:00
pem@mysql.com
01de5ef5af Remove t3 in join_nested.test 2005-11-24 19:51:52 +01:00
pem@mysql.com
7d232f01e3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 19:14:11 +01:00
pem@mysql.com
23cab491e9 Some post-merge cleaning, and made assert THD::store_globals() work at all times. 2005-11-24 19:13:13 +01:00
evgen@moonbone.local
e093fb1fd7 Fix bug#13293 Wrongly used index results in endless loop. 
Loose index scan using only second part of multipart index was choosen, which
results in creating wrong keys and endless loop.

get_best_group_min_max() now allows loose index scan for distinct only if used
keyparts forms a prefix of the index.
 2005-11-24 19:54:02 +03:00
holyfoot@deer.(none)
e906120ba8 Fix for bug #14693 (ALTER COLUMN SET DEFAULT has no effect) 2005-11-24 20:24:45 +04:00
evgen@moonbone.local
e3cab037bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14482-bug-4.1-mysql
 2005-11-24 19:17:31 +03:00
evgen@moonbone.local
a4a3215a44 Fix bug #14482 Wrongly applied optimization in resolve_const_item() caused 
crash

resolve_const_item() substitutes item which will evaluate to constant with
equvalent constant item, basing on the item's result type. In this case
subselect was resolved as constant, and resolve_const_item() was substituting
it's result's Item_caches to Item_null. Later Item_cache's function was called
for Item_null object, which caused server crash.

resolve_const_item() now substitutes constants for items with 
result_type == ROW_RESULT only for Item_rows.
 2005-11-24 19:16:51 +03:00
timour@mysql.com
7397abc0c7 table t7 was not dropped at the end 2005-11-24 16:11:59 +02:00
pem@mysql.com
c5475706f9 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13729/mysql-5.0
 2005-11-24 12:12:49 +01:00
igor@rurik.mysql.com
9b9f8cab4c Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-23 21:44:21 -08:00
jimw@mysql.com
000d89b5e0 Fix values printed by mysqldump for empty blob fields when 
--hex-blob is used. (Bug #13318)
 2005-11-23 17:31:44 -08:00
jimw@mysql.com
81cb8ad37d Fix handling of maximum value for MAX_ROWS on 64-bit platforms. (Bug #14155) 2005-11-23 17:05:59 -08:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space 
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
 2005-11-24 02:36:28 +02:00
jimw@mysql.com
86beb208aa Fix result of ROW_COUNT() after 'EXECUTE prepstmt'. (Bug #14956) 2005-11-23 14:57:26 -08:00
ranger@regul.home.lan
c571ec2da2 Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  regul.home.lan:/mnt/md/bk/mysql-5.0
 2005-11-24 00:37:46 +02:00
SergeyV@selena.
e4cfca0758 Fixes bug #14902. When analysing a table with FT index that contains stopwords 
table statistics is not updated, so the next execution of analyze table will
try to update statistics again.
 2005-11-23 18:18:41 +03:00
pem@mysql.com
0411412403 Fixed BUG#13729 Stored procedures: packet error after exception handled 
Don't set thd->is_fatal_error in sql_update for duplicate key errors.
 2005-11-23 11:56:53 +01:00
serg@serg.mylan
151d75c241 merged 2005-11-23 09:52:18 +01:00
igor@rurik.mysql.com
7b1b69a6e7 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-22 23:00:57 -08:00
bell@sanja.is.com.ua
83d692da88 postmerge fix 2005-11-23 02:49:44 +02:00
bell@sanja.is.com.ua
db8f03ebe8 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 01:28:32 +02:00
bell@sanja.is.com.ua
7bd691f11e Recursion support made for SP (BUG#10100). 2005-11-23 01:11:19 +02:00
bell@sanja.is.com.ua
7d2442a160 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-23 00:58:13 +02:00
bell@sanja.is.com.ua
2bcd68973b Fix for BUG#13549 "Server crash with nested stored procedures 
if inner routine has more local variables than outer one, and
one of its last variables was used as argument to NOT operator".

THD::spcont was non-0 when we were parsing stored routine/trigger
definition during execution of another stored routine. This confused
methods of Item_splocal and forced them use wrong runtime context.
Fix ensures that we always have THD::spcont equal to zero during
routine/trigger body parsing. This also allows to avoid problems
with errors which occur during parsing and SQL exception handlers.
 2005-11-23 00:50:37 +02:00
ranger@regul.home.lan
6d34770eb3 Added support of stress mode to mysql-test-run.pl 
Corrected function declaration
 2005-11-22 23:46:54 +02:00
serg@serg.mylan
419d82f8c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-22 21:16:11 +01:00
pem@mysql.com
d71d1242ff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/show-sp-code/mysql-5.0
 2005-11-22 13:24:53 +01:00
kent@mysql.com
1483379b4c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-22 01:47:15 +01:00
kent@mysql.com
9b14ee2ebc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-22 01:17:06 +01:00
bell@sanja.is.com.ua
fe44e364ca Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
 2005-11-21 21:14:36 +02:00
bell@sanja.is.com.ua
87a199fc2a Avoiding removing dummy TABLE allocated on the stack (BUG#14726). 2005-11-21 21:11:02 +02:00
bar@mysql.com
3d1c1d7f68 cast.result: 
Fixing test results accordingly.
item_timefunc.cc:
  Displaying BINARY or CHAR in error messages,
  depending on the character set.
 2005-11-21 21:11:28 +04:00
bar@mysql.com
435c2ba671 Additional fix for Bug#14255 CAST(x AS BINARY(N)) does not pad 
cast.result:
cast.test:
  Avoid 0x00 byte in test results, use HEX instead.
 2005-11-21 19:59:58 +04:00
bar@mysql.com
174d28e4cc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b14255
 2005-11-21 17:57:14 +04:00
bar@mysql.com
2f72e05903 Bug#10446 Illegal mix of collations: 
item_strfunc.h, item_strfunc.cc, item.cc:
  Try to convert a const item into destination 
  character set. If conversion happens without
  data loss, then cache the converted value
  and return it during val_str().
  Otherwise, if conversion loses data, return
  Illeral mix of collations error, as it happened
  previously.
ctype_recoding.result, ctype_recoding.test:
  Fixing tests accordingly.
 2005-11-21 17:26:31 +04:00
aivanov@mysql.com
d741ce9017 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/dev/mysql-5.0-14554
 2005-11-21 15:56:29 +03:00
msvensson@neptunus.(none)
e6331657a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-11-21 12:28:36 +01:00
msvensson@neptunus.(none)
9301123eb3 Bug #14514 Creating table with packed key fails silently 
- Backport from 5.0
 2005-11-21 12:27:58 +01:00
aivanov@mysql.com
9a7efe36c6 Fixed BUG #14554: mysqldump does not separate "ROW" and trigger 
statement for tables created in the IGNORE_SPACE sql mode.
 2005-11-21 13:36:48 +03:00
mskold@mysql.com
c38fa304c3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-21 10:46:17 +01:00
serg@serg.mylan
5663843d3b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-11-21 10:18:54 +01:00
mskold@mysql.com
efdef780bc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-21 08:42:36 +01:00
kent@mysql.com
521f4b61f2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 21:35:11 +01:00
dlenev@mysql.com
d1eb512948 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13825
 2005-11-19 15:11:57 +03:00
dlenev@mysql.com
574e711209 Fix for bug #13825 "Triggers: crash if release savepoint" and for general 
handling of savepoints in stored routines.

Fixed ha_rollback_to_savepoint()/ha_savepoint()/ha_release_savepoint()
functions to properly handle savepoints inside of stored functions and
triggers.
Also now when we invoke stored function or trigger we create new savepoint
level. We destroy it at the end of function/trigger execution and return back
to old savepoint level.
 2005-11-19 15:09:23 +03:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
konstantin@mysql.com
86f1896fb0 Bug#13510 "Setting password local variable changes current 
password": additional fix, also make sure that a syntax error is 
returned for set names="foo" when there is no such variable or no
stored procedure.
 2005-11-19 01:22:12 +03:00
konstantin@mysql.com
a86eaaf5c3 A test case for Bug#8568 "GROUP_CONCAT returns string, unless in 
a UNION in which case returns BLOB". The bug is not present anymore.
 2005-11-18 23:46:04 +03:00
evgen@moonbone.local
c9ab4d614e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 22:11:34 +03:00
pem@mysql.com
4513ffd109 Removed forgotten test line in sp-code.test. 2005-11-18 18:05:04 +01:00
pem@mysql.com
3a832faafe Post-review fixes, mainly fixing all print() methods for sp_instr* classes. 
Also added mysql-test files:
 include/is_debug_build.inc
 r/is_debug_build.require
 r/sp-code.result
 t/sp-code.test
 2005-11-18 16:30:27 +01:00
konstantin@mysql.com
159bf8832e A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA 
when COUNT(*) is 0". The bug itself cannot be repeated.
 2005-11-18 17:55:52 +03:00
mskold@mysql.com
ab812dd5d8 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-18 15:54:53 +01:00
mskold@mysql.com
38878cd724 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-18 15:51:15 +01:00
evgen@moonbone.local
badc2668ce Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13622-bug-5.0-mysql
 2005-11-18 17:26:44 +03:00
jimw@mysql.com
385082ede0 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-18 05:24:29 -08:00
mskold@mysql.com
16fcccce1a Disabled --ps-protocol during autodiscover test 2005-11-18 12:20:22 +01:00
mskold@mysql.com
2237d9b745 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-11-18 10:14:27 +01:00
mskold@mysql.com
96413a44d1 Using new error code HA_ERR_TABLE_DEF_CHANGED to signal wrong schema version of table 2005-11-18 09:54:49 +01:00
timour@mysql.com
9a644b948c WL#2486 - natural/using joins according to SQL:2003. 
Enabled view tests that didn't work before.
 2005-11-18 10:51:46 +02:00
igor@rurik.mysql.com
a0744fba27 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-17 20:26:34 -08:00
jimw@mysql.com
2ff5c55896 Fix mix_innodb_myisam_binlog test and results after merge 2005-11-17 20:17:49 -08:00
evgen@moonbone.local
a031778955 Manually merged 2005-11-18 01:16:15 +03:00
serg@serg.mylan
e0abc22bfc BUG#13406 - incorrect amount of "records deleted" in CSV. 
Fallback to row-wise delete if number or rows in the table is unknown
 2005-11-17 22:52:31 +01:00
jimw@mysql.com
f8ce7bc01e Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-17 13:37:30 -08:00
mskold@mysql.com
8ca38a90ad Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2005-11-17 15:38:15 +01:00
ingo@production.mysql.com
a7daeaf64f Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-4.1
 2005-11-17 13:44:34 +01:00
mskold@mysql.com
77cbf5d3ff Fixed incorrectly use if table with wrong schema version 2005-11-17 12:45:23 +01:00
sasha@asksasha.com
0b275de13f Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-16 21:18:13 -07:00
sasha@asksasha.com
eac88b685c fixed the race condition in the test case for BUG#7947 2005-11-16 21:17:38 -07:00
igor@rurik.mysql.com
dc32369fb0 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-16 20:09:35 -08:00
dlenev@mysql.com
f0e558c1b8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg13399-2
 2005-11-17 04:38:10 +03:00
dlenev@mysql.com
63fcccb193 Fix for bug #13399 Crash when executing PS/SP which should activate trigger 
which is now dropped" and bug #12329 "Bogus error msg when executing PS with
stored procedure after SP was re-created".
 2005-11-17 03:51:14 +03:00
konstantin@mysql.com
9e1f155864 A fix and a test case for Bug#14077 "Failure to replicate a stored 
function with a cursor". Enable execution of SELECT queries in SP on slave.
 2005-11-17 03:15:10 +03:00
pekka@mysql.com
becda93988 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/export/space/pekka/ndb/version/my50
 2005-11-16 22:22:34 +01:00
ingo@mysql.com
1237c2fbcc Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-16 21:33:38 +01:00
ingo@production.mysql.com
e55fd656dc Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 18:47:17 +01:00
ingo@production.mysql.com
82d91620ce Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.0
 2005-11-16 16:04:34 +01:00
serg@serg.mylan
60875d3236 bug#14433 - archive uses wrong ref_length 2005-11-16 15:17:08 +01:00
pekka@mysql.com
06531fb1d0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/export/space/pekka/ndb/version/my50
 2005-11-16 13:29:44 +01:00
pekka@mysql.com
a6e410dd4e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
 2005-11-16 13:28:54 +01:00
pekka@mysql.com
9fe68c3da6 ndb - bug#14007 5.0 *** does not automerge into 5.1 *** 2005-11-16 13:26:26 +01:00
bell@sanja.is.com.ua
a60a6b0f7f Issuing error about presence of commit/rollback statements in stored functions and triggers added to SP parsing procedure (BUG#13627) 
The crash mentioned in original bug report is already prevented by one
of previous patches (fix for bug #13343 "CREATE|etc TRIGGER|VIEW|USER
don't commit the transaction (inconsistency)"), this patch only improve
error returning.
 2005-11-16 14:09:06 +02:00
pekka@mysql.com
a8ce4d27ce ndb - bug#14007 4.1 [re-commit for LenZ merge] 2005-11-16 11:52:09 +01:00
ingo@mysql.com
3df2007147 Merge mysql.com:/home/mydev/mysql-4.1-4100 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:23:42 +01:00
ingo@mysql.com
e66b88bb7d Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-5000
 2005-11-16 10:10:53 +01:00
igor@rurik.mysql.com
aaf066bc86 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-15 23:01:29 -08:00
jimw@mysql.com
8ecedd193b Report truncation of spaces when inserting into a BINARY or VARBINARY 
field. (Bug #14299)
 2005-11-15 19:21:05 -08:00
evgen@moonbone.local
7749b8d15b Merge 2005-11-16 02:08:20 +03:00
ingo@mysql.com
74781d6559 Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash 
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
 the HANDLER ... READ commands. We did not notice when a table was
 replaced by a new one. This can happen during ALTER TABLE, REPAIR
 TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
 for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
 Though the function comment clearly said it must.
 I changed the code so that the locking is done when required. I call
 the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
 concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
 problem "the 5.0 addendum fix".
 2005-11-15 21:57:02 +01:00
sasha@asksasha.com
cb6d69f6f4 Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-15 13:38:48 -07:00
sasha@asksasha.com
9986a357ec merged in the test case for BUG#7947 2005-11-15 13:38:06 -07:00
bell@sanja.is.com.ua
13ae8d8d70 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
 2005-11-15 22:08:17 +02:00
evgen@moonbone.local
3a8e7b7fb9 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14850-bug-5.0-mysql
 2005-11-15 22:47:03 +03:00
bell@sanja.is.com.ua
a2b8128398 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0
 2005-11-15 19:22:00 +02:00
ingo@mysql.com
6bc4636b64 Merge mysql.com:/home/mydev/mysql-4.0-4000 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 18:09:40 +01:00
ingo@mysql.com
aa1f46a819 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
After merge fix.
 2005-11-15 18:01:30 +01:00
bell@sanja.is.com.ua
297639bdbe Test suite for BUG#13673 (the bug was fixed in the bugfix for BUG#14138) 2005-11-15 18:14:53 +02:00
ingo@mysql.com
1aa15c25c7 Merge mysql.com:/home/mydev/mysql-4.0-bug14397 
into  mysql.com:/home/mydev/mysql-4.0-4000
 2005-11-15 16:47:15 +01:00
ingo@mysql.com
8996fd40cf Merge mysql.com:/home/mydev/mysql-4.0-bug14616 
into  mysql.com:/home/mydev/mysql-4.1-4100
 2005-11-15 16:07:05 +01:00
pem@mysql.com
15df2c2298 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-15 13:27:00 +01:00
evgen@moonbone.local
35f7b50b18 Fix bug #14816 test_if_order_by_key() expected only Item_fields. 
test_if_order_by_key() expected only Item_fields to be in order->item, thus
failing to find available index on view's field, which results in reported
error.

Now test_if_order_by_key() calls order->item->real_item() to get field for
choosing index.
 2005-11-14 22:10:34 +03:00
evgen@moonbone.local
70e1974f76 Fix bug #14850 Item_ref's null_value wasn't updated 
Item_ref's null_value wasn't updated in save_org_in_field() causing reported
error.
 2005-11-14 21:52:39 +03:00
SergeyV@selena.
43bbd352e3 Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  selena.:H:/MYSQL/src/#14569-mysql-5.0
 2005-11-14 17:42:14 +03:00
pem@mysql.com
b614c82b10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-14 15:18:05 +01:00
SergeyV@selena.
5583e98498 Added workaround for rpl_frop_db test to run on win32 properly. 2005-11-14 16:39:46 +03:00
SergeyV@selena.
450909f0d3 Merge selena.:H:/MYSQL/bkt/mysql-5.0-rel 
into  selena.:H:/MYSQL/bkt/mysql-5.0
 2005-11-14 16:16:29 +03:00
bar@mysql.com
8894bd8d55 Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES 
ps_grant.result:
  Fixing result order.
grant.result:
  Adding test case,
  fixing result order.
grant.test:
  Adding test case.
sql_acl.cc:
  Fixed that my_charset_latin1 was incorrectly used instead of system_charset_info.
  This problem was previously fixed by Ingo in 5.0.
  This patch is basically a backport of the same changes into 4.1.
 2005-11-14 16:36:06 +04:00
igor@rurik.mysql.com
d903d10f80 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-11-13 17:56:20 -08:00
kent@mysql.com
a717f7bf98 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-11-14 02:08:17 +02:00
kent@mysql.com
ca415d9873 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-11-14 02:00:51 +02:00
kent@mysql.com
61438b0218 mysql-test-run.pl: 
Corrected search for 'mysqlimport' executable
 2005-11-14 01:59:15 +02:00
svoj@mysql.com
5d8cefe0b4 Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8 2005-11-12 11:25:14 +04:00
SergeyV@selena.
dbb29d11ee Fixes bug #14569. When no db is selected as current and we do create procedure db.sp()... 
we changing current db temporarily and restore it when sp is created. however thd->db
in this case becomes empty string rather than NULL and so all checks of thd->db == NULL 
will be false. So if after this we'll issue create procedure sp2()... without specifying
db it will succeed and create sp with db=NULL, which causes mysqldto crash on 
show procedure status statement.

This patch fixes the problem.
 2005-11-11 21:01:48 +03:00
pem@mysql.com
b607fdb04d Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14723/mysql-5.0
 2005-11-11 18:12:40 +01:00
evgen@moonbone.local
508824f7c4 Fix bug #13622 Wrong view .frm created if some field's alias contain \n 
View .frm parser assumes that query string will take only 1 line, with \n in
aliases query stringmay take several lines thus produces bad .frm file.

'query' parameter type changed from 'string' to 'escaped string'
 2005-11-11 20:03:32 +03:00
pem@mysql.com
7d134961df Fixed BUG#14723: Dumping of stored functions seems to cause corruption 
in the function body
  Changed the way the end of query was found from the lex state.
  The routine body was not extracted correctly when using the
  /*!version ... */ wrapper (in dump files); for some types of routines
  (e.g. with a label at the first begin), the trailing "*/" was not skipped.
 2005-11-11 11:10:52 +01:00
timour@mysql.com
13260ea8f3 Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
 2005-11-11 12:10:19 +02:00
timour@mysql.com
99257a935e Merge mysql.com:/home/timka/mysql/src/5.0-virgin 
into  mysql.com:/home/timka/mysql/src/5.0-bug-14662
 2005-11-11 11:41:21 +02:00
timour@mysql.com
225e94fb75 Fix for BUG#14662: view column in ORDER BY considered ambiguous if SELECT contains 
the same column as an aliased and as a non-aliased column.

The problem was that Item_direct_view_ref::eq() was first comparing view columns
by name, and in this case the name of one of them is different since it is aliased.
 2005-11-11 11:40:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
7803d80aa4 Fix for bug#13818 SHOW CREATE VIEW / TABLE and information_schema.views fail 
for invalid view
 Permit SHOW CREATE VIEW, SHOW CREATE TABLE, and retrieval of metadata from
 information_schema for invalid views
 2005-11-11 13:39:46 +04:00
anozdrin@mysql.com
b13dd4ff72 Manual merge. 2005-11-11 03:28:35 +03:00
anozdrin@mysql.com
1d3867faa5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-11 03:25:24 +03:00
anozdrin@mysql.com
3543f9d36c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-11 00:57:36 +03:00
brian@zim.(none)
44d54791ae Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-11-10 13:55:14 -08:00
anozdrin@mysql.com
f23f49ed57 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/MySQL/devel/5.0-wl2818
 2005-11-10 22:48:00 +03:00
anozdrin@mysql.com
491e4f89f5 WL#2818 (Add creator to the trigger definition for privilege 
checks on trigger activation)
 2005-11-10 22:25:03 +03:00
bell@sanja.is.com.ua
8cedaeb971 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 21:16:56 +02:00
guilhem@mysql.com
28d23440c3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-10 19:17:52 +01:00
bell@sanja.is.com.ua
148570fca1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 19:38:00 +02:00
guilhem@mysql.com
dda1756789 Merge mysql.com:/home/mysql_src/mysql-5.0-release 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-10 18:14:07 +01:00
guilhem@mysql.com
9e07979476 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  mysql.com:/home/mysql_src/mysql-5.0-release
 2005-11-10 17:53:09 +01:00
guilhem@mysql.com
ff46e54932 WL#2971 "change log-bin-trust-routine-creators=0 to apply only to functions". 
Indeed now that stored procedures CALL is not binlogged, but instead the invoked substatements are,
the restrictions applied by log-bin-trust-routine-creators=0 are superfluous for procedures.
They still need to apply to functions where function calls are written to the binlog (for example as "DO myfunc(3)").
We rename the variable to log-bin-trust-function-creators but allow the old name until some future version (and issue a warning if old name is used).
 2005-11-10 17:50:51 +01:00
brian@zim.(none)
47f9ada913 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2005-11-10 08:28:50 -08:00
brian@zim.(none)
510d0f24c8 Added handlerton flag to make storage engines invisable via flag. 2005-11-10 08:24:21 -08:00
holyfoot@mysql.com
71908dbc41 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.14268
 2005-11-10 19:54:38 +04:00
ramil@mysql.com
6bc74f53a2 Fix for bug #14822: Test "mysqldump" fails, "result" protocol seems wrong. 2005-11-10 18:58:33 +04:00
bell@sanja.is.com.ua
69c2076c03 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
 2005-11-10 16:49:30 +02:00
holyfoot@mysql.com
bbc26a63b2 merging 2005-11-10 16:32:49 +04:00
pem@mysql.com
b01e7393bf Fixed BUG#14719: Views DEFINER grammar is incorrect 
Corrected the syntax for the current_user() case.
  (It's "definer = current_user[()]", not just "current_user[()]".)
 2005-11-09 16:51:00 +01:00
sergefp@mysql.com
c914a03066 BUG#14480 post-fix: merge to 5.0 2005-11-09 14:47:58 +03:00
sergefp@mysql.com
c6a902f20c Merge mysql.com:/home/psergey/mysql-4.1-nov08-push 
into mysql.com:/home/psergey/mysql-5.0-oct08-push
 2005-11-09 10:12:58 +03:00
sergefp@mysql.com
f12212f74e BUG#14480: post-fix: use the default field value from CREATE list too. 2005-11-09 09:34:46 +03:00
pem@mysql.com
718f837410 Fixed BUG#14643: Stored Procedure: Continuing after failed var. 
initialization crashes server.
  Make sure variables are initialized to something (like null) when
  the default initialization fails and a continue handler is in effect.
 2005-11-08 14:47:33 +01:00
sergefp@mysql.com
c5276ebcb0 Merge, will need post-merge fixes. 2005-11-08 11:22:51 +03:00
sasha@asksasha.com
637c800191 changed select release_lock() to do release_lock() to avoid having to compare the 
non-deterministic result in the test case for BUG#7947
the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which
in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
 2005-11-07 20:51:30 -07:00
sergefp@mysql.com
41bc233699 Merge mysql.com:/home/psergey/mysql-4.1-bug13814 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:36:25 +03:00
sergefp@mysql.com
5656740542 Merge mysql.com:/home/psergey/mysql-4.1-bug14480 
into mysql.com:/home/psergey/mysql-4.1-nov08-push
 2005-11-08 05:34:56 +03:00
petr@mysql.com
63554e10d8 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-11-08 04:04:36 +03:00
jimw@mysql.com
a6aa8fa6d0 Fix handling of comparisons done by IN() to be consistent with how they 
are done for the = operator, such as when doing a comparison with a large
unsigned number that was quoted. (Bug #12612)
 2005-11-07 14:59:52 -08:00
petr@mysql.com
0f373f9501 Merge mysql.com:/home/cps/mysql/trees/mysql-4.1 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2005-11-08 01:27:15 +03:00
sasha@asksasha.com
aaaee3f23b Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
 2005-11-07 15:10:48 -07:00
sasha@asksasha.com
41752fa9a0 fix for BUG#7947 - failure to log DO RELEASE_LOCK() if we disconnect in the middle of 
transaction while holding the lock. Also test to make sure other binlogging issues
reported in the bug have been addressed.
 2005-11-07 15:09:35 -07:00
joerg@mysql.com
1bf2462119 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-11-07 23:02:33 +01:00
joerg@mysql.com
024d2b3595 mysql-test/r/connect.result + mysql-test/t/connect.test 
Replace the full socket path name, not just a directory component. bug#14720
 2005-11-07 22:30:44 +01:00
guilhem@mysql.com
ef415ceb14 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)": 
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).
 2005-11-07 16:18:46 +01:00
guilhem@mysql.com
517e51f1ed Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-11-07 13:04:27 +01:00
ingo@mysql.com
1f3df2e669 Bug#14616 - Freshly imported table returns error 124 when using LIMIT 
Initialized usable_keys from table->keys_in_use instead of ~0
in test_if_skip_sort_order(). It was possible that a disabled
index was used for sorting.
 2005-11-07 12:16:49 +01:00
bar@mysql.com
1946d68f99 Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce different results 
ctype_utf8.result, ctype_utf8.test:
  Adding test case.
item_strfunc.cc:
item_strfunc.h:
  Moving the well formed checking code into a method,
  to reuse in several Item_func_xxx. Reusing the new
  method in Item_func_char and Item_func_charset_conv.
 2005-11-07 12:34:19 +04:00