mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21138 commits 2791 branches 343 tags 1.7 GiB
Commit graph

21138 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
c29427ec3c Use replace_regex to mask the output of file_id= in "show binlog events" that depends on previous tests 
What is this? replace_regex in 4.1! :)
 2006-10-04 22:52:44 +02:00
msvensson@neptunus.(none)
6ac9c43e51 Set slave_load_path to ../../var/tmp in version prior to 5.0 to be compatible with mysql-test-run.sh 2006-10-04 22:50:34 +02:00
msvensson@neptunus.(none)
914f2bbc2a Create the mysqld.spec file with a unique name in mysql-test dir, $opt_var_dir haven't been created yet 2006-10-04 19:21:22 +02:00
msvensson@neptunus.(none)
0903a9f836 --ndb-extra-logging option to mysqld is not available until 5.1 2006-10-04 18:48:22 +02:00
msvensson@neptunus.(none)
d8191af7ee Fixup the regex's parsing the mysqld's version and variables 
Add paths for ndb binaries
Some more backport issues
 2006-10-04 16:28:23 +02:00
msvensson@shellback.(none)
3db774af45 Backport from 5.1 
-Add support for detecting version and features from mysqld binary
 - Autodetect netware
 - Disable some features not available below 5.0
 - Cleanup executable_setup to look for one executable at a time, only llok for the ones that are needed based on the selected testcases and settings
 2006-10-04 12:47:32 +02:00
msvensson@shellback.(none)
5aac9b58eb Don't print version in error message, just too messy to test 2006-10-04 12:27:05 +02:00
msvensson@neptunus.(none)
54a76f4946 Add possibility to send warnings about suspicious commands in .test file to <result_file_name>.warnings file 
Move detection of "parsing enabled" to after command has been read.
Cleanup parsing enabled/disabled
 2006-10-04 01:20:08 +02:00
msvensson@neptunus.(none)
89a53ef374 Fix problem when both option SSL and COMPRESS specified 2006-10-03 23:11:47 +02:00
msvensson@shellback.(none)
538e1881ce Fix typo 
- Change con_host to ds_connection_name.str
 2006-10-03 16:34:44 +02:00
msvensson@shellback.(none)
8f3fbd2625 Add two new result files 2006-10-03 15:48:41 +02:00
msvensson@shellback.(none)
2cea0e6b13 Update mysqltest to latest version 
- ie. backport from 5.1
 - also update testcase error dected by new version
 2006-10-03 15:33:44 +02:00
msvensson@neptunus.(none)
035b54049e Merge bk-internal:/home/bk/mysql-4.1-runtime 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 12:55:33 +02:00
msvensson@neptunus.(none)
2ef628bfad Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:45:19 +02:00
msvensson@neptunus.(none)
cc0f26c83f Merge bk-internal:/home/bk/mysql-4.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:20:37 +02:00
msvensson@neptunus.(none)
ffeaf3eb85 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 11:19:00 +02:00
msvensson@shellback.(none)
60f9a9a8aa Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 08:59:00 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
72ad606ece Merge mysql.com:/usr/home/bar/mysql-4.1.b8663 
into  mysql.com:/usr/home/bar/mysql-4.1-rpl
 2006-10-03 11:53:01 +05:00
dlenev@mockturtle.local
c30b6eafac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mockturtle.local:/home/dlenev/src/mysql-4.1-rt-merge
 2006-10-03 08:19:06 +04:00
msvensson@shellback.(none)
600586c680 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-03 00:51:23 +02:00
msvensson@shellback.(none)
b975b4a793 Add ATTRIBUTE_FORMAT_FPTR macro for setting format specifier also on function pointers 
This was available from gcc 3.1, so diable it before that
Update m_ctype.h to use the new macro
 2006-10-03 00:48:26 +02:00
tsmith/tim@siva.hindu.god
1d5d5a1c4a Merge siva.hindu.god:/usr/home/tim/m/bk/40 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:18:42 -06:00
tsmith/tim@siva.hindu.god
65dd6e0c1e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/usr/home/tim/m/bk/41
 2006-10-02 16:16:24 -06:00
tsmith/tim@siva.hindu.god
3e20a10899 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  siva.hindu.god:/usr/home/tim/m/bk/40
 2006-10-02 16:13:58 -06:00
