mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32772 commits 2781 branches 343 tags 1.6 GiB
Commit graph

32772 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
c2feb2141e Merge 
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/log.cc:
  Auto merged
 2006-04-11 02:48:17 +02:00
unknown
94c3287616 manual merge 2006-04-10 20:48:15 -04:00
unknown
4bc86a89fa disabled.def: 
Disabled randomly failing tests


mysql-test/t/disabled.def:
  Disabled randomly failing tests
 2006-04-10 22:51:17 +02:00
unknown
9f55b7cb13 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-04-11 00:32:36 +05:00
unknown
db97230ecf Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/gluh/MySQL/Merge/5.1-new
 2006-04-11 00:32:35 +05:00
unknown
2d8c3c3abe Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-04-10 21:32:35 +02:00
unknown
c7a563ba10 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/home/hf/work/mysql-5.1.upgrd
 2006-04-11 00:32:34 +05:00
unknown
dba879409b Merge mysql.com:/home/alexi/bugs/mysql-5.0-temp 
into  mysql.com:/home/alexi/bugs/mysql-5.1-temp


mysql-test/r/innodb.result:
  Null-merge
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto-merge
 2006-04-10 23:32:33 +04:00
unknown
282ddcbecb Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868-work
 2006-04-10 22:48:08 +04:00
