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
jani@a193-229-222-105.elisa-laajakaista.fi
c6d933c629
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-12-04 20:57:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4f6a321bb8
Fixes multi_statement test case on NetWare.
2005-12-04 15:39:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0
A set of Netware related patches.
2005-12-04 15:02:06 +02:00
kent@mysql.com
9fd13ba93d
my_global.h:
...
Make __cxa_pure_virtual weak symbol
2005-12-03 20:52:34 +01:00
kent@mysql.com
28fa86f45e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-03 14:40:24 +01: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
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
pem@mysql.com
ed6e09a38c
Post-review fixes for BUG#14376: MySQL crash on scoped variable (re)initialization
2005-12-02 14:30:42 +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
stewart@mysql.com
00d95a8bea
BUG#15425 Small window for NF during backup failing without error
2005-12-02 09:27:06 +01: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
kent@mysql.com
04a475e55a
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-01 04:06:58 +01:00
jimw@mysql.com
085e7784b0
Merge mysql.com:/home/jimw/my/mysql-5.0-14610
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-30 13:10:50 -08:00
jimw@mysql.com
37ff730866
Fix union.result
2005-11-30 13:10:08 -08:00
joerg@mysql.com
1a8ac44cff
Raise the version number (as 4.1.16 has been cloned).
2005-11-30 21:50:09 +01: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