Commit graph

34976 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
6e68423db6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-09 12:40:10 +02:00
tomas@poseidon.ndb.mysql.com
5af1d8de07 Bug #13266 Online adding of MySQLD causes cluster to crash
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
2006-06-09 12:30:04 +02:00
jonas@perch.ndb.mysql.com
246d76f154 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-06-09 12:17:00 +02:00
mskold@mysql.com
22fea185bd Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-09 12:07:04 +02:00
jonas@mc01.ndb.mysql.com
4a8dbd3f7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-09 11:40:38 +02:00
jonas@mc01.ndb.mysql.com
9064f067e8 ndb - fix 5.1 scan error handling problem
Make sure that error gets set corretly also
    when error code directly after taking mutex
2006-06-09 11:39:27 +02:00
igor@rurik.mysql.com
9ec346b980 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:48:51 -07:00
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00
jonas@perch.ndb.mysql.com
e3323e7b90 ndb -
restore --with-ndb-ccflags functionality
2006-06-09 09:06:43 +02:00
knielsen@mysql.com
6d40321bac Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
jonas@perch.ndb.mysql.com
e576b2460b ndb - testframework
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
2006-06-09 08:22:50 +02:00
joerg@mysql.com
1cd78f7a2b Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:57:26 +02:00
joerg@mysql.com
a26c9c31a1 mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303) 2006-06-08 19:55:22 +02:00
joerg@mysql.com
47f37f4d45 Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:32:25 +02:00
tomas@poseidon.ndb.mysql.com
a6294a33cf Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-08 17:55:44 +02:00
knielsen@mysql.com
acf3a19382 Add trigger to protect against changesets from crashed tree 2006-06-08 17:37:43 +02:00
tomas@poseidon.ndb.mysql.com
50bb4b6cb0 Bug #20336 CLUSTERLOG commands have no effect 2006-06-08 17:26:56 +02:00
jonas@mc01.ndb.mysql.com
b7ce47b28e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-08 16:33:17 +02:00
mskold@mysql.com
597e1444aa Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked 2006-06-08 16:12:38 +02:00
jonas@mc01.ndb.mysql.com
20903f8e49 merge 2006-06-08 16:11:55 +02:00
jonas@perch.ndb.mysql.com
25dc68e9f9 ndb - hugo
Print (and optionally specify) random seed
2006-06-08 15:43:41 +02:00
joerg@mysql.com
5091df1333 mysql-test/mysql-test-run.pl : A fix for bug#20303 "mysql-test-run.pl: Does not recognize -- argument" 2006-06-08 14:52:33 +02:00
jonas@mc01.ndb.mysql.com
340e5ce138 ndb - bug#20334
fix bug in tup scan wrt LCP
2006-06-08 12:41:06 +02:00
svoj@may.pils.ru
9b3fdd0b4c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
2006-06-07 19:57:48 +05:00
jonas@mc01.ndb.mysql.com
2b82420a6c ndb -
fix release compile error
2006-06-07 16:02:37 +02:00
msvensson@neptunus.(none)
e4d3341d35 Import from yaSSL to fix bild problems on AIX(already fixed but was lost during last import) 2006-06-07 14:46:10 +02:00
svoj@may.pils.ru
d14e190ce8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
2006-06-07 13:58:23 +05:00
kent@mysql.com
c73ca30d71 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-06 22:12:14 +02:00
monty@mysql.com
37d7bbb335 Added --pipe option for faster compile
Changed error to be more descriptive when you are refering to a not existing key
Fixed core dump in view test and changed to better error message
2006-06-06 20:21:36 +03:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
d4c8576e46 BUG#16002: After review fixes
Fixes for NDB
2006-06-06 13:19:46 -04:00
igor@rurik.mysql.com
950a000503 Fixed some problems for Windows build 2006-06-06 09:59:45 -07:00
mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se
bda7c1fd13 BUG#16002: More review fixes 2006-06-06 11:54:21 -04:00
msvensson@mysql.com
74de7a487d Re-apply missing changesets in 5.1
BUG#19544 mysqldump does not backup TS and LG information correctly.
  
Problem was the type of the column was varchar(8) not an integer type. So mysqld
was outputting a string representation of the number in scientific notation,
which wasn't exact. Now we do it as a bigint and output the number in bytes.

Fix assertion when loading plugins due to handler changes
2006-06-06 14:48:15 +03:00
msvensson@mysql.com
3951e65e91 Re-apply missing changeset, orignally pushed by jmiller
RPL Test cleanup of options that are not needed when using ndbcluster with binlog. The binlog is forced to row just by connecting to a cluster
2006-06-06 14:34:42 +03:00
monty@mysql.com
e50412ef38 Re-apply missing changeset, orignally pushed by elliot
Add define YASSL_PREFIX when compiling yassl