unknown
7897a3613a Fixed test case result (after BUG#15868 fix). 2006-04-10 22:44:01 +04:00
unknown
1b0211921b Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17946 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
 2006-04-10 13:12:28 -04:00
unknown
4e1682ab15 BUG*#17946: New test case for already fixed bug (Problem with LIKE searches for partitioned tables) 
Added new test case for bug 17946


mysql-test/r/partition_pruning.result:
  Added new test case for bug 17946
mysql-test/t/partition_pruning.test:
  Added new test case for bug 17946
 2006-04-10 13:07:50 -04:00
unknown
45945b84e7 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15868
 2006-04-10 19:58:20 +04:00
unknown
41b7ffd880 WL#2645 (mysql_upgrade tool) 
client/mysql_upgrade.c:
  code fixed after the discussion
 2006-04-10 20:54:43 +05:00
unknown
b04dd7e248 Fix for bug#18753 Partitions: auto_increment fails 
Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.


mysql-test/r/partition.result:
  Fix for bug#18753 Partitions: auto_increment fails
  test case
mysql-test/t/partition.test:
  Fix for bug#18753 Partitions: auto_increment fails
  test case
 2006-04-10 20:54:42 +05:00
unknown
8a8d6853ae Updated disable.def file with BUG numbers, time of disable and disabler 2006-04-10 17:54:42 +02:00
unknown
339bc7214e Merging 2006-04-10 20:54:42 +05:00
unknown
e0a19fd904 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15868-work 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15868
 Null-merge


sql/mysqld.cc:
  Null-merge.
 2006-04-10 19:54:41 +04:00
unknown
e9ea296127 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'. 
Applied changes due Heikki Tuuri.


sql/mysqld.cc:
  Set innodb_thread_concurrency default value to 8 (Bug#15868).
   Changes due to Heikki Tuuri.
 2006-04-10 19:47:41 +04:00
unknown
6658c6d30f Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18752 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
 2006-04-10 10:52:25 -04:00
unknown
b6fa5bb047 Merge c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18423 
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug15561
 2006-04-10 10:51:21 -04:00
unknown
8a43d4afee BUG#18423: Added test case for this bug that was already fixed (was issue with hash partitions not showing all rows in BETWEEN range 
Added test case for bug 18423


mysql-test/r/partition_hash.result:
  Added test case for bug 18423
mysql-test/t/partition_hash.test:
  Added test case for bug 18423
 2006-04-10 10:44:47 -04:00
unknown
41fa40e8c2 BUG#18752: Added test case for SHOW CREATE TABLE not showing NULL values properly in bug already fixed 
Added new test case for bug 18752 (bug already fixed by previous patch)


mysql-test/r/partition.result:
  Added new test case for bug 18752 (bug already fixed by previous patch)
mysql-test/t/partition.test:
  Added new test case for bug 18752 (bug already fixed by previous patch)
 2006-04-10 10:18:57 -04:00
unknown
8386cfd73e BUG#15561: Possible to strange things with partitions defined although no partition support compiled in 
Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.


sql/lex.h:
  Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.
 2006-04-10 10:00:08 -04:00
unknown
ff343a415e mysql-test-run.pl: 
Added --ndbcluster_port for backward compatibility
make_win_src_distribution.sh:
  Updated to reflect 5.1 changes


scripts/make_win_src_distribution.sh:
  Updated to reflect 5.1 changes
mysql-test/mysql-test-run.pl:
  Added --ndbcluster_port for backward compatibility
 2006-04-10 14:15:02 +02:00
unknown
a67450b741 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-10 09:56:57 +02:00
unknown
d57f53bf3c Merge perch.ndb.mysql.com:/home/jonas/src/50-jonas 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-10 08:29:24 +02:00
unknown
7363712b79 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-04-10 08:27:59 +02:00
unknown
a514095a5d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-04-09 20:07:42 -07:00
unknown
cf272cefc0 Disabling test, added bug #18928 
mysql-test/t/disabled.def:
  Adding disabled test for bug
 2006-04-09 19:43:36 -07:00
unknown
9b0da58292 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


sql/log.cc:
  Auto merged
 2006-04-09 23:47:11 +03:00
unknown
dde4ebdd0c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-04-09 22:17:55 +02:00
unknown
304865a39c Disabled two broken test, created P1 showstoppers from them. 
mysql-test/t/disabled.def:
  Updating for broken tests
 2006-04-09 11:57:25 -07:00
unknown
093f3571c7 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2006-04-09 19:17:26 +02:00
unknown
99afb2bafd Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
sql/log.cc:
  Auto merged
 2006-04-09 19:38:59 +03:00
unknown
2478092d13 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
 2006-04-09 19:35:31 +03:00
unknown
2c7fb8f20c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
 2006-04-09 18:19:41 +02:00
unknown
1b221d24a9 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
 2006-04-09 20:19:40 +04:00
unknown
35be8c8892 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  dl145k.mysql.com:/tmp/andrei/5.0.21-bug17284-temp_table
 2006-04-09 18:14:30 +02:00
unknown
8abfc0e755 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/bugs/mysql-5.0-15758
 2006-04-09 20:14:29 +04:00
unknown
9dbf828099 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work 
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758


sql/sql_cache.cc:
  SCCS merged
sql/sql_class.cc:
  SCCS merged
sql/sql_cursor.cc:
  SCCS merged
 2006-04-09 17:48:47 +04:00
unknown
9f7215d61b BUG#18906 Test case rpl_temporary fails when using --vardir option 
env variable name is fixed.




mysql-test/include/get_binlog_dump_thread_id.inc:
  Fixing to right env $var name.
mysql-test/r/rpl_temporary.result:
  results
 2006-04-09 13:27:53 +03:00
unknown
6051eb31b5 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2006-04-09 10:40:52 +02:00
unknown
d560d638b8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
 2006-04-09 09:36:59 +02:00
unknown
dbb1511631 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql-common/client.c:
  Auto merged
 2006-04-09 09:35:20 +02:00
unknown
474c502627 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
 2006-04-08 18:51:29 +03:00
unknown
b536875132 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-04-08 16:35:07 +02:00
unknown
6474d79629 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
 2006-04-08 16:33:59 +02:00
unknown
fe0a63b1b9 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/M51/mysql-5.1
 2006-04-08 16:08:38 +02:00
unknown
e44359014a #18906: bushbuild reports rpl_temporary fails on solaris, AIX, QNX 
Removing the problematic line from include test file.


mysql-test/include/get_binlog_dump_thread_id.inc:
  replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
  results
 2006-04-08 16:29:11 +03:00