mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27547 commits 2774 branches 343 tags 1.6 GiB
Commit graph

27547 commits

This branch
This branch
All branches
Author SHA1 Message Date
sergefp@mysql.com
7357e470a4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug14026-r2
 2005-11-03 11:20:01 +03:00
sergefp@mysql.com
8fefb36800 Merged 2005-11-03 10:28:12 +03:00
holyfoot@mysql.com
c2640d292a Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.13573
 2005-11-03 11:05:34 +04:00
evgen@moonbone.local
69d985cc9d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-03 01:51:47 +03:00
evgen@moonbone.local
93cc0de7cf func_gconcat.result: 
Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement
 2005-11-03 01:50:36 +03:00
evgen@moonbone.local
005eaff6b8 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-02 21:47:35 +03:00
monty@mysql.com
9946b15b3d Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 19:44:10 +02:00
konstantin@mysql.com
c2f224be5e Fix -ansi -pedantic compilation failure 2005-11-02 20:44:09 +03:00
monty@mysql.com
74b3e9ae76 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 19:28:50 +02:00
monty@mysql.com
f2f4bf5240 wait_for_update must unlock mutex. 
(Fixed failure in rpl0000008.test)
 2005-11-02 19:28:49 +02:00
monty@mysql.com
9cab1f08fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-02 19:09:29 +02:00
evgen@moonbone.local
c347c60998 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14466-bug-5.0-mysql
 2005-11-02 18:00:13 +03:00
holyfoot@mysql.com
dc78f2ea4d Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.13573
 2005-11-02 18:58:25 +04:00
holyfoot@deer.(none)
4eea84268b Additional fix for #13573 2005-11-02 18:46:13 +04:00
monty@mysql.com
65034c9fb2 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 16:29:00 +02:00
monty@mysql.com
2018f26ec0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 16:28:59 +02:00
monty@mysql.com
54d9d2e116 Portability fix 
(BDB test failed in Intel64)
 2005-11-02 16:28:58 +02:00
monty@mysql.com
c228d1a9aa Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 15:45:26 +02:00
monty@mysql.com
a7c6a100f0 Use --with-openssl instead of --with-yassl for now 2005-11-02 15:45:25 +02:00
bell@sanja.is.com.ua
efbdd24c96 found problem removed 2005-11-02 15:17:57 +02:00
monty@mysql.com
8acd43c4a6 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 14:57:19 +02:00
monty@mysql.com
b43ca42959 Build max builds with --yassl instead of openssl 2005-11-02 14:57:18 +02:00
monty@mysql.com
4e452a71e4 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-02 14:43:26 +02:00
monty@mysql.com
164b469660 Fixed wrong merge 
Optimize new pushed code
 2005-11-02 14:43:25 +02:00
monty@mysql.com
438e8b6d6a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-02 14:35:07 +02:00
bell@sanja.is.com.ua
35cc6325a7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner-5.0
 2005-11-02 12:56:19 +02:00
holyfoot@mysql.com
6b5c422fe1 Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.13573
 2005-11-02 13:01:21 +04:00
sergefp@mysql.com
96ff1e808a BUG#14026: When doing the end-of-prepare fix up for TABLE_LISTs used in the PS, do the fixup 
for underlying tables of a merge VIEWs, too.
 2005-11-02 07:05:19 +03:00
patg@krsna.patg.net
50817d304b Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-11-01 17:07:13 -08:00
monty@mysql.com
57f15d10ba Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-11-01 22:58:24 +02:00
monty@mysql.com
2c41c77034 Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/my/mysql-5.0
 2005-11-01 22:15:09 +02:00
jimw@mysql.com
bb34222087 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-01 12:15:08 -08:00
monty@mysql.com
3a072a0eef Added missing DBUG_ENTER (bug in last push) 2005-11-01 21:59:24 +02:00
monty@mysql.com
f10399d77e Add missing return 
Compile max with --yassl instead of --with-openssl
 2005-11-01 21:57:24 +02:00
tim@siva.hindu.god
198ead8f4e merge 2005-11-02 08:46:13 +13:00
evgen@moonbone.local
db3b5c50bc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/14186-bug-5.0-mysql
 2005-11-01 21:55:39 +03:00
andrey@lmy004.
d4d777fdf0 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy004.:/work/mysql-5.0-bug14381
 2005-11-01 19:41:24 +01:00
andrey@lmy004.
3a08c5257a fix for bug #14381 
(BDB keylength limitted to 255)
 2005-11-01 19:37:59 +01:00
evgen@moonbone.local
6d3bd1e0ee sql_update.cc: 
After merge fix
 2005-11-01 20:53:27 +03:00
jimw@mysql.com
d012c49ebf Merge mysql.com:/home/jimw/my/mysql-4.1-13774 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-01 09:38:41 -08:00
patg@krsna.patg.net
add878e818 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2
 2005-11-01 09:08:50 -08:00
lars@mysql.com
aa7dd94962 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
 2005-11-01 18:08:24 +01:00
evgen@moonbone.local
bbe58c7e26 Manually merged 2005-11-01 19:47:53 +03:00
lenz@mysql.com
f2eeaca387 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
 2005-11-01 17:46:00 +01:00
lars@mysql.com
13686ee371 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-base64
 2005-11-01 17:41:59 +01:00
lenz@mysql.com
72343cef75 Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
 2005-11-01 17:39:09 +01:00
hf@deer.(none)
0ec768c407 Conflicts resolving 2005-11-01 20:37:27 +04:00
evgen@moonbone.local
47059b89f5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14186-bug-4.1-mysql
 2005-11-01 17:34:19 +03:00
evgen@moonbone.local
2343ff86ca Fix bug #14466 lost sort order in GROUP_CONCAT() in a view 
Item_func_group_concat::print() wasn't printing sort order thus creating wrong
view. This results in reported error.
 2005-11-01 17:27:10 +03:00
monty@mysql.com
e5f48e13bf Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort 
Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
 2005-11-01 15:54:30 +02:00