Import patch from yaSSL
- avoid allocating memory for each call to 'EVP_md5' and 
  'EVP_des_ede3_cbc' which were not released until server was stopped
- Those functions are used from the SQL function 'des_encrypt' and
  'des_decrypt'.

Add new define YASSL_PREFIX beforee including ssl.h to activate inclusion of prefix_*.h files

Bug#20022 mysql-test-run can't be run with secure connections turned on for all testcases
- Part 1, fixes rpl- and federated-tests where connection is made to 127.0.0.1

- Include prefix files that renames all public functions in yaSSLs
  OpenSSL API to ya<function_name>. They will otherwise conflict
  with OpenSSL functions if loaded by an application that uses OpenSSL
  as well as libmysqlclient with yaSSL support.

Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
  
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.
  
This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."

Update after merge to 5.0

BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.

- In function 'handle_grant_struct' when searching the memory structures for an 
  entry to modify, convert all entries here host.hostname is NULL to "" and compare that 
  with the host passed in argument "user_from".
- A user created with hostname "" is stored in "mysql.user" table as host="" but when loaded into 
  memory it'll be stored as host.hostname NULL. Specifiying "" as hostname means
  that "any host" can connect. Thus is's correct to turn on allow_all_hosts
  when such a user is found. 
- Review and fix other places where host.hostname may be NULL.

BUG#19394 OPT_INNODB_THREAD_CONCURRENCY duplicated
Removed duplication (not a user-visible change)
2006-06-06 14:21:07 +03:00
monty@mysql.com
63ed470566 Manually reapplied msvenssons changes to new BK tree:
Add definition of YASSL_PREFIX to Cmake file
Change "and" to "&&"
Remove the "static" directive SunCC can't use the function
2006-06-06 13:40:15 +03:00
gluh@eagle.intranet.mysql.r18.ru
8acb6eeb80 Bug#18035 Information Schema: Output is not Sorted
added 'order by' to avoid result order difference
2006-06-06 12:57:50 +05:00
gluh@eagle.intranet.mysql.r18.ru
b1892278c7 Bug#19599 duplication of information_schema column value in a CONCAT expr with user var
mark result string using String::mark_as_const()
which prevents CONCAT from reusing it as a buffer
for concatenation result.
2006-06-06 12:51:04 +05:00
gluh@eagle.intranet.mysql.r18.ru
03d8717ac8 Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
fix: return db name for I_S.TABLES(and others) in original letter case.
if mysql starts with lower_case_table_names=1 | 2 then original db name is converted
to lower case(for I_S tables). It happens when we perform add_table_to_list. 
to avoid this we make a copy of original db name and use the copy hereafter.
2006-06-06 11:25:31 +05:00
ramil@mysql.com
19e312af08 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b16546
2006-06-06 09:10:28 +05:00
monty@mysql.com
a703ff60c7 Fixed some issues found by valgrind
(one testcase, one memory leak and some accesses to not initialized memory)
2006-06-06 02:47:30 +03:00
mikael@c-7308e253.1238-1-64736c10.cust.bredbandsbolaget.se
64ca16506b BUG#16002: Handle unsigned integer partition functions 2006-06-05 14:55:22 -04:00
anna@hasky.mysql.fi
194c447b1b Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/anjuta/my/mysql-5.0
2006-06-05 21:53:06 +03:00
msvensson@devsrv-b.mysql.com
560ec64f1d Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
into  devsrv-b.mysql.com:/users/msvensson/my50-yassl
2006-06-05 17:45:20 +02:00
msvensson@shellback.(none)
5ae586d946 Import patch for yassl 1.35
- Better check of required buffer size when processing incoming record headers
2006-06-05 15:41:29 +02:00
jonas@perch.ndb.mysql.com
1d200a902d ndb - dbacc -
fix gcc4 compile error
2006-06-05 15:32:18 +02:00
sergefp@mysql.com
6c07c9132b BUG#19684: Garbage in 'partitions' column in EXPLAIN output:
In select_describe(), make the String object that holds the value of 
"partitions" column to "own" the value buffer, so the buffer isn't
prematurely freed.
[this is the second attempt with review fixes]
2006-06-05 15:15:28 +04:00
anjuta@arthur.local
a885c2e6f2 Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into  arthur.local:/home/my/mysql-5.0
2006-06-05 12:19:53 +03:00
anjuta@arthur.local
a83580b33a Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into  arthur.local:/home/my/mysql-5.0-clean
2006-06-05 11:59:44 +03:00
monty@mysql.com
430347f126 After merge fixes
Remove compiler warnings
2006-06-05 06:16:08 +03:00