Commit graph

56791 commits

Author SHA1 Message Date
Horst Hunger
667a004c53 Reviewed patch for Bug#39862. 2009-03-19 12:21:38 +01:00
Alexey Kopytov
169bf74540 Automerge. 2009-03-19 13:09:34 +03:00
Alexey Kopytov
35f9f89602 Automerge. 2009-03-19 13:08:15 +03:00
Alexey Kopytov
a4f59d4a4c Automerge. 2009-03-19 13:07:30 +03:00
Alexey Kopytov
bd1bbd10c8 Automerge. 2009-03-19 13:04:20 +03:00
Alexey Kopytov
afcfe81fea Fixed test failures in 5.1/6.0 introduced by the patch
for bug . Session max_allowed_packet is read-only
as of MySQL 5.1.31. In addition, the global variable
now has no effect on the current session.
2009-03-19 13:02:23 +03:00
Sergey Glukhov
2ea2cc02c3 5.0-bugteam->5.1-bugteam merge 2009-03-19 13:26:12 +04:00
Satya B
5c49e6ebb3 Merge 5.0-bugteam to 5.1-bugteam 2009-03-19 14:19:51 +05:30
Sergey Glukhov
173ea364c8 automerge 2009-03-19 12:42:26 +04:00
Sergey Glukhov
8c7789c313 Bug#41268 Help Text for \c is misleading in client command line interface
fixed help message


client/mysql.cc:
  fixed help message
2009-03-19 12:37:34 +04:00
Satya B
322fe7419f merge to 5.0-bugteam 2009-03-19 13:53:24 +05:30
Sergey Glukhov
af016f72b9 Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE
Don't throw an error after checking the first and the second arguments.
Continue with checking the third and higher arguments and if some of
them is stronger according to coercibility rules,
then this argument's collation is set as result collation.


mysql-test/r/ctype_collate.result:
  test result
mysql-test/t/ctype_collate.test:
  test case
sql/item.cc:
  Don't throw an error after checking the first and the second arguments.
  Continue with checking the third and higher arguments and if some of
  them is stronger according to coercibility rules,
  then this argument's collation is set as result collation.
2009-03-19 12:20:28 +04:00
Satya B
cad09dab8f Fix for BUG#21360 - mysqldump error on federated tables
When loading dump created by mysqldump tool an error is
thrown saying storage engine for the table doesn't have 
an option.
                        
mysqldump tries to re-insert the data into the federated
table which causes the error. Since the data is already
available on the remote server, mysqldump shouldn't try
to dump the data again for FEDERATED tables.
                        
As stated in the bug page, it can be considered similar
to the MERGE ENGINE with "view only" nature.
                        
Fixed by adding the "FEDERATED ENGINE" to the exception
list to ignore the data.

client/mysqldump.c:
  Fixed check_if_ignore_table() to ignore FEDERATED engine
  when dumping the table data.
mysql-test/r/federated.result:
  Result file for BUG#21360
mysql-test/t/federated.test:
  Testcase for BUG#21360
2009-03-19 11:36:37 +05:30
Alexey Kopytov
da7dc30371 Automerge. 2009-03-18 11:35:52 +03:00
Alexey Kopytov
2b2533955f Manual merge. 2009-03-18 11:27:49 +03:00
Alexey Kopytov
73a7d99331 Fix for bug#41486: extra character appears in BLOB for every
~40Mb after mysqldump/import 
        
When the input string exceeds the maximum allowed size for the 
internal buffer, batch_readline() returns a truncated string. 
Since there was no way for a caller to determine whether the 
string was truncated or not, the command line client assumed 
batch_readline() to always return the whole input string and 
appended a newline character. This resulted in garbled data 
when importing dumps containing strings longer than the 
maximum input buffer size. 
  
Fixed by adding a flag to the batch_readline() interface to 
signal a truncated string to the caller. 
  
Other minor problems fixed during patch implementation: 
 
- The maximum allowed buffer size for batch_readline() was set 
up depending on the client's max_allowed_packet value. It does 
not actully make any sense, as those variables are not 
related. The input buffer size limit is now always set to 1 
MB. 
  
- fill_buffer() did not always set the EOF flag. 
 
- The input buffer could actually grow twice as the specified 
limit due to insufficient checks in intern_read_line(). 

client/my_readline.h:
  Changed the interface of batch_readline().