msvensson@neptunus.(none)
d5ad8ff4a2 Remove faulty merge 2006-10-02 14:05:36 +02:00
msvensson@neptunus.(none)
cb0a874c11 When compiling with qcc on QNC the define __GNUC__will be set although it doesn't support full GNU syntax 
- disable __attribute__ when using qcc
 2006-10-02 13:53:10 +02:00
msvensson@neptunus.(none)
c3a1980e16 Remove faulty merge causing ctype_utf8 failure 2006-10-02 13:47:18 +02:00
msvensson@neptunus.(none)
1517d37048 Fix __attribute__(A) macro (it formerly used bogus __cplusplus__ symbol) 2006-10-02 13:46:40 +02:00
msvensson@neptunus.(none)
1dc026f79d Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-02 13:36:30 +02:00
msvensson@neptunus.(none)
b277139b0c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-02 13:18:54 +02:00
svoj@mysql.com/april.(none)
5f3cf1eca3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:46:10 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
 2006-10-02 14:42:12 +05:00
jimw@rama.(none)
34531d261b Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-29 19:29:12 -07:00
jimw@rama.(none)
52d22ad827 Disable __attribute__ entirely on g++ < 3.4. (Bug #2717) 2006-09-29 19:28:16 -07:00
jimw@rama.(none)
5963b5af0f Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-29 19:26:33 -07:00
cmiller@zippy.cornsilk.net
cca474bb67 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-29 17:23:44 -04:00
istruewing@chilla.local
c2d73af1b2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into  chilla.local:/home/mydev/mysql-4.0-bug20719
 2006-09-29 19:55:09 +02:00
istruewing@chilla.local
5ad8f1c464 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug22384
 2006-09-29 17:17:01 +02:00
svoj@mysql.com/april.(none)
0297046a10 Fix a test case according to fix for bug#10974. 2006-09-29 19:00:52 +05:00
jimw@rama.(none)
caf4392f71 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  rama.(none):/home/jimw/my/mysql-4.1-clean
 2006-09-28 18:11:29 -07:00
iggy@rolltop.ignatz42.dyndns.org
06ea6d7323 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-09-28 15:56:14 -04:00
dlenev@mockturtle.local
acaa584c55 Fix for bug#22338 "Valgrind warning: uninitialized variable in 
create_tmp_table()".

The fix for bug 21787 "COUNT(*) + ORDER BY + LIMIT returns wrong
result" introduced valgrind warnings which occured during execution
of information_schema.test and sp-prelocking.test in version 5.0.
There were no user visible effects.

The latter fix made create_tmp_table() dependant on
THD::lex::current_select value. Valgrind warnings occured when this
function was executed and THD::lex::current_select member pointed
to uninitialized SELECT_LEX instance.

This fix tries to remove this dependancy by moving some logic
outside of create_tmp_table() function.
 2006-09-28 23:47:49 +04:00
istruewing@chilla.local
fd2a6a7a40 Merge chilla.local:/home/mydev/mysql-4.0-bug22384 
into  chilla.local:/home/mydev/mysql-4.1-bug22384
 2006-09-28 21:47:42 +02:00
iggy@rolltop.ignatz42.dyndns.org
f063bee3b2 Bug#20305: PROCEDURE ANALYSE() returns wrong M for FLOAT(M, D) and DOUBLE(M, D) 2006-09-28 14:30:20 -04:00
svoj@mysql.com/april.(none)
2de51adffa Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
 2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b BUG#21617 - crash when selecting from merge table with inconsistent indexes 
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.

If number of keys in merge table is not bigger than requested key number,
return error.
 2006-09-28 22:10:06 +05:00
cmiller@zippy.cornsilk.net
56d2406375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-09-28 10:02:53 -04:00
istruewing@chilla.local
52758d8615 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug20719-m
 2006-09-28 12:20:17 +02:00
istruewing@chilla.local
4027fc8dca Bug#22384 - DELETE FROM table causes "Incorrect key file for table" 
Deletes on a big index could crash the index when it needs to
shrink.

Put a forgotten negation operator in.

No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.
 2006-09-28 11:41:38 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6 Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1 
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
 2006-09-28 10:19:25 +02:00