mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17930 commits 2785 branches 343 tags 1.6 GiB
Commit graph

17930 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
bf2f6ff2d4 BUG#9303 blob field with specified length < 256 does not create tinyblob 2005-03-24 13:48:38 +01:00
msvensson@neptunus.(none)
c4a698ea3e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-24 12:21:55 +01:00
serg@serg.mylan
639c58bff7 mysql-test/r/ps_6bdb.result 
followup - results fixed
 2005-03-24 10:28:02 +01:00
serg@serg.mylan
091f069671 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-03-23 21:10:01 +01:00
serg@serg.mylan
106ac5b0f6 upgrade zlib to 1.2.2 2005-03-23 21:08:13 +01:00
serg@serg.mylan
f21f8f983f client/mysqltest.c 
corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert
 2005-03-23 20:38:42 +01:00
gbichot@quadita2.mysql.com
bd74a139dc Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
 2005-03-23 19:50:42 +01:00
gbichot@quadita2.mysql.com
19499229ed "After Monty's review" changes to the fix for BUG#8325 "Deadlock in replication thread stops replication": 
s/sleep/safe_sleep (thread safe); sleep 0/1/2/3/4/5/5/5 (get slave less late);
no message on error log (deadlock is too common sometimes), a global counter
instead (SHOW STATUS LIKE 'slave_retried_transactions').
Plus a fix for libmysql/Makefile.shared
 2005-03-23 19:19:36 +01:00
paul@kite-hub.kitebird.com
555815734e README: 
Fix typo.
 2005-03-23 10:45:57 -06:00
msvensson@neptunus.(none)
a430d5a1a5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-23 09:41:01 +01:00
bell@sanja.is.com.ua
4554b1f263 fixed union types merging and table related metadata (BUG#8824) 2005-03-23 08:36:48 +02:00
brian@zim.(none)
cfcedd85cd Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database. 2005-03-22 16:10:39 -08:00
jimw@mysql.com
0842efeab2 Fix calls to memset() with arguments out of order. (Bug #9323) 2005-03-22 16:00:02 -08:00
mskold@mysql.com
9347abfe8d Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
mskold@mysql.com
2adabcb328 Added better comment for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:48:28 +01:00
mskold@mysql.com
27dbed4384 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
msvensson@neptunus.(none)
7603a84e24 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-22 16:16:10 +01:00
kent@mysql.com
2a53e9d9a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-03-22 15:57:20 +01:00
kent@mysql.com
f3d284c8bc mysql-test-run.sh, mysql-test-run.pl: 
InnoDB needs longer start time for second slave on slow hosts
 2005-03-22 15:12:05 +01:00
msvensson@neptunus.(none)
e1e4a08695 Merge neptunus.(none):/home/msvensson/mysql/bug9072 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-03-22 14:29:34 +01:00
monty@mysql.com
f849ac68a5 Fixed newly introduced bug in ROLLUP 2005-03-22 02:36:31 +02:00
heikki@hundin.mysql.fi
8a906d79aa trx0trx.c: 
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
 2005-03-21 22:21:55 +02:00
heikki@hundin.mysql.fi
177e7b7f47 Merge 2005-03-21 22:14:00 +02:00
heikki@hundin.mysql.fi
3f378c5232 trx0trx.c, trx0trx.h: 
If MySQL wrote to its binlog, but for some reason trx->update_undo and trx->insert_undo were NULL in InnoDB, then trx->commit_lsn was garbage, and InnoDB could assert in the log flush of trx_commit_complete_for_mysql() (Bug #9277)
 2005-03-21 22:10:42 +02:00
kent@mysql.com
61ef715e35 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-build 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-03-21 17:46:20 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
a34ee2c900 A fix for Netware. 2005-03-21 18:11:11 +02:00
kent@mysql.com
c3fa95d467 mtr_report.pl: 
Made --timer work
mtr_cases.pl:
  Added option --reorder to get less server restarts
mysql-test-run.pl:
  Added option --reorder to get less server restarts
  Moved do_before_start_master() not to remove binlog files unless restarted
  Made --timer work
  Slave was incorrectly writing log to error log
 2005-03-21 16:01:39 +01:00
msvensson@neptunus.(none)
a5bb4810ff BUG#9072 'Max_error_count' system variable cannot be set to zero 
- Chaned min value in mysqld.cc
 - Added testcase to warnings.test
 2005-03-21 11:07:31 +01:00
joerg@mysql.com
517544590b Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2005-03-18 17:14:17 +01:00
joerg@mysql.com
e0d948922b Move mis-placed assignments to their proper position. 2005-03-18 12:44:40 +01:00
serg@serg.mylan
1ccb9dd214 don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
igor@rurik.mysql.com
6f5fbaad59 olap.test: 
Added a test case for bug #8617.
sql_select.cc:
  Fixed bug #8617.
  Queries with ROLLUP and LIMIT n returned more than n rows
  if SQL_CALC_FOUND_ROWS was used.
 2005-03-17 20:18:19 -08:00
paul@frost.snake.net
b280af8f44 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
 2005-03-17 11:48:11 -06:00
paul@frost.snake.net
cf5f436236 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0
 2005-03-17 11:43:56 -06:00
paul@frost.snake.net
7187121660 Merge frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0 
into frost.snake.net:/Volumes/frost2/MySQL/bk/merge-4.1
 2005-03-17 11:42:51 -06:00
paul@frost.snake.net
256c04dcd8 Update URL. 2005-03-17 11:40:41 -06:00
paul@frost.snake.net
86f9b77756 Update URL. 2005-03-17 11:33:07 -06:00
gbichot@quadxeon.mysql.com
7ee2ecbe5d Merge quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.1-4xeon
 2005-03-17 17:00:44 +01:00
gbichot@quadxeon.mysql.com
3cb85a4740 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into quadxeon.mysql.com:/nfstmp1/guilhem/mysql-4.0-4xeon
 2005-03-17 15:51:52 +01:00
gbichot@quadxeon.mysql.com
d823bee92a safer creation of temp files used in replication of LOAD DATA INFILE. 
When we come to create these, they may already exist and it's necessary to delete these old, useless copies.
 2005-03-17 14:39:39 +01:00
ramil@mysql.com
261105a007 Merge 2005-03-17 10:59:25 +04:00
ramil@mysql.com
a773916238 A fix (bug #8942: SUBSTRING_INDEX in UPDATE causes internal loop). 2005-03-17 10:24:50 +04:00
igor@rurik.mysql.com
3103b4cae5 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-03-16 17:50:03 -08:00
igor@rurik.mysql.com
45ba13889d olap.result, olap.test: 
Added a test for bug #8615.
sql_select.cc:
  Fixed bug #8615.
  This fix only removed the cause of the reported crash.
  It does not resolve other problems of rollup queries
  with DISTINCT. They were fixed in the previous patch 
  for bug 8616.
 2005-03-16 15:55:04 -08:00
lars@mysql.com
155f8ff82d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 23:44:47 +01:00
lars@mysql.com
fc6eda1336 Fixes after Sinisa and Serg comments after push of patch for BUG#9123. 
BUG#9123 is solved earlier than this patch though.
 2005-03-16 21:56:56 +01:00
joerg@mysql.com
29a78e7e88 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00
joerg@mysql.com
ea5899a65d Add information to the log file written by 'Do-compile' that allows to calculate 
the time spent in the various steps.
 2005-03-16 16:33:06 +01:00
bell@sanja.is.com.ua
80d9cafa8f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-03-16 17:06:04 +02:00
monty@mysql.com
a085653331 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-03-16 15:44:31 +02:00