client/mysql.cc:
  Honor the truncated flag returned by batch_readline() and do  
  not append the newline character if it was set. Since we can't 
  change the interfaces for readline()/fgets() used in the  
  interactive mode, always assume the returned string was not  
  truncated. In addition, always set the batch_readline()  
  internal buffer to 1 MB, independently from the client's  
  max_allowed_packet.
client/readline.cc:
  Added the 'truncated' argument do batch_readline() to signal 
  truncated string to a caller. 
  Fixed fill_buffer() to set the EOF flag correctly. 
  Fixed checks in intern_read_line() to not allow the internal  
  buffer grow past the specified limit.
mysql-test/r/mysql.result:
  Added a test case for bug .
mysql-test/t/mysql.test:
  Added a test case for bug .
2009-03-18 11:18:24 +03:00
Georgi Kodinov
0d18d930ae merged 5.0-bugteam -> bug 22047 2009-03-17 16:28:05 +02:00
Leonard Zhou
53849a24f9 Merge 2009-03-16 17:06:22 +08:00
Alexey Kopytov
e0a1c593a6 Automerge. 2009-03-19 10:15:08 +03:00
Chad MILLER
428e632f00 Merge bugteam and fix for 42675. 2009-03-18 18:38:30 -04:00
Chad MILLER
a41f46f508 Merge fix for 39326 and bugteam tree. 2009-03-18 15:16:48 -04:00
Horst Hunger
c75051479f due to merge (pull) 2009-03-18 17:36:49 +01:00
Horst Hunger
09c1a26b68 Due to bug#43733 I disabled "concurrent_innodb_(un)safelog.test" for embedded server. 2009-03-18 17:23:39 +01:00
Alexey Kopytov
ad726fb9cd Automerge. 2009-03-18 16:43:42 +03:00
Alexey Kopytov
30d365ec06 Automerge. 2009-03-18 16:32:43 +03:00
Vladislav Vaintroub
9377175903 merge 2009-03-18 14:20:01 +01:00
Tatiana A. Nurnberg
f060a5fce5 auto-merge 2009-03-18 14:19:58 +01:00
Georgi Kodinov
6290bc7e61 addendum to the 22047 fix : updated funcs_1 test suite 2009-03-18 14:52:31 +02:00
Georgi Kodinov
a673bdd3f7 merged 5.1-main -> 5.1-bugteam 2009-03-18 14:34:03 +02:00
Guangbao Ni
ff37912ff4 Auto-merged from 5.1-bugteam 2009-03-18 15:19:28 +00:00
Guangbao Ni
224376a796 Auto-merge from 5.1-bugteam 2009-03-18 15:02:06 +00:00
Guangbao Ni
0ba1cc2523 Bug mysql.procs_priv does not get replicated
mysql.procs_priv table itself does not get replicated.
Inserting routine privilege record into mysql.procs_priv table
is triggered by creating function/procedure statements
according to current user's privileges.
Because the current user of SQL thread has GLOBAL_ACL,
which doesn't need any check mysql.procs_priv privilege
when create/alter/execute routines.
Corresponding GLOBAL_ACL privilege user
doesn't insert routine privilege record into
mysql.procs_priv when creating a routine.

Fixed by switching the current user of SQL thread to definer user if
the definer user exists on slave.
That populates procs_priv, otherwise to keep the SQL thread
user and procs_priv remains unchanged.


mysql-test/suite/rpl/r/rpl_do_grant.result:
  Test case result for routine privilege when definer user exist or not on slave
mysql-test/suite/rpl/t/rpl_do_grant.test:
  Test case result for routine privilege when definer user exist or not on slave
sql/sql_parse.cc:
  Switch current user of SQL thread to definer user if the definer user
  existes on slave when checking whether the routine privilege is
  needed to insert mysql.procs_priv table or not.
2009-03-18 13:48:23 +00:00
Tatiana A. Nurnberg
a8fad0c923 auto-merge 2009-03-18 13:31:35 +01:00
Alexey Kopytov
d6fd3f1284 Automerge. 2009-03-18 11:38:34 +03:00
Alexey Kopytov
07a3de2019 Automerge. 2009-03-18 11:36:48 +03:00
Satya B
1367981c66 merge to 5.1-bugteam branch 2009-03-18 12:39:44 +05:30
Satya B
497db6ac0f Fix for BUG#32880 - Repairing Archive table fails with internal error 144
Any statement reading corrupt archive data file
(CHECK/REPAIR/SELECT/UPDATE/DELETE) may cause assertion
failure in debug builds. This assertion has been removed
and an error is returned instead.

