database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
46,939 Commits 3,270 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
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
msvensson@shellback.(none)
d6ad8e3ea1 Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands 
into  shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-09-29 11:35:17 +02:00
msvensson@shellback.(none)
b7977855e4 Add possibility to specify which delimiter to read until in "write_file" and "perl" commands 
fix memory leaks reported by valgrind
 2006-09-29 11:32:40 +02:00
msvensson@shellback.(none)
b9eda58afb Merge shellback.(none):/home/msvensson/mysql/my51-mysqltest-new-commands 
into  shellback.(none):/home/msvensson/mysql/same_tools/my51-same_tools
 2006-09-29 11:32:09 +02: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
holyfoot/hf@deer.(none)
b07168bac5 Merge mysql.com:/home/hf/work/16813/my50-16813 
into  mysql.com:/home/hf/work/16813/my51-16813
 2006-09-29 12:17:33 +05:00
holyfoot/hf@mysql.com/deer.(none)
3474fc9afd bug #16813 (WITH CHECK OPTION fails with UPDATE) 
We use the condition from CHECK OPTION twice handling UPDATE command.
First we construnct 'update_cond' AND 'option_cond'
condition to select records to be updated, then we check the
'option_cond' for the updated row.
The problem is that first 'AND' condition is optimized during the 'select'
which can break 'option_cond' structure, so it will be unusable for
the sectond use - to check the updated row.
Possible soultion is either use copy of the condition in the first
use or to make optimization less traumatic for the operands.
I picked the first one.
 2006-09-29 12:16:07 +05: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
cmiller@zippy.cornsilk.net
2067fbcaf7 Fixed bad fix for a bad merge. 2006-09-28 21:40:43 -04: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
evgen@moonbone.local
e0461067b8 Fixed bug#20503: Server crash due to the ORDER clause not taken into account 
while space allocation

Under some circumstances DISTINCT clause can be converted to grouping.
In such cases grouping is performed by all items in the select list.
If an ORDER clause is present then items from it is prepended to group list.
But the case with ORDER wasn't taken into account when allocating the
array for sum functions. This leads to memory corruption and crash.

The JOIN::alloc_func_list() function now allocates additional space if there
is an ORDER by clause is specified and DISTINCT -> GROUP BY optimization is
possible.
 2006-09-29 00:50:00 +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
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
cmiller@zippy.cornsilk.net
8dd3e7f489 Fixed incorrect merge of gluh's reversion of B-g#21432. 2006-09-28 15:45:17 -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
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
svoj@mysql.com/april.(none)
2de51adffa Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
 2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b BUG#21617 - crash when selecting from merge table with inconsistent indexes 
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.
 2006-09-28 22:10:06 +05:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
5962886dce bug#22027: CREATE TABLE IF NOT EXISTS SELECT logged improperly with rbr binlog, 
and #22762: create talbe if not exists like a-temp-table binlogged w/o "if not exists"
    These are rbr bugs.
    store_create_info, which generates the create statement e.g for binlogging,
    did not account a lex option HA_LEX_CREATE_IF_NOT_EXISTS.
    
    The fix makes the generated query to include the parent's statement option
if
  that was supplied.
 2006-09-28 18:51:27 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
a8c9d45dfc Result of a binlog_statement_insert_delayed was affected by recent fixing of 
binlog_row_binlog.test failure in team tree.
  Fixing the result that gets wrong with --binlog-format=mixed
(so that skipped on pushbuild currently)
 2006-09-28 18:42:41 +03:00
aelkin/elkin@dsl-hkigw8-feb9fb00-191.dhcp.inet.fi
9f75ff2c28 the results of binlog_statement_insert_delayed in STATEMENT - non-recommended mode i.e not checked 
by make test - got changed due to show binlog events relocation to deterministic
position at extra/binlog_tests/binlog_insert_delayed.test.
 2006-09-28 17:55:45 +03:00
cmiller@zippy.cornsilk.net
43bdd2c2ed Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:32:37 -04:00
cmiller@zippy.cornsilk.net
e72bc63906 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-09-28 10:15:32 -04:00
cmiller@zippy.cornsilk.net
b2ee81a6ec Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-09-28 10:09:57 -04:00
cmiller@zippy.cornsilk.net
56d2406375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-28 10:02:53 -04:00
msvensson@neptunus.(none)
485772e308 Bug#22436 Four tests require "innodb" to be configured, fail in "classic" build 
- Disable warnings when creating the "innodb" tables if it works anyway.
 - Move test that are really innodb dependent to innodb_mysql
 2006-09-28 15:13:40 +02:00
gluh@gluh.(none)
12b3672a69 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2006-09-28 18:03:00 +05:00
gkodinov@dl145s.mysql.com
41a2631cb3 Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:53:31 +02:00
gkodinov@dl145s.mysql.com
7a84e12442 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-09-28 14:52:09 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
326a56dc3f Fix for bug #22271: data casting may affect data stored in the next column(s?) 
Using wrong filling value may cause unneeded extra bit rewriting.

Fix: use proper value to fill uneven bits.
 2006-09-28 17:00:29 +05:00
msvensson@neptunus.(none)
5f099df3be Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-28 13:54:48 +02:00
evgen@moonbone.local
16f59a5e56 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  moonbone.local:/work/18360-bug-5.1-opt-mysql
 2006-09-28 15:53:22 +04:00
anozdrin/alik@alik.
107d6ca01d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2006-09-28 15:41:49 +04:00
anozdrin/alik@alik.
ba96c5aed6 5.0-rt -> 5.1-rt after-merge fixes. 2006-09-28 15:40:23 +04:00