mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48464 commits 2788 branches 343 tags 1.7 GiB
Commit graph

48464 commits

This branch
This branch
All branches
Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
8ab2c73d3a backport compute hash 2007-07-04 20:16:42 +02:00
lzhou/zhl@dev3-63.(none)
6f935a3db8 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941
 2007-07-04 17:59:12 +00:00
lzhou/zhl@dev3-63.(none)
1c52e967c1 Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug25941 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug25941
 2007-07-04 16:32:26 +00:00
sergefp@mysql.com
cdea05a793 Backport from 5.2: Fix valgrind failure: Don't access item_func->arguments() 
if item_func->argument_count()==0
 2007-07-04 17:11:56 +04:00
gkodinov/kgeorge@magare.gmz
6336d8c1cb merge 5.0-opt -> 5.1-opt 2007-07-04 11:58:56 +03:00
gkodinov/kgeorge@magare.gmz
66bfc21362 Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
 2007-07-04 11:46:45 +03:00
ramil/ram@ramil.myoffice.izhnet.ru
14aa601dba Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b19328/b19328.5.1
 2007-07-04 09:27:54 +05:00
tsmith@sita.local
4f49d804cf rpl_misc_functions.result, rpl_misc_functions.test: 
work around bug 29537, which was revealed by patch for bug 28356: move DROP TABLE before DROP PROCEDURE in cleanup
 2007-07-03 19:51:32 -06:00
gshchepa/uchum@gleb.loc
79622efe7c loaddata.result, loaddata.test: 
Updated test case for bug #29294.
 2007-07-04 03:15:37 +05:00
gshchepa/uchum@gleb.loc
4269994622 Merge gleb.loc:/home/uchum/work/bk/4.1-opt 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-07-04 02:09:56 +05:00
gshchepa/uchum@gleb.loc
0e8292c97c Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  gleb.loc:/home/uchum/work/bk/4.1-opt
 2007-07-03 21:48:52 +05:00
gshchepa/uchum@gleb.loc
1f85dac21c loaddata.result, loaddata.test: 
Test case update for bug #29294.
 2007-07-03 21:45:20 +05:00
gshchepa/uchum@gleb.loc
5f5929846b sql_class.cc: 
Windows compilation error fix.
 2007-07-03 21:05:17 +05:00
jonas@perch.ndb.mysql.com
6d10d4592a Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 17:23:39 +02:00
jonas@perch.ndb.mysql.com
d46ff21f4f ndb - bug#28720 
fix also undo files
 2007-07-03 17:22:57 +02:00
antony@ppcg5.local
131f81ea9d move test for bug29299 into seperate file as it requires charset gbk 
fixes test breakage on sles10-ia64-a which omits charset.
 2007-07-03 08:11:38 -07:00
jonas@perch.ndb.mysql.com
16c184811f Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 16:57:25 +02:00
jonas@perch.ndb.mysql.com
381b11cefe ndb - bug#28720 - "Disk data meta information is not visible in mysqld but exists in ndbd" 
continue on unknown result (no contact)
 2007-07-03 16:56:35 +02:00
gshchepa/uchum@gleb.loc
dbe4fb94ca Fixed bug #29294. 
The `SELECT 'r' INTO OUTFILE ... FIELDS ENCLOSED BY 'r' ' statement
encoded the 'r' string to a 4 byte string of value x'725c7272'
(sequence of 4 characters: r\rr).
The LOAD DATA statement decoded this string to a 1 byte string of
value x'0d' (ASCII Carriage Return character) instead of the original
'r' character.
The same error also happened with the FIELDS ENCLOSED BY clause
followed by special characters: 'n', 't', 'r', 'b', '0', 'Z' and 'N'.

NOTE 1: This is a result of the undocumented feature: the LOAD DATA INFILE
recognises 2-byte input sequences like \n, \t, \r and \Z in addition
to documented 2-byte sequences: \0 and \N. This feature should be
documented (here backspace character is a default ESCAPED BY character,
in the real-life example it may be any ESCAPED BY character).

NOTE 2, changed behaviour:
Now the `SELECT INTO OUTFILE' statement with the `FIELDS ENCLOSED BY'
clause followed by one of: 'n', 't', 'r', 'b', '0', 'Z' or 'N' characters
encodes this special character itself by doubling it ('r' --> 'rr'),
not by prepending it with an escape character.
 2007-07-03 19:37:46 +05:00
jonas@perch.ndb.mysql.com
2ed75f25ae Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 16:37:15 +02:00
jonas@perch.ndb.mysql.com
7fbcaa87b5 ndb - bug#28642 - Tablespace returning incorrect usage status 
make free 64 bit (as it represents free bytes, not free extents as originally designed)
 2007-07-03 16:29:25 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ee5403110d Complementary fix for bug #29353: inserting a negative value to a csv table 
leads to the table corruption

