database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-15 09:02:33 +03:00
Code Activity
31,269 Commits 3,275 Branches 1,097 Tags
ec183566cc7bea0e42c2da9bc74c4429a66de924
Commit Graph

10632 Commits

Author SHA1 Message Date
mleich@mysql.com
4cbad914ca Post merge correction for the Changesset 
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
 2006-04-20 19:43:02 +02:00
pem@mysql.com
2dc3026c08 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime
 2006-04-20 16:00:33 +02:00
mleich@mysql.com
26b9d40309 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 15:25:28 +02:00
mskold@mysql.com
fdd6d3ca8c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
 2006-04-20 13:35:34 +02:00
mleich@mysql.com
e8178cabb1 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-20 12:35:10 +02:00
mskold@mysql.com
22d345bf5b Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
evgen@moonbone.local
e347ec5cbe func_gconcat.result, func_gconcat.test: 
Remove duplicate test case for bug#14169
 2006-04-20 13:34:14 +04:00
mleich@production.mysql.com
5109b3ce02 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/mleich/src
 2006-04-20 11:31:22 +02:00
evgen@moonbone.local
4b04ce8085 func_gconcat.test: 
Clean up test case for bug#14169
 2006-04-20 12:35:33 +04:00
igor@rurik.mysql.com
692da27388 Post merge fix 2006-04-20 00:42:12 -07:00
igor@rurik.mysql.com
7b0373a557 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:27:18 -07:00
igor@rurik.mysql.com
27cc6f4bc3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-04-19 18:08:15 -07:00
igor@rurik.mysql.com
67458961cf Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol. 2006-04-19 16:08:37 -07:00
igor@rurik.mysql.com
881b55d503 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
 2006-04-19 14:42:51 -07:00
jimw@mysql.com
b57eb9e17c Merge mysql.com:/home/jimw/my/mysql-5.0-17043 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-04-19 14:18:35 -07:00
evgen@moonbone.local
8b4eae6e4f func_gconcat.result: 
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
 2006-04-20 00:27:43 +04:00
dlenev@mysql.com
19e558a09d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mysql.com:/home/dlenev/mysql-5.0-bg16021
 2006-04-19 19:35:32 +04:00
dlenev@mysql.com
b128fa1022 Added test case for bug #16021 "Wrong index given to function in trigger" 
which was caused by the same bulk insert optimization as bug #17764 but
had slightly different symptoms.
 2006-04-19 19:13:03 +04:00
msvensson@neptunus.(none)
d7faf15ce5 Bug#19190 syntax error in mysql-test/mysql-test-run.sh script 2006-04-19 16:23:35 +02:00
msvensson@neptunus.(none)
ba658599e7 Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-04-19 13:56:09 +02:00
kroki@mysql.com
c51fb60b0b Bug#6951: Triggers/Traditional: SET @ result wrong 
While executing a trigger, we have to set thd->abort_on_warning to the value
it had at trigger creation time.
 2006-04-19 14:27:59 +04:00
svoj@april.(none)
06ce215f10 BUG#18160 - Memory-/HEAP Table endless growing indexes 
Updating data in HEAP table with BTREE index results in wrong index_length
counter value, which keeps growing after each update.

When inserting new record into tree counter is incremented by:
sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
But when deleting element from tree it doesn't decrement counter by key_size:
sizeof(TREE_ELEMENT) + tree->size_of_element

This fix makes accurate allocated memory counter for tree. That is
decrease counter by key_size when deleting tree element.
 2006-04-19 15:13:50 +05:00
igor@rurik.mysql.com
950214abfc Fixed bug #19079. 
The bug caused a reported index corruption in the cases when
key_cache_block_size was not a multiple of myisam_block_size,
e.g. when key_cache_block_size=1536 while myisam_block_size=1024.
 2006-04-18 20:57:31 -07:00
msvensson@neptunus.(none)
3f683e2ba4 Cleanup test cases that leaves "stuff" behind 2006-04-18 18:10:47 +02:00
msvensson@neptunus.(none)
210af244b2 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
 2006-04-18 17:07:35 +02:00