Also fixed that CHECK/REPAIR returns vague error message
when it mets corruption in archive data file. This is
fixed by returning proper error code.

mysql-test/r/archive.result:
  A test case for BUG#32880
mysql-test/std_data/bug32880.ARN:
  corrupted archive table to test check and repair table operation
mysql-test/std_data/bug32880.ARZ:
  corrupted archive table to test check and repair table operation
mysql-test/std_data/bug32880.frm:
  corrupted archive table to test check and repair table operation
mysql-test/t/archive.test:
  A test case for BUG#32880
storage/archive/ha_archive.cc:
  Fixed unpack_row() to return the error instead of throwing assertion 
  and also fixed repair() to throw better error when repair table
  operation fails on corrupted archive table
2009-03-18 11:16:21 +05:30
Leonard Zhou
af53e5856a Merge 2009-03-18 11:05:48 +08:00
Vladislav Vaintroub
9e655bfffc Bug Link errors when trying to link mysql_embedded.exe
The reason for the error is incorrectly specified link dependencies
for mysql_embedded, mysqltest_embedded and mysql_client_test_embedded
in CMakeLists.txt (ADD_DEPENDENCIES should be TARGET_LINK_LIBRARIES)


libmysqld/CMakeLists.txt:
  changed library type for libmysqld to SHARED instead of
  MODULE. MODULE in CMake notation is a shared library that 
  is used only in dlopen/dlsym/LoadLibrary scenarios.
  Hence it was impossible to use TARGET_LINK_LIBRARIES with
  a MODULE.
libmysqld/examples/CMakeLists.txt:
  Use TARGET_LINK_LIBRARIES (instead of previously incorrectly 
  used ADD_DEPENDENCIES) to specify link dependency from libmysqld
2009-03-17 23:28:24 +01:00
Chad MILLER
35d47c3631 Fix indentation. tab -> spaces 2009-03-17 15:43:00 -04:00
Chad MILLER
95618bb3f3 Bug#42675: Dangling pointer leads to a client crash (mysys/my_error.c \
patch enclosed)
  
One call to my_error_unregister_all() would free pointers, but leave one
pointer to just-freed memory still assigned.  That's the bug.  Subsequent
calls of this function would try to follow pointers into deallocated, 
garbage memory and almost certainly SEGV.

Now, after freeing a linked list, unset the initial pointer.
2009-03-17 15:31:07 -04:00
Tatiana A. Nurnberg
b7ce2a2521 auto-merge 2009-03-17 18:38:04 +01:00
Tatiana A. Nurnberg
fb4e68b687 36446: fix Windows warning 2009-03-17 18:24:35 +01:00
Georgi Kodinov
7f1a6488a7 merge 5.0-bugteam -> 5.1-bugteam 2009-03-17 16:33:54 +02:00
Georgi Kodinov
b27465c28a auto-merge 2009-03-17 16:32:44 +02:00
Georgi Kodinov
9de51e418b Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to
become negative

- merged the fix to 5.1
- extended to cover I_S.PROCESSLIST.TIME
- Changed the column type of I_S.PROCESSLIST.TIME from LOGNLONG
  UNSIGNED
  to LONG (to match the SHOW PROCESSLIST type)
- Added a test case
2009-03-17 16:29:16 +02:00
Horst Hunger
8d5c0b9a9b Fix for bug 39484 after review. I inserted the review results (also including the patches itself):
"Release_lock("hello")" is now also successful when delivering NULL, replaced two sleeps by wait_condition. The last two "sleep 1" have not been replaced as all tried wait conditions leaded to nondeterministic results, especially to succeeding concurrent updates. To replace the sleeps there should be some time planned (or internal knowledge of the server may help).
2009-03-17 14:43:43 +01:00
Tatiana A. Nurnberg
5c30d5ae79 auto-merge 2009-03-17 08:59:07 +01:00
Ramil Kalimullin
44f6c2937d Code clean-up.
sql/sql_select.cc:
  the if() separate arguments checks are slightly faster.
2009-03-17 11:04:15 +04:00
Patrick Crews
5b9903e1c8 Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
Re-recording of .result files for additional tests that use this include file.
2009-03-16 17:36:14 -04:00