1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Commit Graph

21162 Commits

Author SHA1 Message Date
joerg@trift2.
d822cf03e5 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-06-04 11:24:49 +02:00
tomas@whalegate.ndb.mysql.com
eb5fd16e59 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-02 06:33:18 +02:00
joerg@debian.(none)
81930fc4bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into  debian.(none):/M51/merge-5.1
2007-06-01 12:59:06 +02:00
kostja@bodhi.(none)
d0ff5df029 Fix a warning. 2007-06-01 14:17:23 +04:00
kostja@bodhi.(none)
679a264357 A post-merge fix. 2007-06-01 13:33:57 +04:00
kostja@bodhi.(none)
16633169e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 12:12:06 +04:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
2007-05-31 17:45:22 +03:00
lars/lthalmann@dl145j.mysql.com
73ca08a481 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-05-31 10:23:37 +02:00
malff/marcsql@weblab.(none)
b2d394787e Build warning cleanup 2007-05-30 17:46:28 -06:00
kent@kent-amd64.(none)
05c5139854 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
2007-05-30 22:18:45 +02:00
kent@kent-amd64.(none)
a1f0ff4bb4 Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
2007-05-30 22:15:13 +02:00
kent@mysql.com/kent-amd64.(none)
b217a9e898 Makefile.am, configure.in:
Added --with-mysqld-libs configure flag
2007-05-30 22:11:53 +02:00
thek@adventure.(none)
c2e2d0bfa0 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:34:27 +02:00
thek@adventure.(none)
d505eac7e9 Merge adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-05-30 17:17:46 +02:00
anozdrin/alik@ibm.
de9f159c60 1. Fix memory leak.
2. Use multibyte-safe constant.
2007-05-30 16:24:21 +04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
a6cf35bb78 Added extra parenthesis to remove compiler warning
Fixed test case rpl_incident.test (synchronize drop table, masked IO thread behaviour)
2007-05-30 11:55:56 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1f12c44b91 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug27044_slave_dup2unique
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-30 11:22:07 +03:00
malff/marcsql@weblab.(none)
8c27ed9e42 Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 14:53:21 -06:00
malff/marcsql@weblab.(none)
e8fec66e9e Manual merge 2007-05-29 14:52:17 -06:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
dcd8098f94 bug#22725
merge with 5.0
2007-05-29 22:17:09 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
1537484087 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-29 21:21:13 +03:00
anozdrin/alik@ibm.
7d02017cb6 Refactoring patch:
1. Refactor sp_show_create_function() and sp_show_create_procedure()
  into show_create_routine().
2. Code cleanup: eliminate proxy functions.
2007-05-29 21:22:33 +04:00
malff/marcsql@weblab.(none)
cb4316e35d Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 10:52:07 -06:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
f7c3285f2e Bug#27044 replicated with unique field ndb table allows duplkey inserts
The bug in that slave version of a table with unique field still was
able to execute INSERT query as replace whereas it's impossible on master.

The reason of this artifact is wrong usage of ndb->extra:s.

Fixed with resetting flags at do_after.
There is open issue with symmetrical resetting
   table->file->extra(HA_EXTRA_NO_IGNORE_NO_KEY)
which i had to hand to bug#27077.
The test for the current bug was committed in a cset for bug#27320.
2007-05-29 16:36:05 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
3b93001c25 Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
Refining the tests since pb revealed the older version's fragality - the error from SF() due to killed
may be different on different env:s.
DBUG_ASSERT instead of assert.
2007-05-29 16:27:55 +03:00
tomas@whalegate.ndb.mysql.com
f23e890e46 Bug #26783 replication status unknown after cluster or mysqld failure 2007-05-29 11:55:12 +02:00
thek@adventure.(none)
6d04666c45 Merge adventure.(none):/home/thek/Development/cpp/bug24988/my50-bug24988
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-05-29 10:17:30 +02:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
573df947b8 Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
into  dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/tmp/merge_5.0
2007-05-28 23:34:04 +03:00
aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi
b8a5a770f0 Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events
The reason for the bug was that replaying of a query on slave could not be possible since its event
was recorded with the killed error. Due to the specific of handling INSERT, which per-row-while-loop is 
unbreakable to killing, the query on transactional table should have not appeared in binlog unless
there was  a call to a stored routine that got interrupted with killing (and then there must be an error
returned out of the loop).
   
