mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38918 commits 2788 branches 343 tags 1.7 GiB
Commit graph

38918 commits

This branch
This branch
All branches
Author SHA1 Message Date
gkodinov@dl145s.mysql.com
8da0a672af merge fixes 2006-09-29 15:10:20 +02:00
sergefp@mysql.com
47b357522a BUG#14940: Slow join order is chosen: [2nd commit with post-review fixes] 
- Re-worked the prev_record_reads() function to return the lower bound of
  number of different table access scans that will be performed.
 2006-09-29 15:58:47 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
07f9efd1e1 Merge mysql.com:/usr/home/bar/mysql-5.0.b6147v2 
into  mysql.com:/usr/home/bar/mysql-5.0.b6147rpl
 2006-09-29 16:40:18 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
8b0f82b9b8 Bug#21263 mysql client XML output does not distinguish between NULL and string 'NULL' 
Fix: "mysql --xml" now print NULL values the same way that "mysqldump --xml" does:
  
    <field name="name" xsi:nil="true" />
  
  to distinguish from empty strings:
  
    <field name="name"></field>
  
  and from string "NULL":
  
    <field name="name">NULL</field>
 2006-09-29 16:29:39 +05:00
bar@mysql.com/bar.intranet.mysql.r18.ru
53dea28352 Bug#21620 ALTER TABLE affects other columns 
Problem: for character sets having mbmaxlen==2,
  any ALTER TABLE changed TEXT column type to MEDIUMTEXT,
  due to wrong "internal length to create length" formula.
  Fix: removing rounding code introduced in early 4.1 time,
  which is not correct anymore.
 2006-09-29 16:24:11 +05:00
istruewing@chilla.local
8148bf497a Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID 
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Merge from 5.0.
Changed auto_increment handling to the 5.1 pattern.
 2006-09-29 13:23:33 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
15887b602b Bug#19960 Inconsistent results when joining InnoDB tables using partial UTF8 indexes 
Adding a multibyte-aware VARCHAR copying function, to put correct column prefix,
  taking in account number of characters (instead just limiting on number of bytes).
  For example, for a KEY(col(3)) on a UTF8 column when copying the string 'foo bar foo',
  we should put only 3 leftmost characters: 'foo'.
  9 characters were incorrectly put before this fix.
 2006-09-29 16:15:57 +05:00
gkodinov@dl145s.mysql.com
0012fb3ed6 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-09-29 11:30:35 +02:00
dlenev@mockturtle.local
f9b3f1300b Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-29 13:25:33 +04:00
gkodinov@dl145s.mysql.com
0293b69ac7 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-29 11:21:40 +02:00
dlenev@mockturtle.local
76c5979f9e Merge mockturtle.local:/home/dlenev/src/mysql-4.1-bg22338-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-09-29 12:36:12 +04:00
dlenev@mockturtle.local
b0e896960c Fixed test-case after merge (removed duplicate part). 2006-09-29 12:27:21 +04:00
istruewing@chilla.local
8655a80cda Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug22384
 2006-09-29 09:29:37 +02:00
dlenev@mockturtle.local
a4ee7ec153 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
 2006-09-29 10:55:03 +04:00
jimw@rama.(none)
7a23b1baf7 Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-28 20:20:33 -07:00
jimw@rama.(none)
2961966b3b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 20:17:17 -07:00
jimw@rama.(none)
d5d89bcf63 Fix merge of __attribute__ cleanup. 2006-09-28 20:15:58 -07:00
cmiller@zippy.cornsilk.net
f53e014f75 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 21:42:00 -04:00
cmiller@zippy.cornsilk.net
2067fbcaf7 Fixed bad fix for a bad merge. 2006-09-28 21:40:43 -04:00
jimw@rama.(none)
caf4392f71 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-28 18:11:29 -07:00
jimw@rama.(none)
68eadc8a79 Merge rama.(none):/home/jimw/my/mysql-4.1-clean 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 18:09:10 -07:00
jimw@rama.(none)
c8801bcecc Merge rama.(none):/home/jimw/my/mysql-5.0-clean 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-28 18:00:26 -07:00
jimw@rama.(none)
a2e8d08bd2 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 17:57:45 -07:00
jimw@rama.(none)
9c3012e646 Merge rama.(none):/home/jimw/my/mysql-5.0-18246 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-09-28 17:56:51 -07:00
evgen@moonbone.local
dead2e0f14 view.test: 
After merge fix
 2006-09-29 01:35:11 +04:00
