database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
49,993 Commits 3,276 Branches 1,097 Tags
b75eb1ee3e91dbbd7be78bf3a1e18a07642c4c1c
Commit Graph

19659 Commits

Author SHA1 Message Date
tsmith@maint1.mysql.com
54253a0763 Merge maint1.mysql.com:/data/localhome/tsmith/bk/51 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-07-04 22:38:53 +02:00
tsmith@maint1.mysql.com
b09c30347b Merge maint1.mysql.com:/data/localhome/tsmith/bk/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/50
 2007-07-04 21:24:32 +02:00
tsmith@maint1.mysql.com
8c8883aeb6 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
 2007-07-04 21:22:35 +02:00
skozlov/ksm@virtop.localdomain
67f8a6a5c0 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-07-04 22:44:59 +04:00
tsmith@sita.local
3bcf0039a6 rpl_misc_functions.result, rpl_misc_functions.test: 
Remove indeterministic behavior from a test
 2007-07-04 12:26:39 -06:00
bar@mysql.com/bar.myoffice.izhnet.ru
432c32cc62 Enabling ctype_big5 2007-07-04 17:06:23 +05:00
bar@bar.myoffice.izhnet.ru
b5d8c6bdf3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.0.b29484
 2007-07-04 17:04:41 +05:00
bar@bar.myoffice.izhnet.ru
224137ccda Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b29484 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b29484
 2007-07-04 16:52:48 +05:00
bar@bar.myoffice.izhnet.ru
84f0a5a00d Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b29499 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-07-04 16:34:47 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
fd3cdea376 Bug#29333 myisam corruption with character set cp932 collate cp932_japanese_ci 
Problem: wrong comparison with trailing space.
  This problem was fixed for all other character sets under terms of
  bug 7788 ""Table is full" occurs during a multitable update".
  ctype-cp932.c was forgotten.
  Fix: applying the same fix for ctype-cp932.c.
  (see ctype-sjis.c as an example of a previously correctly fixed file)
 2007-07-04 16:17:40 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
754b555c26 Bug#29484 ctype_big5 fails on 'double whopper' in mysql-5.1-new-rpl 
Problem: "mysqldump" doesn exists when running "mysql-test-run --embedded-server".
Fix: changing test to use "SELECT INTO OUTFILE" instead of "mysqldump -T".
 2007-07-04 14:21:29 +05: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
bar@mysql.com/bar.myoffice.izhnet.ru
883a56f2cb Bug#29499 Converting 'del' from ascii to Unicode results in 'question mark' 2007-07-04 12:04:57 +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
1f85dac21c loaddata.result, loaddata.test: 
Test case update for bug #29294.
 2007-07-03 21:45:20 +05:00
skozlov/ksm@virtop.localdomain
b05f30b558 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-07-03 19:18:21 +04: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
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
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
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
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
skozlov/ksm@virtop.localdomain
4f62ba081a Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-07-02 22:09:02 +04:00
lars/lthalmann@mysql.com/dl145k.mysql.com
91ca424640 post-merge fix 2007-07-02 19:33:00 +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
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
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-07-02 13:42:39 +02:00
lars/lthalmann@dl145j.mysql.com
6f6492b715 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
 2007-07-02 13:22:23 +02:00
svoj@june.mysql.com
717a04774b Merge mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.1-engines
 2007-07-02 12:36:31 +05:00
svoj@june.mysql.com
0539080296 Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29299/mysql-5.0-engines
 2007-07-02 12:31:34 +05:00
kostja@bodhi.(none)
1550a5ddee A post-merge fix. 2007-07-02 11:29:07 +04:00
tnurnberg@sin.intern.azundris.com
a403815e3d Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
---
Merge sin.intern.azundris.com:/home/tnurnberg/22540/50-22540
into  sin.intern.azundris.com:/home/tnurnberg/22540/51-22540
 2007-07-02 07:34:42 +02:00
tnurnberg@sin.intern.azundris.com
2fbd3a2eca Bug#22540: Incorrect value in column End_log_pos of SHOW BINLOG EVENTS using InnoDB 
minor fixes to appease pushbuild.
 2007-07-02 07:13:40 +02:00
antony@anubis.xiphis.org
673a8708d1 Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines 
into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-merge
 2007-07-01 20:56:47 -07:00
igor@olga.mysql.com
f8683bfb44 Fixed bug #25798. 
This bug may manifest itself not only with the queries for which
the index-merge access method is chosen. It also may display
itself for queries with DISTINCT.

The bug was in how the Unique::get method used the merge_buffers
function. To compare elements in the the queue employed by
merge_buffers() it must use the buffpek_compare function rather
than the function for binary comparison.
 2007-07-01 15:33:28 -07:00
kostja@bodhi.(none)
674d10270c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-02 02:01:05 +04:00
kostja@bodhi.(none)
7ce3cada45 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:55:01 +04:00
kostja@bodhi.(none)
6a5ce49d09 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-07-02 01:35:52 +04:00
kostja@bodhi.(none)
2d8decabd4 Update a missed test result. 2007-07-02 01:28:20 +04:00
igor@olga.mysql.com
2efac22463 Corrected a test case. 2007-07-01 11:00:29 -07:00
istruewing@synthia.local
754f66cf56 Post.merge fixes 
Fixed warnings
Fixed error numbers
 2007-07-01 11:56:01 +02:00
igor@olga.mysql.com
eea7dd0a77 Made test case platform independent. 2007-07-01 01:59:05 -07:00