mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17753 commits 2784 branches 343 tags 1.6 GiB
Commit graph

17753 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
lars@mysql.com
0997684f96 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-03-16 14:44:30 +01:00
bar@mysql.com
a7b877df78 Bugs#9129: CHARSET(), COLLATION(), COERCIBILITY() 
not always correct for NULL values.
Now they always result a non NULL value even
the argument is NULL. It is more usefull for 
debugging purposes.
 2005-03-16 17:44:29 +04:00
lars@mysql.com
65d88538d3 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-03-16 14:44:29 +01:00
gluh@gluh.mysql.r18.ru
41487d0b4e Fix for bug#8656: Crash with group_concat on alias in outer table 
fixed result_field support of Item_ref
 2005-03-16 16:44:28 +03:00
monty@mysql.com
265270b970 Fix to get --skip-ndb to work 2005-03-16 15:32:43 +02:00
lars@mysql.com
52f190c098 BUG#9123: Updates after Mats review 2005-03-16 13:57:59 +01:00
lars@mysql.com
529f9db996 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-03-16 13:57:58 +01:00
gluh@gluh.mysql.r18.ru
4c3e8b078c Fix for bug #7100: relay_log_space_max missing from SHOW VARIABLES 2005-03-16 15:57:57 +03:00
lars@mysql.com
70b012036b Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-03-16 12:49:44 +01:00
bar@mysql.com
2d8e8c02a5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
 2005-03-16 14:35:44 +04:00
lars@mysql.com
197cf9603a Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/bkroot/mysql-4.1
 2005-03-16 08:58:48 +01:00
lars@mysql.com
11f93ffd2d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 08:14:05 +01:00
igor@rurik.mysql.com
ce6c390c39 olap.result, olap.test: 
Added a test case for bug #8616.
item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
 2005-03-15 22:50:54 -08:00
mskold@mysql.com
515bd1fed8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-03-16 07:47:02 +01:00
monty@mysql.com
fde941e5b4 Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
reggie@mdk10.(none)
6c00af77a0 Bug #6660 mysqldump creates bad pathnames on Windows 
sql_show.cc:
  changed strdup to thd->memdup per Serg's advice
 2005-03-15 16:24:37 -06:00
mskold@mysql.com
d40e154353 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-03-15 22:20:57 +01:00
mskold@mysql.com
057d78650e Fix for bug#9166: Cluster compile failure on Solaris 10 2005-03-15 22:19:55 +01:00
reggie@mdk10.(none)
ef86c0af65 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-03-15 11:37:14 -06:00
reggie@mdk10.(none)
887f2a53fe Bug #6660 mysqldump creates bad pathnames on Windows 
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
 2005-03-15 11:33:06 -06:00
lars@mysql.com
26fae36137 BUG#9123: If a table name is given with an underscore, 
then this must be properly quoted when sent to 
SHOW TABLES LIKE ...
 2005-03-15 16:23:02 +01:00