The offered solution added the following rule for binlogging of INSERT that accounts the above
specifics:
For INSERT on transactional-table if the error was not set the only raised flag
is harmless and is ignored via masking out on time of creation of binlog event.
   
For both table types the combination of raised error and KILLED flag indicates that there
was potentially partial execution on master and consistency is under the question.
In that case the code continues to binlog an event with an appropriate killed error.
 
The fix relies on the specified behaviour of stored routine that must propagate the error 
to the top level query handling if the thd->killed flag was raised in the routine execution.
   
The patch adds an arg with the default killed-status-unset value to Query_log_event::Query_log_event.
2007-05-28 22:20:22 +03:00
kostja@vajra.(none)
568bf9e38a Fix a compile-time warning. 2007-05-28 16:31:16 +04:00
thek@adventure.(none)
5f06a456bf Bug#24988 FLUSH PRIVILEGES causes brief unavailability
- A race condition caused brief unavailablility when trying to acccess
  a table. 
- The variable 'grant_option' was removed to resolve the race condition and
  to simplify the design pattern. This flag was originally intended to optimize
  grant checks.
2007-05-28 14:08:04 +02:00
thek@adventure.(none)
1bccb382bd Merge adventure.(none):/home/thek/Development/cpp/bug24988/my50-bug24988
into  adventure.(none):/home/thek/Development/cpp/bug24988/my51-bug24988
2007-05-28 13:56:49 +02:00
thek@adventure.(none)
4ec0f6ceb9 Bug#24988 FLUSH PRIVILEGES causes brief unavailability
- A race condition caused brief unavailablility when trying to acccess
  a table.
- The unprotected variable 'grant_option' wasn't intended to alternate
  during normal execution. Variable initialization moved to grant_init
  a lines responsible for the alternation are removed.
2007-05-28 13:50:33 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b035219762 Changed accidently added tabs back into spaces.
Fixed a bug that came in merge.
2007-05-28 14:37:39 +03:00
kostja@vajra.(none)
e0571ebb90 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  vajra.(none):/opt/local/work/mysql-5.1-4968-clean
2007-05-28 15:34:51 +04:00
kostja@vajra.(none)
c759487769 5.1 version of a fix and test cases for bugs:
Bug#4968 ""Stored procedure crash if cursor opened on altered table"
Bug#6895 "Prepared Statements: ALTER TABLE DROP COLUMN does nothing"
Bug#19182 "CREATE TABLE bar (m INT) SELECT n FROM foo; doesn't work from 
stored procedure."
Bug#19733 "Repeated alter, or repeated create/drop, fails"
Bug#22060 "ALTER TABLE x AUTO_INCREMENT=y in SP crashes server"
Bug#24879 "Prepared Statements: CREATE TABLE (UTF8 KEY) produces a 
growing key length" (this bug is not fixed in 5.0)

Re-execution of CREATE DATABASE, CREATE TABLE and ALTER TABLE 
statements in stored routines or as prepared statements caused
incorrect results (and crashes in versions prior to 5.0.25).

In 5.1 the problem occured only for CREATE DATABASE, CREATE TABLE
SELECT and CREATE TABLE with INDEX/DATA DIRECTOY options).
  
The problem of bugs 4968, 19733, 19282 and 6895 was that functions
mysql_prepare_table, mysql_create_table and mysql_alter_table are not
re-execution friendly: during their operation they modify contents
of LEX (members create_info, alter_info, key_list, create_list),
thus making the LEX unusable for the next execution.
In particular, these functions removed processed columns and keys from
create_list, key_list and drop_list. Search the code in sql_table.cc 
for drop_it.remove() and similar patterns to find evidence.
  
The fix is to supply to these functions a usable copy of each of the
above structures at every re-execution of an SQL statement. 
  
To simplify memory management, LEX::key_list and LEX::create_list
were added to LEX::alter_info, a fresh copy of which is created for
every execution.
  
The problem of crashing bug 22060 stemmed from the fact that the above 
metnioned functions were not only modifying HA_CREATE_INFO structure 
in LEX, but also were changing it to point to areas in volatile memory
of the execution memory root.
   
The patch solves this problem by creating and using an on-stack
copy of HA_CREATE_INFO in mysql_execute_command.

