Commit graph

443 commits

Author SHA1 Message Date
serg@serg.mylan
2a8e4383f8 fixes to make the code compile with gcc 2.95 2006-02-28 22:07:14 +01:00
monty@mysql.com
e3796c924f After merge fixes 2006-02-26 15:11:56 +02:00
jimw@mysql.com
30c343a04e Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 10:59:47 -08:00
jimw@mysql.com
7182785f19 Fix subselect results (there was a bad merge when subselect test was disabled) 2006-02-17 10:02:59 -08:00
holyfoot@deer.(none)
942503927a WL#2645 (CHECK FOR UPGRADE)
5.1-related fixes
2006-02-17 13:37:37 +04:00
konstantin@mysql.com
9f0bb47f87 Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
sasha@asksasha.com
144490850a Merge spachev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  asksasha.com:/reiser-data/mysql-dev/mysql-5.1-new
2006-01-30 20:58:17 -07:00
konstantin@mysql.com
d2bba04183 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 15:15:09 +03:00
svoj@april.(none)
f84b301bd1 BUG#3074: Unversioned symbols in shared library
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
tomas@poseidon.ndb.mysql.com
931ec48085 coreect build error without ndb 2006-01-13 09:42:49 +01:00
tomas@poseidon.ndb.mysql.com
46b867757a updated mysql-test-run.pl to adjust to ndb replication testing 2006-01-13 03:13:58 +01:00
tomas@poseidon.ndb.mysql.com
0a0fe2b1c0 bug: replication of table spaces to work
bug: check if storage engine is enabled to avoif code dump
2006-01-11 19:49:38 +01:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
2006-01-11 02:07:40 +03:00
bar@mysql.com
cd56ec80bc ignore:
added item_xmlfunc.cc
2005-12-26 12:16:28 +04:00
monty@mysql.com
ba99b6c565 Fixed compile errors (when compiling in debug mode) 2005-12-25 16:34:10 +02:00
jimw@mysql.com
548bacf41b Fix innodb result file (merge clean-up) 2005-12-06 19:55:48 -08:00
jimw@mysql.com
af88d67a19 Import BDB 4.4.16 2005-12-05 10:27:46 -08:00
monty@mysql.com
aa37b75768 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2005-11-24 02:56:12 +02:00
monty@mysql.com
f5804869e3 Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
Larger stack size neaded for open table on x86 64 bit
Fix failing test cases
Deleted symlink from bk
2005-11-24 02:36:28 +02:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
SergeyV@selena.
be18f91a01 Added number of files into ignore list for win32 build within bk tree. 2005-11-14 16:36:05 +03:00
jimw@mysql.com
2e13e29a29 Add generated files to ignore list 2005-11-07 16:39:20 -08:00
monty@mysql.com
cdf64f0f57 Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
This is a merge of 5.0 -> 5.1 + some code from old 5.1 tree to get all tests to work and keep the .frm format the same as the old 5.1 tree.
2005-11-05 13:20:35 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0 Merge 2005-10-06 10:54:07 +02:00
jimw@mysql.com
dcd8b9a503 Add files for bdb/build_win64, and tweak the configuration to skip over
parts of the library we have omitted.
2005-09-22 16:42:39 -07:00
jimw@mysql.com
b75cc41b7b Remove some files that should not have been added with BDB upgrade,
and update ignore file after move of storage engines to storage/.
2005-09-22 15:53:18 -07:00
konstantin@mysql.com
2d4c54ba1b Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-09-23 00:46:59 +04:00
monty@mysql.com
82fc54781b Fixed problems found by valgrind
Fixed problems in test suite where some test failed
Fixed access to not initialized memory in federated
Fixed access to not initialized memory when using BIT fields in internal temporary tables
2005-09-22 03:23:07 +03:00
monty@mysql.com
9727fe5abf Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1
2005-09-15 17:17:26 +03:00
monty@mysql.com
444dbfaf17 Turn off EOLN_NATIVE flag for all test files
Ignored some generated files
2005-09-15 17:14:39 +03:00
jonas@eel.(none)
2bd9c2d6f6 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-09-09 12:54:03 +02:00
jonas@eel.(none)
6ec3fa6ac1 ndb
new testprogram testSRBank
2005-09-09 12:39:06 +02:00
jan@hundin.mysql.fi
fc4fea68ad Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-09-05 08:35:58 +03:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
sasha@asksasha.com
c594ab7921 updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication).
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's 
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and 
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of 
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query 
logging does work.
2005-08-18 21:40:14 -06:00
serg@sergbook.mysql.com
d689d415b3 forgotten 'return' 2005-08-14 23:20:06 +02:00
monty@mysql.com
15d48525af Merge mysql.com:/home/my/mysql-4.1
into  mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
monty@mysql.com
af6863e7d0 Moved test for 'show full processlist' to not_embedded_server.test becasue it could fail on a slow computer where previous connections has not yet disconnected 2005-07-27 13:45:06 +03:00
monty@mysql.com
24d45c5c30 Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1
2005-07-27 13:24:59 +03:00
monty@mysql.com
4098c40d87 Review fixes:
Fixed portability problem with bool in C programs
Moved close_thread_tables out from LOCK_thread_count mutex (safety fix)
my_sleep() -> pthread_cond_timedwait()
2005-07-26 17:55:58 +03:00
jan@hundin.mysql.fi
5607acde81 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hundin.mysql.fi:/home/jan/new/mysql-5.0
2005-07-20 13:47:05 +03:00
konstantin@mysql.com
15ef68df0f Ignore mysql-test/var (I'm pushing it for the second time already :(() 2005-07-20 00:02:49 +04:00
konstantin@mysql.com
d2814fb1b5 Added mkinstalldirs (an auxiliary autotools symlink) to the ignore
list.
2005-07-19 11:35:16 +04:00
jan@hundin.mysql.fi
6aeca28a96 Added InnoDB offline file checksum utility. 2005-07-19 10:03:19 +03:00
timour@mysql.com
3220f721dd Fix for BUG#11211 "GROUP BY doesn't work correctly"
When the GROUP BY clause contains a column reference that can be resolved to
both an aliased column in the SELECT list, and to a column in the FROM clause,
the group column is resolved to the column in the FROM clause (for ANSI conformance).
However, it may be so that the user's intent is just the other way around, and he/she
gets the query results grouped by a completely different column than expexted.
This patch adds a warning in such cases that tells the user that there is potential
ambiguity in the group column.

sql/sql_select.cc
- Added a warning when a GROUP column is ambiguous due to that there is a
  column reference with the same name both in the SELECT and FROM clauses.
  In this case we resolve to the column in FROM clause and warn the user
  of a possible ambiguity.
- More extensive comments.
- Changed the function to return bool instead of int (as in other places).

mysql-test/t/group_by.test
  Added test for BUG#11211.

mysql-test/r/group_by.result
  Added test for BUG#11211.
2005-06-15 10:12:49 +03:00
igor@rurik.mysql.com
c963b12fd3 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
elliot@mysql.com
b906f31388 BUG#7967 Fix mysqlhotcopy --record-log-position 2005-06-06 22:17:16 -04:00
konstantin@mysql.com
f96de23ad3 Remove automatically generated autotools files from revision control.
Fix build scripts to create them.
2005-05-18 15:23:29 +04:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00