msvensson@shellback.(none)
5a049ba807
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-30 13:45:24 +01:00
msvensson@shellback.(none)
e8c7f19179
Improve comments around FLUSH STATUS
...
It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after
2006-10-30 13:35:57 +01:00
msvensson@neptunus.(none)
4aa5a91b20
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-27 00:00:00 +02:00
msvensson@neptunus.(none)
6e70b126ed
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
7946e8c3c8
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-26 20:11:13 +02:00
msvensson@neptunus.(none)
74a29e5db4
Bug#20894 Reproducible MySQL client segmentation fault
...
- Add two null bytes in "buff" variable allowing us to call
get_arg two times also for strings longer than sizeof(buff)
2006-10-26 19:51:29 +02:00
msvensson@shellback.(none)
631c82d2ea
Bug#18888 Trying to overwrite sql/lex_hash.h during build
...
- As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h
- Remove the ifdef for partition in lex.h
- Fix minor problem with"EXPLAIN PARTITION" when not compiled with
partition(existed also without the above patch)
- Add test case that will be run when we don't have partition
support compiled into mysqld
- Return error ER_FEATURE_DISABLED if user tries to use PARTITION
when there is no support for it.
2006-10-26 19:11:09 +02:00
tsmith/tim@siva.hindu.god
837fb44170
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-25 17:14:32 -06:00
tsmith/tim@siva.hindu.god
514fd098f2
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-25 16:28:42 -06:00
tsmith/tim@siva.hindu.god
3af2089b13
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-10-24 14:42:08 -06:00
tsmith@maint1.mysql.com
8f75d0913b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into maint1.mysql.com:/data/localhome/tsmith/bk/51
2006-10-24 20:01:01 +02:00
msvensson@neptunus.(none)
3ab216e033
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-24 17:55:39 +02:00
msvensson@neptunus.(none)
80f4c1056f
Fix spelling errors in test files
2006-10-24 17:54:45 +02:00
tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06:00
andrey@example.com
fd759850aa
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into example.com:/work/bug23037/my51
2006-10-23 15:27:24 +02:00
andrey@example.com
6237be99d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into example.com:/work/bug23037/my50
2006-10-23 15:21:23 +02:00
andrey@example.com
4e3ac17f01
after merge fix
2006-10-23 15:11:24 +02:00
andrey@example.com
d18cb100be
Merge example.com:/work/bug23037/my50
...
into example.com:/work/bug23037/my51
2006-10-23 14:29:11 +02:00
andrey@example.com
389c6a019e
Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table"
...
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
2006-10-23 13:12:30 +02:00
ramil/ram@myoffice.izhnet.ru
6cb5224279
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 13:18:52 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a67472f289
Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-23 12:44:25 +05:00
ramil/ram@myoffice.izhnet.ru
d4c7b6da83
Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 12:07:48 +05:00
ramil/ram@myoffice.izhnet.ru
800d80542f
Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
...
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
2006-10-23 10:32:39 +05:00
tsmith/tim@siva.hindu.god
d5d1404d4b
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-20 13:53:39 -06:00
gkodinov@dl145s.mysql.com
bb0422a0b0
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-20 11:12:35 +02:00
gkodinov@dl145s.mysql.com
a93cc1b70b
Merge bk-internal:/home/bk/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-20 11:02:56 +02:00
gkodinov@dl145s.mysql.com
a0c0bbd8ae
sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result:
...
merge fixes
2006-10-20 10:12:38 +02:00
svoj@mysql.com/april.(none)
26bf6a25c8
After merge fix.
2006-10-19 20:29:12 +05:00
msvensson@neptunus.(none)
c7710510ac
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 17:15:49 +02:00
svoj@april.(none)
8b01686765
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
aaed398254
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-19 16:43:46 +02:00
gkodinov@dl145s.mysql.com
ea8ba03556
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-19 16:00:06 +02:00
svoj@mysql.com/april.(none)
afefa5d42f
After merge fix.
2006-10-19 18:48:37 +05:00
svoj@mysql.com/april.(none)
2d9e457460
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-10-19 18:04:34 +05:00
gkodinov@dl145s.mysql.com
c77fae407b
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 15:04:12 +02:00
gkodinov@dl145s.mysql.com
892495acaf
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-10-19 14:37:49 +02:00
svoj@mysql.com/april.(none)
d2fa9fd192
Merge mysql.com:/home/svoj/devel/mysql/BUG23175/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:35:09 +05:00
gkodinov@dl145s.mysql.com
1dacdd4c85
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-10-19 14:34:56 +02:00
svoj@mysql.com/april.(none)
b6f909bf1b
Merge mysql.com:/home/svoj/devel/mysql/BUG22562/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
2006-10-19 17:33:22 +05:00
msvensson@neptunus.(none)
9a5b4a1151
Add command "exit" to mysqltest, it will stop processing any more
...
commands and go directly to result file processing
2006-10-19 13:34:09 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
f6ea36c3a5
Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
...
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
2006-10-19 16:15:30 +05:00
msvensson@neptunus.(none)
9a0e8fb4a1
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-10-19 12:36:40 +02:00
msvensson@neptunus.(none)
b11dee73ca
Backport test cases fixes from 5.0
2006-10-19 10:54:23 +02:00
istruewing@chilla.local
5af9dfa6ba
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-merge
2006-10-19 10:15:08 +02:00
istruewing@chilla.local
11d453cc33
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-merge
2006-10-19 09:59:01 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0027b6e4b7
Fix for bug #20732 : Partial index and long sjis search with '>' fails sometimes
...
We miss some records sometimes using RANGE method if we have
partial key segments.
Example:
Create table t1(a char(2), key(a(1)));
insert into t1 values ('a'), ('xx');
select a from t1 where a > 'x';
We call index_read() passing 'x' key and HA_READ_AFTER_KEY flag
in the handler::read_range_first() wich is wrong because we have
a partial key segment for the field and might miss records like 'xx'.
Fix: don't use open segments in such a case.
2006-10-19 12:52:37 +05:00
igor@rurik.mysql.com
3a4a9521d8
Changed test case for bug 22342 to make it platform independent.
2006-10-18 17:24:33 -07:00
iggy@rolltop.ignatz42.dyndns.org
2ec5a57ff4
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
2006-10-18 19:28:37 -04:00
iggy@rolltop.ignatz42.dyndns.org
39bda9e3cf
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745
...
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
2006-10-18 19:27:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
b0d833c32d
Post-Merge Fix.
2006-10-18 19:17:56 -04:00