Additionally, this patch splits the part of mysql_alter_table
that analizes and rewrites information from the parser into
a separate function - mysql_prepare_alter_table, in analogy with
mysql_prepare_table, which is renamed to mysql_prepare_create_table.
2007-05-28 15:30:01 +04:00
tomas@whalegate.ndb.mysql.com
12920c2ee0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-28 13:27:38 +02:00
tomas@whalegate.ndb.mysql.com
186d1534b8 Bug #28719: multi pk update ignore corrupts data
- check multi update as well as update
- this bug is not present in 5.0, but execution patch is wrong, so there are probably other bugs
2007-05-28 13:23:11 +02:00
lars/lthalmann@dl145h.mysql.com
95068ddacb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-05-28 09:25:40 +02:00
lars/lthalmann@dl145h.mysql.com
3b598218ff Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-05-28 09:21:42 +02:00
kent@mysql.com/kent-amd64.(none)
a069db06a6 sql_parse.cc, config-win.h, config-netware.h:
Don't try determine stack direction at configure time
compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time
2007-05-27 23:21:03 +02:00
malff/marcsql@weblab.(none)
0bb9b8f90a Code review comments 2007-05-25 16:17:20 -06:00
malff/marcsql@weblab.(none)
88e3abf5ef Bug#27876 (SF with cyrillic variable name fails during execution (regression))
The root cause of this bug is related to the function skip_rear_comments,
in sql_lex.cc

Recent code changes in skip_rear_comments changed the prototype from
"const uchar*" to "const char*", which had an unforseen impact on this test:
  (endp[-1] < ' ')
With unsigned characters, this code filters bytes of value [0x00 - 0x20]
With *signed* characters, this also filters bytes of value [0x80 - 0xFF].

This caused the regression reported, considering cyrillic characters in the
parameter name to be whitespace, and truncated.
Note that the regression is present both in 5.0 and 5.1.

With this fix:
- [0x80 - 0xFF] bytes are no longer considered whitespace.
This alone fixes the regression.

In addition, filtering [0x00 - 0x20] was found bogus and abusive,
so that the code now filters uses my_isspace when looking for whitespace.

Note that this fix is only addressing the regression affecting UTF-8
in general, but does not address a more fundamental problem with
skip_rear_comments: parsing a string *backwards*, starting at end[-1],
is not safe with multi-bytes characters, so that end[-1] can confuse the
last byte of a multi-byte characters with a characters to filter out.

The only known impact of this remaining issue affects objects that have to
meet all the conditions below:

- the object is a FUNCTION / PROCEDURE / TRIGGER / EVENT / VIEW
- the body consist of only *1* instruction, and does *not* contain a
  BEGIN-END block
- the instruction ends, lexically, with <ident> <whitespace>* ';'?
  For example, "select <ident>;" or "return <ident>;"
- The last character of <ident> is a multi-byte character
- the last byte of this character is ';' '*', '/' or whitespace

In this case, the body of the object will be truncated after parsing,
and stored in an invalid format.

This last issue has not been fixed in this patch, since the real fix
will be implemented by Bug 25411 (trigger code truncated), which is caused
by the very same code.
The real problem is that the function skip_rear_comments is only a
work-around, and should be removed entirely: see the proposed patch for
bug 25411 for details.
2007-05-25 14:36:01 -06:00
andrey@whirlpool.mysql.com
47c0c5a0ee Fix for bug#28666 CREATE EVENT ... EVERY 0 SECOND let server crash
A missing check for zero value of interval was added.
2007-05-25 14:46:22 +02:00
kostja@vajra.(none)
7db7a83f94 Fix warnings. 2007-05-25 00:41:27 +04:00
tomas@whalegate.ndb.mysql.com
95ae6e684e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-05-24 20:59:46 +02:00
tomas@whalegate.ndb.mysql.com
093908432f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-24 20:58:36 +02:00
jani@linux-th5m.site
ee4d6b4fc0 Merged from main 5.1 2007-05-24 19:47:58 +03:00
kostja@vajra.(none)
0162745cff Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  vajra.(none):/opt/local/work/mysql-5.1-runtime
2007-05-24 19:34:14 +04:00
kostja@vajra.(none)
075a75af3a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  vajra.(none):/opt/local/work/mysql-5.0-runtime
2007-05-24 19:23:52 +04:00