Commit graph

30376 commits

Author SHA1 Message Date
konstantin@mysql.com
19018128a3 Merge mysql.com:/home/kostja/mysql/tmp_merge1
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 00:21:22 +03:00
konstantin@mysql.com
5ed755d0d8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
jmiller@mysql.com
ea22f9eaa6 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 19:00:05 +01:00
jmiller@mysql.com
9e25eed679 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 18:44:58 +01:00
reggie@linux.site
b23901d95b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-08 11:20:34 -06:00
reggie@big_geek.
60c99af520 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-02-08 11:20:33 -06:00
reggie@big_geek.
60af944d39 cmakefiles cleanup 2006-02-08 11:18:17 -06:00
jmiller@mysql.com
0a59884aad Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 17:48:22 +01:00
jmiller@mysql.com
be29712da5 updated results 2006-02-08 17:47:27 +01:00
jmiller@mysql.com
8e8235ff7c implement a reviw comments 2006-02-08 17:09:57 +01:00
jmiller@mysql.com
e3bfdb9b1c Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-08 16:52:34 +01:00
jmiller@mysql.com
dacf64b678 Implement suggestions from lars review 2006-02-08 16:47:46 +01:00
jmiller@mysql.com
75b6720509 More updates for using NDB as default and some bug fixes along the way 2006-02-08 13:08:19 +01:00
konstantin@mysql.com
790c9a05f4 Post merge-fixes.
Apply a patch by Jonas for NDB diskdata.
2006-02-08 15:03:09 +03:00
konstantin@mysql.com
365404a048 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 14:05:19 +03:00
konstantin@mysql.com
572bc2866c Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:58:56 +03:00
konstantin@mysql.com
34bb9c61d5 Merge mysql.com:/home/kostja/mysql/tmp_merge2
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:55:35 +03:00
konstantin@mysql.com
d4c5516929 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:11:44 +03:00
reggie@linux.site
760bc0a225 bug# 17082 Client hangs when creating tables with partition
This bug was only on Windows but we updated the call to 
create_temporary_file to match what is being done in other
areas of MySQL
2006-02-08 04:05:18 -06:00
reggie@linux.site
88ba26e15f Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-08 04:05:17 -06:00
konstantin@mysql.com
0831fd611e Apply the diskdata patch by Jonas. 2006-02-08 13:05:16 +03:00
konstantin@mysql.com
7452faa503 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 13:01:27 +03:00
anozdrin@mysql.com
66e1e8d4a6 Fix for BUG#17180: Failure in trigger-grant on Solaris.
The problem is that LEX_STRING was used instead of LEX_STRING::str.
2006-02-08 12:54:54 +03:00
anozdrin@mysql.com
e24336b0c8 Fix compilation failure. 2006-02-08 12:51:28 +03:00
msvensson@neptunus.(none)
cacdb371bc Update test results 2006-02-08 10:33:21 +01:00
konstantin@mysql.com
da377d1ec8 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:33:31 +03:00
konstantin@mysql.com
06359654ab Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:10:15 +03:00
konstantin@mysql.com
e656863033 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 00:02:56 +03:00
konstantin@mysql.com
0f62f38432 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-07 23:55:49 +03:00
reggie@linux.site
e74b609881 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1
2006-02-07 13:54:42 -06:00
msvensson@neptunus.(none)
b59c67861f Merge neptunus.(none):/home/msvensson/mysql/tmp_merge
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:54:41 +01:00
msvensson@neptunus.(none)
4ddcc7ccc2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 20:02:08 +01:00
msvensson@neptunus.(none)
ba6b1a6e9b Removed extra "drop view v1" 2006-02-07 19:59:19 +01:00
jmiller@mysql.com
e5a7238aed Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 19:19:42 +01:00
tomas@poseidon.ndb.mysql.com
4e64543e54 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-07 19:19:41 +01:00
msvensson@neptunus.(none)
cc1fd81414 Update after merge 5.0 -> 5.1 2006-02-07 19:18:33 +01:00
tomas@poseidon.ndb.mysql.com
99cbc34b44 Bug #17188 CRBR: ignores --binlog_ignore_db= settings 2006-02-07 19:02:38 +01:00
jmiller@mysql.com
a20976ffd9 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-07 18:25:18 +01:00
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:17:57 +01:00
msvensson@neptunus.(none)
4fc2b92692 Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:12:23 +01:00
msvensson@neptunus.(none)
bcefb0c7fa Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 18:04:50 +01:00
msvensson@neptunus.(none)
6894f38ddb Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
2006-02-07 18:02:34 +01:00
msvensson@neptunus.(none)
3f1cf9fabc Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
2006-02-07 17:57:26 +01:00
reggie@linux.site
824ac10fbc BUG# 17082 - Client hangs when creating tables with partition
no test case needed since simply creating a partitioned table 
reproduces it.
2006-02-07 10:45:11 -06:00
reggie@big_geek.
e0553b78b1 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  big_geek.:C:/Work/mysql/mysql-5.1
2006-02-07 10:45:11 -06:00
tomas@poseidon.ndb.mysql.com
53040a0762 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-07 17:45:10 +01:00
msvensson@neptunus.(none)
809deba6e5 Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
2006-02-07 17:20:50 +01:00
tomas@poseidon.ndb.mysql.com
96721c401e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-07 16:50:29 +01:00
reggie@big_geek.
2df6b1cb6c cmake corrections to fix compiling on visual 7.1 2006-02-07 09:43:42 -06:00
tomas@poseidon.ndb.mysql.com
776bc2a6f2 Bug #17005 Ndb partition handling for create table like is broken 2006-02-07 16:31:20 +01:00