pem@mysql.com
9eb230f9bd Fixed BUG#18344: DROP DATABASE does not drop associated routines 
We must use the db key length in sp_drop_db_routines (and not the
  number of characters), or long db names will be truncated in the key.
 2006-04-18 16:01:01 +02:00
mleich@mysql.com
3a18f1e27c Merge mysql.com:/home/matthias/Arbeit/mysql-4.1/src 
into  mysql.com:/home/matthias/Arbeit/mysql-4.1/src-1
 2006-04-18 14:18:51 +02:00
mleich@mysql.com
d548dd4e37 Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src 
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-18 13:43:52 +02:00
pem@mysql.com
868ffcca86 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug18787/mysql-5.0-runtime
 2006-04-18 11:20:18 +02:00
pem@mysql.com
a6fbde9db7 Fixed BUG#18949: Test case sp-goto is disabled 
Removed sp-goto.test, sp-goto.result and all (disabled) GOTO code.
  Also removed some related code that's not needed any more (no possible
  unresolved label references any more, so no need to check for them).
  NB: Keeping the ER_SP_GOTO_IN_HNDLR in errmsg.txt; it might become useful
      in the future, and removing it (and thus re-enumerating error codes)
      might upset things. (Anything referring to explicit error codes.)
 2006-04-18 11:07:34 +02:00
msvensson@neptunus.(none)
030de4f912 Merge 192.168.0.20:mysql/bug13310/my50-bug13310 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-04-18 10:55:57 +02:00
msvensson@shellback.(none)
13062cbad6 BUG#13310 incorrect user parsing by SP 
- Strip surrounding ''s from username when a new user connects. There
   is no user 'a@', it should be a@
 2006-04-18 10:46:17 +02:00
igreenhoe@mysql.com
5f43b8609a Fix for bug #18979, bad RE in mysql-test-run.pl 2006-04-17 19:43:19 -07:00
cmiller@zippy.(none)
592dc88be7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 16:00:49 -04:00
cmiller@zippy.(none)
809cb7521c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-17 10:14:38 -04:00
gkodinov@mysql.com
94e556137d BUG#17152: Wrong result with BINARY comparison on aliased column 
Testsuite added
 2006-04-17 16:46:56 +03:00
bar@mysql.com
3fef2ba6aa Merge mysql.com:/usr/home/bar/mysql-4.1.b18691 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-04-17 15:01:55 +05:00
cmiller@zippy.(none)
7d282984f3 Only expand the empty string to the letters "NULL" if the column 
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.
 2006-04-16 17:17:36 -04:00
evgen@moonbone.local
bc1f457194 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14169-bug-4.1-mysql
 2006-04-14 17:25:58 +04:00
aelkin@mysql.com
b033da87fa Bug#19097: rpl_view failed on some platforms 
removing comments from the opt file.
 2006-04-14 12:13:26 +03:00
bell@sanja.is.com.ua
5c7955bd54 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 02:02:28 +03:00
konstantin@mysql.com
b5863b3987 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 02:38:41 +04:00
bell@sanja.is.com.ua
8136b25811 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-14 00:17:50 +03:00
bell@sanja.is.com.ua
efb8b990e4 The check for recursive view definitions added. (BUG#14308) 2006-04-13 23:12:26 +03:00
konstantin@mysql.com
6f51b4199f Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime-merge
 2006-04-14 00:07:04 +04:00
mleich@mysql.com
9ee2a76be3 Merge three.local.lan:/home/matthias/Arbeit/mysql-4.1/src-1 
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
 2006-04-13 21:09:26 +02:00
aelkin@dl145j.mysql.com
b6992dd4c5 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145j.mysql.com:/tmp/andrei/5.0-bug18715_drop_view_slave
 2006-04-13 20:55:51 +02:00
mleich@mysql.com
3ca1ec8fdc Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to 
MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
  - backport of several fixes done in MySQL 5.0 to 4.1
  - fix for new discovered instability (see comment on Bug#12429 + Bug#16920)
  - reenabling of testcases
 2006-04-13 20:42:48 +02:00
bell@sanja.is.com.ua
cb81389aef Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-04-13 15:07:50 +03:00
sergefp@mysql.com
34b2ed5f7f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/psergey/mysql-5.0-csc9139
 2006-04-13 16:07:48 +04:00