mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
33018 commits 2784 branches 343 tags 1.6 GiB
Commit graph

33018 commits

This branch
This branch
All branches
Author SHA1 Message Date
mats@mysql.com
77c4a2ca60 WL#3259 (RBR with more columns on slave than on master): 
Extended replication to allow extra columns added last on slave
as compared with table on master.
 2006-05-03 15:00:38 +02:00
monty@mysql.com
ed809462e9 Fixed timeing problem by ignoring failures and results from first select after table definition change 2006-04-19 12:21:33 +03:00
monty@mysql.com
f636a4d43c Only run test with row based logging 2006-04-19 11:20:11 +03:00
monty@mysql.com
8901455d5b Fix wrong auto merge 2006-04-19 11:17:32 +03:00
monty@mysql.com
77b6bc4264 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-19 11:09:33 +03:00
monty@mysql.com
7af1f5e0b5 Fixed compilation error 
ensure check_if_legal_table_name is also defined on unix
 2006-04-19 11:08:22 +03:00
bar@mysql.com
1921fa59ab Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-04-19 12:52:54 +05:00
bar@mysql.com
b2315c6495 my_access.c: 
After merge fix.
 2006-04-19 12:51:30 +05:00
monty@mysql.com
feca86044f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-19 10:41:33 +03:00
monty@mysql.com
9ad5c2de05 Fix compilation failure when compiling with BUILD/compile-pentium-debug-max 
(Problem with embedded server and ndb)
Fix broken mysql-test-run.sh
Removed memory leak in ha_example.cc
 2006-04-19 10:39:57 +03:00
stewart@mysql.com
af2f420a10 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
 2006-04-19 17:32:13 +10:00
stewart@mysql.com
b59d84069f Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530 
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
 2006-04-19 17:30:24 +10:00
bar@mysql.com
a26f115a13 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 11:42:41 +05:00
bar@mysql.com
9686848d64 item_xmlfunc.cc: 
After review minor fixes for bug#16319
  Thanks to Gluh for suggestions.
 2006-04-19 11:11:47 +05:00
monty@mysql.com
adb59d9284 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-19 08:56:19 +03:00
bar@mysql.com
cedafc30e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
 2006-04-19 09:50:17 +05:00
bar@mysql.com
004854fbdd Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b16319
 2006-04-19 09:22:04 +05:00
jimw@mysql.com
a3a4ba937e Merge mysql.com:/home/jimw/my/mysql-5.1-ndb-cleanup 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-18 13:00:48 -07:00
jimw@mysql.com
0302bb4fdd Nuke all of the old_* directories in the ndb tree. 2006-04-18 12:12:46 -07:00
kent@mysql.com
64295d82d1 Merge 2006-04-18 17:16:27 +02:00
kent@mysql.com
de430a149e Merge 2006-04-18 16:58:21 +02:00
kent@mysql.com
8c420e29eb configure.in: 
Stepped up version to 5.0.20a
 2006-04-18 13:26:41 +02:00
msvensson@neptunus.(none)
1ea71459df Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
 2006-04-18 13:08:16 +02:00
msvensson@neptunus.(none)
c53f2320e4 Bug#18815 libmysql using yassl can't be linked with c program 
- Apply patch to remove dependency on C++ libs when linking "libmysql" from c
 2006-04-18 12:08:06 +02:00
kent@mysql.com
58c153c629 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-18 10:34:56 +02:00
serg@mysql.com
98ea03931e mysql.cc: 
revert bug#16855 "fix" per Monty's request
 2006-04-18 10:16:06 +02:00
monty@mysql.com
6043a95b5d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-04-18 11:06:12 +03:00
monty@mysql.com
f3e902ac2a Remove warnings about missing DBUG_RETURN's 2006-04-18 10:46:28 +03:00
petr@mysql.com
423119d214 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-04-18 08:47:22 +04:00
petr@mysql.com
de97f94a49 fix for Bug#18848 "SIGHUP crashes the server" (v2) 2006-04-18 08:43:13 +04:00
elliot@mysql.com
ac6450b858 BUG#19158 Fixing rpl_row_log_innodb test for pushbuild. 2006-04-18 00:30:55 -04:00
cmiller@zippy.(none)
ac6ae8f1f5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
 2006-04-17 18:57:02 -04:00
jimw@mysql.com
50bb7cc5f3 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-17 15:57:01 -07:00
cmiller@zippy.(none)
61552172df Fixing a merge from a few days ago. 
Without a flush this test is nondeterministic for "row" binlog-format.
 2006-04-17 18:57:01 -04:00
brian@zim.(none)
e4f70bc137 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-17 15:57:00 -07:00
pekka@mysql.com
9f355db66e Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-04-18 00:56:59 +02:00
brian@zim.(none)
6f986a344b UNIXWARE removal 2006-04-17 15:56:59 -07:00
mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se
9c6aef5b4e BUG#18752 
Fixed forgotten merge fix
 2006-04-17 18:56:58 -04:00
pekka@mysql.com
4d1e38744d ndb - bug#16796 2006-04-17 20:24:41 +02:00
jimw@mysql.com
7e573aa5d0 Merge mysql.com:/home/jimw/my/mysql-5.1-19059 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-17 10:06:17 -07:00
jimw@mysql.com
80b8563690 Bug #19059: Failure to get version information when running from source tree 
Fix the way that instance manager finds the version number of instances,
  so that it works properly when the executable name isn't the same as what
  the instance-manager launched, such as when wrapping a libtool-wrapped
  executable from the source tree.

  This removes the 'Ver ' reported in the version column output by
  'SHOW INSTANCE STATUS ...', but the format of this column is not
  documented (and is pretty free-form to begin with).
 2006-04-17 09:38:50 -07:00
brian@zim.(none)
93f965d1fe Found one piece I missed when I removed HAVE_mit (just broke on windows and I don't have windows locally). This I believe should fix it. 2006-04-16 22:10:56 -07:00
brian@zim.(none)
98f2cd4468 Fixed a few pieces around support for data directory. 2006-04-16 21:55:02 -07:00
brian@zim.(none)
79a50551cb Adding back support for loadable engines. 2006-04-16 13:08:14 -07:00
brian@zim.(none)
3831083b15 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-16 08:03:15 -07:00
petr@mysql.com
d99cbca22f fix broken compile 2006-04-16 14:38:52 +04:00
brian@zim.(none)
f6f03576c6 This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree) 2006-04-16 01:50:25 -07:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
brian@zim.(none)
53dce52086 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-15 08:50:56 -07:00
brian@zim.(none)
ba2502b9c3 Another long patch to remove the rest of the OS2 support. 2006-04-15 08:49:00 -07:00