mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33705 commits 2780 branches 343 tags 1.6 GiB
Commit graph

33705 commits

This branch
This branch
All branches
Author SHA1 Message Date
elliot@mysql.com
bd01c06791 Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge-tiny
 2006-04-27 17:16:27 -04:00
msvensson@shellback.(none)
480a55287d Disable udf.test 2006-04-27 22:30:14 +02:00
msvensson@shellback.(none)
f45b26a75e Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-27 22:24:32 +02:00
msvensson@shellback.(none)
f52247a6e8 Fix merge error 2006-04-27 22:21:23 +02:00
msvensson@shellback.(none)
6aa775f348 Return empty string if file does not exist 
Set LD_LIBRARY_PATH and UDF_EXAMPLE_LIB from $lib_udf_example
 2006-04-27 21:26:24 +02:00
jimw@mysql.com
0b8d17aae0 Merge mysql.com:/home/jimw/my/mysql-5.0-19393 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-27 10:56:44 -07:00
jimw@mysql.com
36155b63eb Bug #19393: Federated tests fail on Windows under pushbuild 
Supplying --skip-rpl to mysql-test-run.pl would always disable the
  slaves, but those slaves may still be needed for the federated tests.
  Now we only disable the slaves when they are not used by any of the
  tests.
 2006-04-27 10:53:19 -07:00
msvensson@shellback.(none)
e5004d1312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-27 17:35:29 +02:00
msvensson@neptunus.(none)
98a7bbe109 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-27 17:30:56 +02:00
msvensson@shellback.(none)
0e5113aead Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is. 
Then check in have_udf if that variable is set. Finally use tahe variable when loading the shared library.
 2006-04-27 16:32:40 +02:00
mskold@mysql.com
8af6442ead Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
 2006-04-27 15:31:32 +02:00
mskold@mysql.com
f42ceea8e6 Disabled rpl_ndb_dd_partitions, new slogan 2006-04-27 15:29:10 +02:00
mskold@mysql.com
92cac65fc1 Added verification test of on-line (non-copying) alter table 2006-04-27 15:13:21 +02:00
paul@polar.kitebird.com
46ee4ea0df Merge polar.kitebird.com:/src/extern/MySQL/bk/mysql-4.1 
into  polar.kitebird.com:/src/extern/MySQL/bk/mysql-5.0
 2006-04-27 07:53:15 -05:00
paul@polar.kitebird.com
7162fa4a1a set_var.cc: 
System variable was added out of lexical order.
 2006-04-27 07:51:56 -05:00
kent@mysql.com
dd2165f6b9 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
 2006-04-27 11:38:48 +02:00
kent@mysql.com
7b409a61ba Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-27 11:28:15 +02:00
mskold@mysql.com
b6f64a520b Enabled rpl_ndb_dd_partitions to see if it still fails 2006-04-27 10:20:33 +02:00
jonas@perch.ndb.mysql.com
792535eb23 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-27 08:52:20 +02:00
msvensson@neptunus.(none)
e574d946c3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-04-27 08:42:36 +02:00
tomas@poseidon.ndb.mysql.com
a18e5b88f8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-27 08:37:45 +02:00
tomas@poseidon.ndb.mysql.com
27739485a9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-27 08:25:55 +02:00
jimw@mysql.com
31a428928e Fix bug in ndbcluster.sh on Solaris (now that line is the same as in 5.1) 2006-04-26 20:50:27 -07:00
jimw@mysql.com
58cb2f317c Remove obsolete test 2006-04-26 17:09:41 -07:00
jimw@mysql.com
f8bfecdf2f Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 15:29:32 -07:00
sergefp@mysql.com
b364d2d388 Merge mysql.com:/home/psergey/bk-trees/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2006-04-27 01:41:27 +04:00
tomas@poseidon.ndb.mysql.com
5c31b5d6c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-04-26 23:10:36 +02:00
tomas@poseidon.ndb.mysql.com
33d169f89b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 23:10:32 +02:00
jimw@mysql.com
ca2b14e7b4 Merge mysql.com:/home/jimw/my/mysql-5.0-12792 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:39:48 -07:00
jimw@mysql.com
e848c7c293 Merge mysql.com:/home/jimw/my/mysql-5.0-18617 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:37:53 -07:00
evgen@moonbone.local
611d83b5b0 Merge 2006-04-26 22:35:40 +04:00
jimw@mysql.com
74ca82c857 Merge mysql.com:/home/jimw/my/mysql-5.0-16195 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:34:45 -07:00
jimw@mysql.com
d89054df4b Merge mysql.com:/home/jimw/my/mysql-5.0-19083 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-26 11:32:53 -07:00
serg@sergbook.mysql.com
8f888106ba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
 2006-04-26 10:24:47 -07:00
serg@sergbook.mysql.com
736ce8bf08 merged ul 2006-04-26 10:10:31 -07:00
jimw@mysql.com
960c5621eb Bug #17849: sql_big_selects not shown in SHOW VARIABLES output 
This patch simply adds sql_big_selects to the list of variables
  output by SHOW VARIABLES.
 2006-04-26 09:21:53 -07:00
brian@zim.(none)
11ec75e367 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zim.(none):/home/brian/mysql/mysql-5.0
 2006-04-26 09:20:58 -07:00
elliot@mysql.com
d96fbd738d The fix for bug#17248 accidentally removed the sync_binlog variable. 
This patch restores sync_binlog.
 2006-04-26 11:55:26 -04:00
kent@mysql.com
2e529b6e47 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
 2006-04-26 17:40:16 +02:00
mskold@mysql.com
6d01bcdf45 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-26 17:01:01 +02:00
tomas@poseidon.ndb.mysql.com
f12c6e9940 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-26 17:01:00 +02:00
mleich@mysql.com
be4faa067b Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:01:00 +02:00
mskold@mysql.com
4911a82c0e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-26 17:01:00 +02:00
ingo@mysql.com
7b78dca873 Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:59 +02:00
mleich@mysql.com
388d91f2e1 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:00:59 +02:00
mskold@mysql.com
63106c0634 Added test for violation of uniqueness constraint at create index 2006-04-26 17:00:59 +02:00
mskold@mysql.com
cb696feb0e Corrected include path to work under Windows 2006-04-26 17:00:58 +02:00
ingo@mysql.com
af385df39a Merge mysql.com:/home/mydev/mysql-5.1 
into  mysql.com:/home/mydev/mysql-5.1-bug18129
 2006-04-26 17:00:58 +02:00
mleich@mysql.com
578406665a Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
 2006-04-26 17:00:58 +02:00
aivanov@mysql.com
28e20421b5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
 2006-04-26 19:00:57 +04:00