evgen@moonbone.local
ee67c4c453 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/5505-bug-5.0-opt-mysql
 2006-09-29 01:01:52 +04:00
evgen@moonbone.local
f6fbbf2002 Fixed bug#5505: Wrong error message on INSERT into a view 
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
 2006-09-29 01:00:18 +04:00
svoj@mysql.com/april.(none)
15d330ebce After merge fix. 2006-09-29 01:36:17 +05:00
iggy@rolltop.ignatz42.dyndns.org
06ea6d7323 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-09-28 15:56:14 -04:00
iggy@rolltop.ignatz42.dyndns.org
3f2c9aa796 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 15:56:05 -04:00
istruewing@chilla.local
d56f3c3398 Merge chilla.local:/home/mydev/mysql-5.0-bug22384 
into  chilla.local:/home/mydev/mysql-5.1-bug22384
 2006-09-28 21:55:03 +02:00
iggy@rolltop.ignatz42.dyndns.org
78154af633 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-09-28 15:54:59 -04:00
istruewing@chilla.local
00a7b0e834 Merge chilla.local:/home/mydev/mysql-4.1-bug22384 
into  chilla.local:/home/mydev/mysql-5.0-bug22384
 2006-09-28 21:50:46 +02:00
dlenev@mockturtle.local
acaa584c55 Fix for bug#22338 "Valgrind warning: uninitialized variable in 
create_tmp_table()".

The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
result" introduced valgrind warnings which occured during execution
of information_schema.test and sp-prelocking.test in version 5.0.
There were no user visible effects.

The latter fix made create_tmp_table() dependant on
THD::lex::current_select value. Valgrind warnings occured when this
function was executed and THD::lex::current_select member pointed
to uninitialized SELECT_LEX instance.

This fix tries to remove this dependancy by moving some logic
outside of create_tmp_table() function.
 2006-09-28 23:47:49 +04:00
istruewing@chilla.local
fd2a6a7a40 Merge chilla.local:/home/mydev/mysql-4.0-bug22384 
into  chilla.local:/home/mydev/mysql-4.1-bug22384
 2006-09-28 21:47:42 +02:00
cmiller@zippy.cornsilk.net
fa6bd76b09 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 15:46:08 -04:00
cmiller@zippy.cornsilk.net
8dd3e7f489 Fixed incorrect merge of gluh's reversion of B-g#21432. 2006-09-28 15:45:17 -04:00
iggy@rolltop.ignatz42.dyndns.org
d0d057a43c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 15:36:59 -04:00
iggy@rolltop.ignatz42.dyndns.org
ff66360d99 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my50-bug22224 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224
 2006-09-28 15:30:22 -04:00
svoj@april.(none)
7ed413d17b Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.1-engines
 2006-09-29 00:23:43 +05:00
iggy@rolltop.ignatz42.dyndns.org
e89c10e99c Bug#22224: Windows build depends on ib_config.h 
This change has already been made to 5.1.
 2006-09-28 15:18:33 -04:00
svoj@mysql.com/april.(none)
ad7da7f1de Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
 2006-09-29 00:00:27 +05:00
iggy@rolltop.ignatz42.dyndns.org
70dcbe3e6c Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
 2006-09-28 14:33:39 -04:00
iggy@rolltop.ignatz42.dyndns.org
d36444a9ec Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
 2006-09-28 14:32:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2 Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) 2006-09-28 14:30:20 -04:00
brian@zim.(none)
bb09a2a940 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 11:25:02 -07:00
iggy@rolltop.ignatz42.dyndns.org
8668dfc2f6 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-09-28 14:12:11 -04:00
iggy@rolltop.ignatz42.dyndns.org
e58341f53b Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my50-bug21449 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21449/my51-bug21449
 2006-09-28 14:01:12 -04:00
iggy@rolltop.ignatz42.dyndns.org
b7e1578264 Bug #21449 How to Resolve Stack Trace URL in MySQLD error log is incorrect. 2006-09-28 13:58:53 -04:00
brian@zim.(none)
542cf080a4 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-28 10:51:56 -07:00