vva@eagle.mysql.r18.ru
34857ee664
manual merge
...
charged sql/sql_db.cc only
(
changed length in mysql_create_db to path_len
so as it was calculated in the first unpack_dirname
in my previous fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
)
2004-07-09 21:06:32 +05:00
vva@eagle.mysql.r18.ru
6782982254
added an optimization in mysql_create_db (sql_db.cc)
...
as after effect of fix for Bug #4378
'"create database IF NOT EXISTS thing" returns an error'
(avoided an unpack_dirname and
changed strcat into strmake)
2004-07-09 20:39:50 +05:00
serg@serg.mylan
8064f06562
mysqlhotcopy:
...
fix MYI copying with scp
safer tempfile creation
2004-07-09 14:30:51 +02:00
monty@mysql.com
07808113d6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-07-09 10:55:47 +03:00
monty@mysql.com
c1032fe9eb
Cleanup of db option cacheing
...
Some bug fixes to last pushed code
2004-07-09 10:55:16 +03:00
monty@mysql.com
064b8b8f65
Merge with 4.0 to get bug fixes
2004-07-09 02:29:28 +03:00
monty@mysql.com
801a24952e
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-07-09 02:03:50 +03:00
monty@mysql.com
93f3d4c020
Updated result sets (from 4.1)
2004-07-09 02:03:19 +03:00
konstantin@mysql.com
664329b565
my_global.h:
...
Define cxa_pure_virtual to print error message and DBUG_ASSERT:
calls to pure virtual methods should not go unnoticed.
2004-07-09 01:35:35 +04:00
mwagner@here.mwagner.org
63e5c254ac
Do-compile:
...
Call my_md5sum with path
2004-07-08 16:16:37 -05:00
mwagner@here.mwagner.org
131a9cb45c
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-08 14:06:30 -05:00
mwagner@here.mwagner.org
47a0b86ece
Merge here.mwagner.org:/Volumes/BK/mysql-4.0
...
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-08 13:52:46 -05:00
mwagner@here.mwagner.org
ec5bb4695c
Do-compile:
...
Added support for MD5 verification of file transfers
2004-07-08 13:51:18 -05:00
vva@eagle.mysql.r18.ru
051a5461cc
fixed Bug #4378 "create database IF NOT EXISTS thing" returns an error
2004-07-08 21:25:17 +05:00
jani@a80-186-24-72.elisa-laajakaista.fi
97920edb9d
Fixed Bug#4451. According to C/C++ standards, enums should not be used
...
out of their range.
2004-07-08 17:12:42 +03:00
bar@mysql.com
6c996daa91
Bug#4338: mysql-test-run fails if compiled with non-latin1 character set
2004-07-08 18:54:07 +05:00
monty@mysql.com
949de54454
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-07-08 15:45:56 +03:00
monty@mysql.com
db7efa2780
New handler::index_flags() definition to make it easy to check the full used key and a specific key part.
...
Added key part to optimize_range() to fix problems when using fields in key parts.
2004-07-08 15:45:25 +03:00
bell@sanja.is.com.ua
ce5caec189
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-07-08 13:59:53 +03:00
bar@mysql.com
d2076ae8d5
Minor fix: V is primary level, not U.
2004-07-08 15:19:26 +05:00
bell@sanja.is.com.ua
a0ae383cbf
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work2-4.1
2004-07-08 13:18:57 +03:00
bar@mysql.com
a5025f4ca6
WL#807 Optimize loading database options in load_db_opt
...
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
2004-07-08 15:03:01 +05:00
serg@serg.mylan
206e642588
results fixed
2004-07-08 10:11:30 +02:00
serg@serg.mylan
d0f53f7ee0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-07 23:51:25 +02:00
serg@serg.mylan
fe57b75079
bug#4441 - crash in UNHEX(NULL)
2004-07-07 23:49:03 +02:00
mwagner@here.mwagner.org
bb0bf26d53
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-07 16:33:30 -05:00
mwagner@here.mwagner.org
9adba28a8d
Merge here.mwagner.org:/Volumes/BK/mysql-4.0
...
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-07 16:29:10 -05:00
mwagner@here.mwagner.org
c5e6ebc6b6
my_md5sum:
...
Exit properly
2004-07-07 16:28:07 -05:00
bell@sanja.is.com.ua
1e677fd015
syntax fix
2004-07-07 20:54:12 +03:00
vva@eagle.mysql.r18.ru
bd3f745707
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-5.0
...
into eagle.mysql.r18.ru:/home/vva/work/WL_1941/mysql-5.0
2004-07-07 17:36:10 +05:00
vva@eagle.mysql.r18.ru
e9e5b3547e
patch for task WL 1941 "NO_C_ESCAPE sql_mode"
2004-07-07 17:26:43 +05:00
bar@mysql.com
6fdafa5635
Don't allow badly formed UTF8 identitiers
2004-07-07 16:39:43 +05:00
bar@mysql.com
aa679b62c0
Adding Roman (classical Latin) collation.
2004-07-07 15:20:23 +05:00
bar@mysql.com
d54157f0d8
ha_archive.cc:
...
Memory was used after it has been alreay freed.
This led to server crash on FreeBSD.
2004-07-07 13:47:29 +05:00
monty@mysql.com
1e31199995
Merge with 4.1.3-beta
2004-07-07 11:29:39 +03:00
joreland@mysql.com
e7348d5168
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:49:34 +02:00
joreland@mysql.com
f398a0bd91
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 17:46:13 +02:00
joreland@mysql.com
d2eaf7dd1b
Fixed typo
2004-07-06 17:45:37 +02:00
antony@ltantony.rdg.cyberkinetica.com
ac6e6c121f
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into ltantony.rdg.cyberkinetica.com:/usr/home/antony/work/bug4407.1
2004-07-06 16:43:39 +01:00
antony@ltantony.rdg.cyberkinetica.com
58cec1fd6a
Bug#4407 - assertion in ha_myisam.cc
...
Fix assertion failure where ha_myisam::index_next() is called
without first calling ha_myisam::ha_index_init()
2004-07-06 16:30:50 +01:00
serg@serg.mylan
d8dabe43fb
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 16:30:04 +02:00
serg@serg.mylan
021242bc6c
mysql_fix_privilege_tables.sh:
...
various fixes (for mysql-test-run at least):
* accept --no-defaults
* 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
it's --verbose, not --verbose=1
2004-07-06 16:29:26 +02:00
serg@serg.mylan
df1f83db55
HAVE_RTREE_KEYS are enabled on windows too
2004-07-06 14:24:44 +02:00
bar@mysql.com
1bc5370cff
mysqltest.c:
...
Bug #4338 mysql-test-run fails if compiled with non-latin1 character set.
2004-07-06 17:18:04 +05:00
bar@mysql.com
30a86a0be9
Bug#4417 binary character set breaks multi-byte table/field name.
2004-07-06 17:15:43 +05:00
serg@serg.mylan
c2295f163f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-07-06 14:05:41 +02:00
serg@serg.mylan
9602e4a1a6
re-enable spatial features for windows
...
grr
2004-07-06 13:56:50 +02:00
bell@sanja.is.com.ua
0fa0852001
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-07-06 12:21:48 +03:00
joreland@mysql.com
f5d384d4ab
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-07-06 10:45:53 +02:00
bar@mysql.com
434e2e094c
rpl_charset.result, rpl_charset.test:
...
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
2004-07-06 13:43:15 +05:00