database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-11 05:52:26 +03:00
Code Activity
50,388 Commits 3,174 Branches 363 Tags
c41f8b65b5ebaf8594bc01998436a611912d4b10
Commit Graph

50388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ramil/ram@ramil.myoffice.izhnet.ru
c41f8b65b5 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b30679/b30679.5.1
 2007-10-31 11:40:53 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
030d1a1945 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b30654/b30654.5.1
 2007-10-31 11:01:52 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
0a11bc2a1f Merge mysql.com:/home/ram/work/b30654/b30654.5.0 
into  mysql.com:/home/ram/work/b30654/b30654.5.1
 2007-10-31 10:57:10 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
38b3b36754 Fix for bug #30654: mysqlcheck fails during upgrade of tables whose 
names include backticks or blank

Problem: mysqlcheck doesn't escape backtick characters in the table names.

Fix: escape them.
 2007-10-30 12:51:57 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
9d57de144f after-merge fix-up. 2007-10-29 20:31:03 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
b6a808bd1f Merge mysql.com:/home/ram/work/b31137/b31137.5.0 
into  mysql.com:/home/ram/work/b31137/b31137.5.1
 2007-10-29 17:34:01 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1317a63b40 Merge mysql.com:/home/ram/work/b30782/b30782.5.0 
into  mysql.com:/home/ram/work/b30782/b30782.5.1
 2007-10-29 13:16:26 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
98a4d99961 Fix for bug #30782: Truncated UNSIGNED BIGINT columns only in SELECT w/ CASE, 
JOIN, and ORDER BY

Problem: improper maximum length calculation of the CASE function leads to 
decimal value truncation (storing/retrieving decimal field values).

Fix: accurately calculate maximum length/unsigned flag/decimals parameters 
of the CASE function.
 2007-10-29 12:20:21 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
8ec674dd0c Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no == 0, 
file .\ha_innodb.

Problem: if a partial unique key followed by a non-partial one we declare
the second one as a primary key.

Fix: sort non-partial unique keys before partial ones.
 2007-10-26 15:37:38 +05:00
kaa@polly.(none)
1d2f73eb9c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-25 08:22:14 +04:00
kaa@polly.(none)
3494f691c1 Replaced 'return' with DBUG_RETURN() in the fix for bug #31566. 2007-10-25 08:19:57 +04:00
tsmith@ramayana.hindu.god
84e02ecc8d Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-24 18:40:47 -06:00
tsmith@ramayana.hindu.god
15e4a8cae8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-24 18:37:57 -06:00
tsmith@ramayana.hindu.god
72204e23fc Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-24 17:07:43 -06:00
tsmith@ramayana.hindu.god
60be8cc144 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-24 17:07:17 -06:00
kaa@polly.(none)
7584f88c86 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-24 23:13:16 +04:00
kaa@polly.(none)
7fab2f1414 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-24 23:07:10 +04:00
kaa@polly.(none)
d11539ee59 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-24 23:01:31 +04:00
kaa@polly.(none)
63ca7570af Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-24 21:39:00 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
bb79b4662f Fix for bug #30679: 5.1 name encoding not performed for views during upgrade 
Problem: we skip views perfoming --fix-table-names.

Fix: rename views as well.
 2007-10-24 22:36:57 +05:00
kaa@polly.(none)
2c9720c20e Merge polly.(none):/home/kaa/src/maint/bug31566/my50-bug31566 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-24 21:30:38 +04:00
kaa@polly.(none)
78aa659979 Fix for bug #31566: my_write(fd, 0x0, 0, flags) fails with EFAULT on 
some platforms

Since the behavior of write(fd, buf, 0) is undefined, it may fail with
EFAULT on some architectures when buf == NULL. The error was propagated
up to a caller, since my_write() code did not handle it properly.

Fixed by checking the 'number of bytes' argument in my_write() and
returning before calling the write() system call when there is nothing
to write.
 2007-10-24 21:16:20 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
71c91960db Merge mysql.com:/home/ram/work/mysql-4.1-maint 
into  mysql.com:/home/ram/work/b31615/b31615.4.1
 2007-10-24 21:57:54 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
1cf8aaff52 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31615/b31615.5.0
 2007-10-24 21:57:51 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d05c05a8ca Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31615/b31615.5.1
 2007-10-24 21:56:32 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c380020a7e after-merge fix: new sys_var_character_set_client classs introduced to perform 
separate checking.
 2007-10-24 13:28:46 +05:00
msvensson@pilot.mysql.com
d3293988d8 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-24 08:35:22 +02:00
msvensson@pilot.mysql.com
2f852c126f Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
 2007-10-23 13:16:31 +02:00
msvensson@pilot.mysql.com
d3527572d5 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-23 13:16:15 +02:00
msvensson@pilot.mysql.com
a8fedcb4d4 Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
 2007-10-23 13:15:35 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
a24102a099 Merge mysql.com:/home/ram/work/b31615/b31615.5.0 
into  mysql.com:/home/ram/work/b31615/b31615.5.1
 2007-10-23 16:14:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
08a7c95ad3 Merge mysql.com:/home/ram/work/b31615/b31615.4.1 
into  mysql.com:/home/ram/work/b31615/b31615.5.0
 2007-10-23 16:04:32 +05:00
msvensson@pilot.mysql.com
2595a8d01b Merge pilot.mysql.com:/data/msvensson/mysql/bug30560/my50-bug30560 
into  pilot.mysql.com:/data/msvensson/mysql/bug30560/my51-bug30560
 2007-10-23 12:54:26 +02:00
tnurnberg@white.intern.koehntopp.de
b3c2bc8cc4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 12:38:09 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
017ba8dadb Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 15:26:14 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
dbadc0e2cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.0
 2007-10-23 15:14:58 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ccb83d681e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 15:13:47 +05:00
msvensson@pilot.mysql.com
acd497ad71 Bug#30560 Valgrind option to mysql-test-run with spaces in cause strange error 2007-10-23 11:52:55 +02:00
kaa@polly.(none)
c2dd16065c Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-23 13:44:04 +04:00
kaa@polly.(none)
e10f699931 Merge polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-23 13:39:31 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
30b8fdf535 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 14:31:53 +05:00
kaa@polly.(none)
0aa8710037 Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-23 13:31:24 +04:00
kaa@polly.(none)
5fe9f0f7dd Merge polly.(none):/home/kaa/src/maint/bug30453/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/bug30453/my51-bug28878
 2007-10-23 13:19:54 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
488e3e4943 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 14:07:44 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
d035e5c8f9 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b31349/b31349.5.0
 2007-10-23 14:06:26 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c7528dff69 Merge mysql.com:/home/ram/work/b31349/b31349.5.0 
into  mysql.com:/home/ram/work/b31349/b31349.5.1
 2007-10-23 13:55:06 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a3bc9cd136 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31604/b31604.5.1
 2007-10-23 13:54:40 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
4b7a4efa4f Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b31285/b31285.5.1
 2007-10-23 13:05:40 +05:00
tnurnberg@mysql.com/white.intern.koehntopp.de
e9229319c9 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 08:54:20 +02:00
tnurnberg@mysql.com/white.intern.koehntopp.de
b7599f4b1b Merge mysql.com:/scratch/tnurnberg/20901/50-20901 
into  mysql.com:/scratch/tnurnberg/20901/51-20901
 2007-10-23 07:09:56 +02:00