mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
48330 commits 2778 branches 343 tags 1.6 GiB
Commit graph

48330 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
e307a089a9 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-14 19:35:43 +02:00
svoj@april.(none)
eb5398fdd9 Merge mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29734/mysql-5.1-engines
 2007-07-14 18:09:48 +05:00
svoj@mysql.com/april.(none)
c5608c9db2 BUG#29734 - thread_id=0 in binary log which leads to temporary table conflicts 
pseudo_thread_id was reset to zero via mysql_change_user() handling
whereas there is no reason to do that.  Moreover, having two
concurrent threads that change user and create a namesake temp tables
leads to recording the dup pair of queries:

   set @@session.pseudo_thread_id = 0;
   CREATE temporary table `the namesake`;

which will stall the slave as the second instance can not be created.
And that is the bug case.

Fixed by correcting pseudo_thread_id value after mysql_change_user().
 2007-07-14 17:58:39 +05:00
istruewing@chilla.local
dd72d5255d Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-bug28810
 2007-07-13 08:18:27 +02:00
svoj@mysql.com/april.(none)
c16c5db7a8 BUG#29464 - load data infile into table with big5 chinese fulltext index 
hangs 100% cpu

Moved a test case for BUG#29464 into fulltext3.test, since it requires big5
character set.
 2007-07-13 03:29:25 +05:00
svoj@mysql.com/april.(none)
e11d75e45b BUG#29445 - match ... against () never returns 
Part 2:
Searching fulltext index for a word with boolean mode truncation
operator may cause infinite loop.

The problem was that "smarter index merge" was used with "trunc-words",
which must never happen.

Affects 5.1 only.
 2007-07-13 03:25:27 +05:00
istruewing@chilla.local
0880e24593 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-bug28810
 2007-07-12 20:24:18 +02:00
istruewing@chilla.local
3a6b8d38d4 Bug#28158 - table->read_set is set incorrectly, 
causing wrong error message in Falcon

An error message about a duplicate key could show a wrong key
value when not all columns of the key were used to select the
rows for update.

Some storage engines return a record with only the selected
columns filled.

This is fixed by re-reading the record with a read_set which
includes all columns of the duplicate key after a duplicate key
error happens and before the error message is printed.
 2007-07-12 20:21:17 +02:00
serg@janus.mylan
859304f708 fix for smarter index mergein fulltext 
to work for queries like "+a (b)"
 2007-07-11 15:26:19 +02:00
svoj@june.mysql.com
05a12b7bb7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29445/mysql-5.1-engines
 2007-07-11 15:58:08 +05:00
svoj@mysql.com/june.mysql.com
31c8efc812 BUG#29445 - match ... against () never returns 
Part 1:
Do not perform index search for a plus-word with truncation operator
in case there are other plus-words in expression.

Specifically this optimization was enforced for expression like
"+word1 +word2*", but wasn't enforced for expression like
"+word1 word2*".
 2007-07-10 15:37:39 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
372856cd72 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/home/ram/work/mysql-5.1-maint
 2007-07-10 14:22:37 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
5fb5f2a9a5 Fix for bug #29652: csv.test failure: two changes conflict after merge 
Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.
 2007-07-10 13:09:07 +05:00
tomas@whalegate.ndb.mysql.com
810db44e4f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-10 09:03:21 +02:00
tomas@whalegate.ndb.mysql.com
503f86f3ba Bug #29570 
- correct result files
 2007-07-10 09:00:15 +02:00
tsmith@sita.local
63dd4251e4 Bug #29634: mysqld_safe does not set err_log variable, error log file is not created 
Dont touch & chmod the err_log file if using syslog (mysqld_safe)
 2007-07-09 16:10:43 -06:00
tsmith@sita.local
0ed9e3eb4c Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 15:45:13 -06:00
tsmith@sita.local
06c8087070 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 15:38:36 -06:00
tsmith@sita.local
e345a242f4 mysqld_safe.sh: 
Fix a few typos in comments (from Paul DuBois)
 2007-07-09 15:30:19 -06:00
