1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Commit Graph

13345 Commits

Author SHA1 Message Date
igor@rurik.mysql.com
bcc898f71b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-06-09 15:39:10 -07:00
kent@mysql.com
3744b46a1d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/data0/mysqldev/my/mysql-4.1
2006-06-09 22:42:34 +02:00
konstantin@mysql.com
5579fc230d Disable im_life_cycle test 2006-06-10 00:35:44 +04:00
kent@mysql.com
a5bc38a0d3 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-09 22:34:21 +02:00
igor@rurik.mysql.com
3d6899948b Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 12:31:15 -07:00
igor@rurik.mysql.com
e6e4462d68 Post-merge fixes 2006-06-09 12:27:28 -07:00
msvensson@neptunus.(none)
9ebf7944e3 Bug #7498 User variable SET saves SIGNED BIGINT as UNSIGNED BIGINT
- Add unsigned flag to user_var_entry, used when 'type' is INT_RESULT
- Propagate unsigned flag from the query executed by Item_single_row_subselect
2006-06-09 19:35:54 +02:00
sergefp@mysql.com
a0676542a7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/psergey/mysql-5.1-bug19684
2006-06-09 20:38:53 +04:00
ingo@chilla.local
091401e7a8 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 18:20:10 +02:00
ingo@chilla.local
f991b573c5 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 17:32:23 +02:00
rburnett@bk-internal.mysql.com
017e1a502e Many files:
Merging changesets from crashed 5.1-kt
2006-06-09 16:20:23 +02:00
holyfoot@mysql.com
c2df72d6cb Merge 2006-06-09 19:09:42 +05:00
joerg@trift2.mysql.com
44c0053a44 Merge trift2.mysql.com:/M41/bug20303-4.1
into trift2.mysql.com:/M41/mysql-4.1
2006-06-09 14:37:24 +02:00
joerg@trift2.mysql.com
4b9a1a8bbb Merge trift2.mysql.com:/M50/bug20303-5.0
into trift2.mysql.com:/M50/mysql-5.0
2006-06-09 14:13:01 +02:00
joerg@trift2.
7987ef89fd Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 2006-06-09 13:56:29 +02:00
ingo@mysql.com
0ae24af51b Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 13:51:41 +02:00
joerg@mysql.com
98b80d12cd Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 2006-06-09 13:49:10 +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
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
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
cmiller@zippy.(none)
4bb358924c Bug#19904: UDF: not initialized *is_null per row
The is_null value was initialized once and thereafter only set to indicate
NULL, and never unset to indicate not-NULL.

Now set is_null to false, in addition to only setting it to true when the value 
in question is null.
2006-06-08 13:25:28 -04: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
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
gkodinov@mysql.com
c9bb9413ab Merge mysql.com:/home/kgeorge/mysql/5.0/teamclean
into  mysql.com:/home/kgeorge/mysql/5.0/B15355
2006-06-08 14:26:02 +03:00
gkodinov@mysql.com
395affb8e9 Bug #15355: Common natural join column not resolved in prepared statement nested
query
Problem:
There was a wrong context assigned to the columns that were added in insert_fields()
when expanding a '*'. When this is done in a prepared statement it causes 
fix_fields() to fail to find the table that these columns reference.
Actually the right context is set in setup_natural_join_row_types() called at the 
end of setup_tables(). However when executed in a context of a prepared statement
setup_tables() resets the context, but setup_natural_join_row_types() was not
setting it to the correct value assuming it has already done so.

Solution:
The top-most, left-most NATURAL/USING join must be set as a 
first_name_resolution_table in context even when operating on prepared statements.
2006-06-08 13:34:03 +03:00
evgen@moonbone.local
9743628758 Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
The st_lex::which_check_option_applicable() function controls for which 
statements WITH CHECK OPTION clause should be taken into account. REPLACE and
REPLACE_SELECT wasn't in the list which results in allowing REPLACE to insert
wrong rows in a such view.

The st_lex::which_check_option_applicable() now includes REPLACE and 
REPLACE_SELECT in the list of statements for which WITH CHECK OPTION clause is
applicable.
2006-06-07 16:17:56 +04:00
ramil@mysql.com
fe01874613 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b6880
2006-06-07 14:40:33 +05:00
ramil@mysql.com
0bdae38efb Fix for bug #6880: LAST_INSERT_ID() within a statement 2006-06-07 14:01:10 +05:00
evgen@moonbone.local
d027dd7c0d Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.
To calculate its max_length the CONCAT() function is simply sums max_lengths
of its arguments but when the collation of an argument differs from the 
collation of the CONCAT() max_length will be wrong. This may lead to a data
truncation when a tmp table is used, in UNIONS for example.

The Item_func_concat::fix_length_and_dec() function now recalculates the 
max_length of an argument when the mbmaxlen of the argument differs from the
mbmaxlen of the CONCAT().
2006-06-07 01:10:23 +04: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
aivanov@mysql.com
b6d1fcd00a Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss609
2006-06-06 23:56:48 +04:00
aivanov@mysql.com
c46b17a731 Applied innodb-5.0-ss609 snapshot.
Fixed BUG#19727 "InnoDB crashed server and crashed tables
 are not recoverable".
2006-06-06 23:37:42 +04: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
bar@mysql.com
f956c16a28 Bug#18396 Identifiers: Byte with value 255 not allowed
Old FRM files didn't allow byte 255 as a column name part.
Since now we store column names in UTF8, this restriction
is not required anymore: 255 is not a valid byte in UTF8.
Fix: removing checking against 255.
2006-06-06 22:13:30 +05: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
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
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
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
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
aivanov@mysql.com
90ae00ad11 Fix BUG#18948. Adding a file missed in the previous commit. 2006-06-05 05:58:59 +04:00