mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41202 commits 2793 branches 343 tags 1.5 GiB
Commit graph

41202 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
c134b8c332 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-11-29 10:22:43 +01:00
df@kahlann.erinye.com
1c46f7d841 minor fix 2006-11-29 10:21:59 +01:00
gkodinov@dl145s.mysql.com
40684173ad Merge bk-internal:/home/bk/mysql-5.1 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
 2006-11-29 10:21:13 +01:00
msvensson@shellback.(none)
72ad912b0b Update result file for func_misc to 5.1 version format 2006-11-29 10:11:36 +01:00
kostja@bodhi.local
2525e16c73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 11:44:37 +03:00
msvensson@shellback.(none)
710e731e2f Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import 
into  shellback.(none):/home/msvensson/mysql/yassl_import/my51-yassl_import
 2006-11-29 09:27:43 +01:00
msvensson@shellback.(none)
838d1d53b4 Import version 1.50 of yaSSL 2006-11-29 09:21:37 +01:00
kostja@bodhi.local
644639fcbd Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 11:19:55 +03:00
df@kahlann.erinye.com
32b88b0d7c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-11-29 09:18:06 +01:00
ramil/ram@myoffice.izhnet.ru
e4c17c72b7 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
 2006-11-29 10:59:52 +04:00
msvensson@shellback.(none)
284413154d Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 07:55:22 +01:00
holyfoot/hf@deer.(none)
1fbc0cfb2b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/hf/work/thfix/my51-thfix
 2006-11-29 10:23:26 +04:00
holyfoot/hf@mysql.com/deer.(none)
eb1b05c0bd Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/thfix/my50-thfix
 2006-11-29 10:19:38 +04:00
holyfoot/hf@deer.(none)
5ae9769270 Merge mysql.com:/home/hf/work/thfix/my50-thfix 
into  mysql.com:/home/hf/work/thfix/my51-thfix
 2006-11-29 09:51:29 +04:00
ramil/ram@myoffice.izhnet.ru
726af26ac7 Merge mysql.com:/usr/home/ram/work/bug22229/my50-bug22229 
into  mysql.com:/usr/home/ram/work/bug22229/my51-bug22229
 2006-11-29 09:42:59 +04:00
holyfoot/hf@mysql.com/deer.(none)
0434b70f3a Merge mysql.com:/home/hf/work/thfix/my41-thfix 
into  mysql.com:/home/hf/work/thfix/my50-thfix
 2006-11-29 09:24:35 +04:00
holyfoot/hf@mysql.com/deer.(none)
0b614d0025 fixed compilation failure on hpux 
the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.
 2006-11-29 09:23:54 +04:00
brian@zim.(none)
8a9c481e0d Varchar hack to clean strings removed. 2006-11-28 18:30:41 -08:00
kostja@bodhi.local
5fea0724bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 02:44:12 +03:00
kostja@bodhi.local
bf3fbb44ae Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-29 02:39:17 +03:00
tsmith/tim@siva.hindu.god
2a0e2d1d38 rpl_init_slave.result: 
Update test result due to fix for bug 23883.
 2006-11-28 16:39:04 -07:00
iggy@rolltop.ignatz42.dyndns.org
761a88ee0d Bug#20836 Selecting into variables results in wrong results being returned 
This error is displayed anytime the SELECT statement needs a temp table to
return correct results because the object (select_dumpvar) that represents
variables named in the INTO clause stored the results before the temp
table was considered.  The problem was fixed by creating the necessary
Item_func_set_user_var objects once the correct data is ready.
 2006-11-28 17:21:39 -05:00
msvensson@neptunus.(none)
3a50528940 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 23:12:22 +01:00
msvensson@neptunus.(none)
f3b242eac0 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-11-28 23:12:12 +01:00
msvensson@neptunus.(none)
2b98e19bb5 Remove the moved check a second time. 2006-11-28 23:09:17 +01:00
msvensson@neptunus.(none)
6dd62468bd Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 23:07:02 +01:00
msvensson@neptunus.(none)
7eb487ab26 Move the check that $opt_vardir could be created and was writable to the function 
where we know how to creat the vardir 
Remove unused variable
 2006-11-28 23:06:06 +01:00
msvensson@neptunus.(none)
ef582b9fa6 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 22:35:00 +01:00
knielsen/pushbuild@production.mysql.com
afd96d6498 More fully disable ccache when not compatible with gcov. 
This helps on systems where `which gcc` really points to ccache.
 2006-11-28 22:31:05 +01:00
baker@bk-internal.mysql.com
f175a892ab Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-28 22:22:52 +01:00
msvensson@neptunus.(none)
e5cf7f9f19 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-11-28 22:19:07 +01:00
msvensson@neptunus.(none)
bb0d7ed44b Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 22:17:26 +01:00
msvensson@neptunus.(none)
9235e363a3 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 22:16:52 +01:00
msvensson@neptunus.(none)
05eb532514 Bug#24335 mysql-test-run.pl fails with ActiveState Perl on Windows 
- Avoid use of mtr_run when executing "mysqld --verbose --help" to find
   version and supported features
 2006-11-28 22:16:31 +01:00
msvensson@neptunus.(none)
0c48000e6c Fix missing parameter declaration 2006-11-28 21:57:42 +01:00
joerg@trift2.
bffbf46c4d Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-28 21:54:32 +01:00
msvensson@neptunus.(none)
35ad2a1649 Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-11-28 21:25:35 +01:00
msvensson@neptunus.(none)
627a0bf0b4 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 21:20:56 +01:00
msvensson@neptunus.(none)
cc747a02b3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 21:11:05 +01:00
cmiller@zippy.cornsilk.net
f983166c01 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-28 15:08:16 -05:00
kent@kent-amd64.(none)
b398110b00 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-28 21:04:31 +01:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
b87c49f920 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-11-28 20:52:06 +01:00
msvensson@neptunus.(none)
e61b7b9f64 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 20:51:09 +01:00
msvensson@neptunus.(none)
80d6de7e56 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 20:00:54 +01:00
msvensson@neptunus.(none)
fa8af12651 Look for client binaries also in bin/ directory 2006-11-28 20:00:27 +01:00
kostja@bodhi.local
9de58810eb Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-24486
 2006-11-28 21:58:08 +03:00
msvensson@neptunus.(none)
d74ffcd317 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-11-28 19:55:29 +01:00
msvensson@neptunus.(none)
7c9d0abb19 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-28 19:54:52 +01:00
msvensson@neptunus.(none)
2346ee93ed Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-28 19:54:37 +01:00