tsmith@sita.local
832eb83777 Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 13:28:37 -06:00
tsmith@sita.local
4b1da38b13 rpl_misc_functions.result, rpl_misc_functions.test: 
Backport from 5.1 a fix to make this test deterministic
 2007-07-09 13:18:27 -06:00
tsmith@sita.local
92cad567ba Merge sita.local:/Users/tsmith/m/bk/maint/50 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:41:58 -06:00
tsmith@sita.local
59c570ba78 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  sita.local:/Users/tsmith/m/bk/maint/51
 2007-07-09 10:33:33 -06:00
tsmith@sita.local
1e0d809992 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 10:32:04 -06:00
istruewing@chilla.local
4b76695000 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-09 16:06:09 +02:00
svoj@june.mysql.com
c188110565 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines
 2007-07-09 16:07:08 +05:00
tomas@whalegate.ndb.mysql.com
278a5dfa83 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:17:47 +02:00
tomas@whalegate.ndb.mysql.com
14a20dad62 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:17:03 +02:00
tomas@whalegate.ndb.mysql.com
658d12aea8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-07-09 12:15:52 +02:00
tomas@whalegate.ndb.mysql.com
b66fac4fc1 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-07-09 12:07:33 +02:00
tomas@whalegate.ndb.mysql.com
81eb732880 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-07-09 12:05:07 +02:00
tsmith@sita.local
5cba44239a disabled.def: 
post-merge fix: re-enable rpl_udf test
 2007-07-09 03:31:27 -06:00
tsmith@sita.local
5f12f35c34 Merge sita.local:/Users/tsmith/m/bk/51 
into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
 2007-07-09 03:27:03 -06:00
tsmith@sita.local
00c6793075 Merge sita.local:/Users/tsmith/m/bk/maint/41 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:47:33 -06:00
tomas@whalegate.ndb.mysql.com
7dd1f323a8 Bug #29570 
- correct result files
 2007-07-09 09:35:27 +02:00
tsmith@sita.local
7b2b10e462 Merge sita.local:/Users/tsmith/m/bk/50 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:22:54 -06:00
tsmith@sita.local
1106dddfa2 Merge sita.local:/Users/tsmith/m/bk/41 
into  sita.local:/Users/tsmith/m/bk/maint/41
 2007-07-09 01:21:22 -06:00
tsmith@sita.local
75810fbc22 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-09 01:14:33 -06:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
b37c24c439 after-merge fix. 2007-07-09 10:39:49 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9 Merge mysql.com:/home/ram/work/b28808/b28808.5.0 
into  mysql.com:/home/ram/work/b28808/b28808.5.1
 2007-07-09 10:20:45 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
a10759d070 Merge mysql.com:/home/ram/work/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b28808/b28808.5.0
 2007-07-09 10:17:04 +05:00
tsmith@sita.local
c2092ee91b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sita.local:/Users/tsmith/m/bk/maint/50
 2007-07-08 19:39:54 -06:00
istruewing@chilla.local
043cf5bb4a Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:44:47 +02:00
istruewing@chilla.local
22ad965856 Merge chilla.local:/home/mydev/mysql-5.1-amain 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:43:39 +02:00
istruewing@chilla.local
660c3fd239 Merge chilla.local:/home/mydev/mysql-5.1-ateam 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-07-08 22:41:49 +02:00
istruewing@chilla.local
f5fcc9de33 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:04:54 +02:00
istruewing@chilla.local
246d1d43cb Merge chilla.local:/home/mydev/mysql-5.0-amain 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:04:08 +02:00
istruewing@chilla.local
cb88f63e75 Merge chilla.local:/home/mydev/mysql-5.0-ateam 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-07-08 21:03:02 +02:00
istruewing@chilla.local
10441bc78a Merge chilla.local:/home/mydev/mysql-4.1-amain 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-07-08 19:47:08 +02:00
istruewing@chilla.local
cf016f84fa Merge chilla.local:/home/mydev/mysql-4.1-ateam 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-07-08 19:46:22 +02:00