New Field::store() method implemented to explicitly set thd->count_cuted_fields
before value storing, instead of (incorrectly) setting it in the CSV storage engine.
Thread row counter now properly incremented during check and repair in the CSV engine.
 2007-07-03 17:17:58 +05:00
jonas@perch.ndb.mysql.com
b57f59909e ndb - bug#25901 
handle undofile/logfile groups that were created while node was node
 2007-07-03 14:12:27 +02:00
tomas@whalegate.ndb.mysql.com
0a1c65b6e3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
 2007-07-03 13:10:07 +02:00
antony@ppcg5.local
76587c48b9 fix bad merge 2007-07-03 03:56:03 -07:00
bar@bar.myoffice.izhnet.ru
14df7c7087 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27345 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-07-03 14:06:57 +05:00
bar@bar.myoffice.izhnet.ru
825570f5a4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b27345
 2007-07-03 13:58:19 +05:00
gkodinov/kgeorge@magare.gmz
248650120c Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B28983-2-5.0-opt
 2007-07-03 10:40:31 +03:00
gkodinov/kgeorge@magare.gmz
bad7900a5a Bug #28983: 'reset master' in multiple threads and innodb tables 
asserts debug binary

We can't reliably check if the binary log is opened without 
acquiring its mutex. 
Fixed by removing this check.
 2007-07-03 10:36:37 +03:00
jonas@perch.ndb.mysql.com
446e3272c4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-07-03 08:46:41 +02:00
jonas@perch.ndb.mysql.com
af76e150c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-03 08:41:52 +02:00
jonas@perch.ndb.mysql.com
b940b92ede Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-07-03 08:41:05 +02:00
jonas@perch.ndb.mysql.com
71996bd6f4 ndb - bug#29354 - Incorrect handling of replica REDO during SR (5.0) 
Not very clever fix for DIH incorrect REDO handling
  - Dont report GCP_SAVE_CONF until first LCP has been complete during NR
 2007-07-03 08:39:42 +02:00
thek@adventure.(none)
08e7d2d312 Merge adventure.(none):/home/thek/Development/cpp/bug21074/my51-bug21074 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-07-02 21:03:10 +02:00
iggy@amd64.(none)
8c26615204 Merge amd64.(none):/src/bug24924/my50-bug24924 
into  amd64.(none):/src/bug24924/my51-bug24924
 2007-07-02 14:23:50 -04:00
iggy@amd64.(none)
772c7fc591 Bug#24924 shared-memory-base-name that is too long causes buffer overflow 
- Testcase fixup.
 2007-07-02 14:22:03 -04:00
sergefp@mysql.com
de0cf5d22f Fix testcase to be platform-independent 2007-07-02 22:18:41 +04:00
mikael@dator6.(none)
da7e78cead removed test case no longer supported 2007-07-02 20:11:54 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
91ca424640 post-merge fix 2007-07-02 19:33:00 +02:00
thek@adventure.(none)
863e882785 Bug#21074 Large query_cache freezes mysql server sporadically under heavy load 
Invaldating a subset of a sufficiently large query cache can take a long time.
During this time the server is efficiently frozen and no other operation can
be executed. This patch addresses this problem by moving the locks which cause
the freezing and also by temporarily disable the query cache while the 
invalidation takes place.
 2007-07-02 19:14:48 +02:00
mikael@dator6.(none)
8ccd9ee981 Merge dator6.(none):/home/mikael/mysql_clones/mysql-5.1-opt 
into  dator6.(none):/home/mikael/mysql_clones/bug18198
 2007-07-02 18:08:27 +02:00
lars/lthalmann@dl145k.mysql.com
5c811235fb Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-07-02 17:55:24 +02:00
lars/lthalmann@dl145j.mysql.com
4bbac9acfd Merge mysql.com:/nfsdisk1/lars/bk/mysql-4.1-rpl 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-07-02 17:46:48 +02:00
lars/lthalmann@dl145k.mysql.com
4be62a8e7f Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
 2007-07-02 17:45:46 +02:00
lars/lthalmann@dl145k.mysql.com
f969f0000c Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
 2007-07-02 17:02:01 +02:00
jonas@perch.ndb.mysql.com
3c1cfd7631 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2007-07-02 14:19:15 +02:00
jonas@perch.ndb.mysql.com
a3c733c395 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-07-02 14:08:22 +02:00
jonas@perch.ndb.mysql.com
627a56be1e ndb - bug#29364 - port merge (5.0 -> 5.1) 2007-07-02 13:59:17 +02:00
jonas@perch.ndb.mysql.com
b47ee8cec9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-07-02 13:54:27 +02:00
jonas@perch.ndb.mysql.com
f6c0acde24 ndb - bug#29364 - "SQL queries hang while data node in start phase 5" 
In TC init node status for already started nodes during node restart
  (not present in 5.1)
 2007-07-02 13:45:24 +02:00