Commit graph

23515 commits

Author SHA1 Message Date
kent@mysql.com
89ca3c57d7 mysql_test_run_new.c:
Corrected path to SSL certificate files
2005-06-09 15:46:33 +02:00
kent@mysql.com
5942498979 mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
kent@mysql.com
4d0a81aa8b config-win.h:
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files
2005-06-09 05:04:59 +02:00
kent@mysql.com
0005165fa0 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'
2005-06-09 00:49:37 +02:00
kent@mysql.com
27591e68ce ps_7ndb.result, ps_6bdb.result:
Updated result files
2005-06-08 17:45:18 +02:00
lenz@mysql.com
024010e562 - make sure to include mysql-test/t/*.sql files in the binary distributions and when
"make install" is called (mysql_delimiter.sql was missing)
2005-06-08 11:49:24 +02:00
ramil@mysql.com
6f8ef49895 A fix (bug #11153: Ambiguous call to overloaded function, acording to Visual Studio 6) 2005-06-08 11:37:43 +05:00
igor@rurik.mysql.com
ab67410664 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-07 09:11:37 -07:00
igor@rurik.mysql.com
c9c52df80b 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 08:23:46 -07:00
paul@frost.snake.net
536028a284 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
2005-06-07 10:09:47 -05:00
paul@frost.snake.net
52a4221188 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0
2005-06-07 10:05:52 -05:00
paul@frost.snake.net
85648050af Typo in help message. 2005-06-07 10:03:09 -05:00
igor@rurik.mysql.com
db9d50808a Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 07:52:36 -07:00
igor@rurik.mysql.com
75ffe152d4 sql_yacc.yy:
Added missing ';'.
2005-06-07 07:48:56 -07:00
petr@mysql.com
451bc09790 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-07 17:58:14 +04:00
petr@mysql.com
a2331d37b6 several fixes to the previous patch 2005-06-07 17:57:20 +04:00
igor@rurik.mysql.com
5514c94865 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into rurik.mysql.com:/home/igor/mysql-4.1
2005-06-07 06:48:21 -07: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
igor@rurik.mysql.com
d3f3cc617d Many files:
Fixed bug #9899: erronious NOT_NULL flag for some attributes
  in the EXPLAIN table.
2005-06-07 06:34:13 -07:00
igor@rurik.mysql.com
0ca5b678ff Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-07 06:07:18 -07:00
igor@rurik.mysql.com
a2f7b552b0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into rurik.mysql.com:/home/igor/mysql-5.0
2005-06-07 06:00:37 -07:00
petr@mysql.com
83c75ea385 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-07 16:56:31 +04:00
lenz@mysql.com
1f40030a29 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-06-07 14:47:59 +02:00
monty@mysql.com
47c3261375 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2005-06-07 15:42:35 +03:00
lenz@mysql.com
d30f69ab0a - added the libndbclient static and shared libraries to the RPM (BUG 10676) 2005-06-07 14:39:00 +02:00
konstantin@mysql.com
8c0767cef5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-7306-final
2005-06-07 16:28:08 +04:00
petr@mysql.com
afd5975cfb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-06-07 16:11:17 +04:00
monty@mysql.com
1c725ff797 Revert Bar's fix as this causes changes in the key tree that could cause incompatibilites
Fix instead wrong call to ha_key_cmp
This is related to bug #10741 Inserting double value into utf8 column crashes server
2005-06-07 15:09:49 +03:00
petr@mysql.com
65d79b9d83 post-review fixes 2005-06-07 15:47:02 +04:00
igor@rurik.mysql.com
5833a5e54a Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 04:31:42 -07:00
igor@rurik.mysql.com
6cc77486b7 item_buff.cc:
Removed an extra space char.
2005-06-07 04:21:19 -07:00
konstantin@mysql.com
72b4b0b92c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-7306-final
2005-06-07 14:56:06 +04:00
dlenev@mysql.com
054139fc64 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
2005-06-07 14:54:48 +04:00
dlenev@brandersnatch.localdomain
270b695f59 Fix for bug #10015 "Crash in InnoDB if stored routines are used".
We should not allow explicit or implicit transaction commits inside
of stored functions or triggers (so in autocommit mode we should not
do commits after execution of sub-statement).
Also since we don't support nested statement transactions in 5.0,
we shouldn't commit or rollback stmt transactions while we are inside
stored functions or triggers. This should be fixed in later (>=5.1)
releases.
2005-06-07 14:53:08 +04:00
heikki@hundin.mysql.fi
96ee8cc0d5 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-06-07 13:50:45 +03:00
konstantin@mysql.com
ac2a9eb699 Manual merge. 2005-06-07 14:50:45 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
052a09fef3 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-07 13:50:44 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
6a3ee4192d Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-07 13:50:43 +03:00
lenz@mysql.com
12ad3e70d6 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/my/mysql-5.0
2005-06-07 12:50:43 +02:00
joreland@mysql.com
60474c8b0b ndb - backup/restore, fix count of dist keys
better fix for bug#10190
2005-06-07 12:50:42 +02:00
igor@rurik.mysql.com
6244353c2a Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-06-07 03:12:12 -07:00
konstantin@mysql.com
9f379d7f05 Patch two (the final one) for Bug#7306 "the server side preparedStatement
error for LIMIT placeholder".
The patch adds grammar support for LIMIT ?, ? and changes the
type of ST_SELECT_LEX::select_limit,offset_limit from ha_rows to Item*,
so that it can point to Item_param.
2005-06-07 14:11:36 +04:00
igor@rurik.mysql.com
1d976dcb35 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 03:07:42 -07:00
igor@rurik.mysql.com
90dd86907e sql_select.cc, item_buff.cc, item.h:
Fixed bug #11088: a crash for queries with GROUP BY a BLOB column
  + COUNT(DISTINCT...) due to an attempt to allocate a too large
  buffer for the BLOB field.
  Now the size of the buffer is limited by max_sort_length.
group_by.test, group_by.result:
  Added a test case for bug #11088.
2005-06-07 03:05:57 -07:00
lenz@mysql.com
a411763dae Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-07 11:41:55 +02:00
lenz@mysql.com
6e5818e977 - manual merge of mysql.spec.sh 2005-06-07 11:40:56 +02:00
heikki@hundin.mysql.fi
9fa55fb9be innodb.result:
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:32:39 +03:00
heikki@hundin.mysql.fi
9ad74a806a innodb.test:
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:29:49 +03:00
heikki@hundin.mysql.fi
64ed9d3adc innodb.result, innodb.test:
Update Monty's tests for AUTO-INC bug #11080 and bug #11005
2005-06-07 12:27:37 +03:00
elliot@mysql.com
fe84398b9f Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
into  mysql.com:/Users/emurphy/src/work/mysql-4.1
2005-06-07 05:10:56 -04:00