Commit graph

11941 commits

Author SHA1 Message Date
hf@deer.(none)
023b86b984 small addition to the fix for #3188
dropping of tables added to the testcase
2004-03-23 18:25:44 +04:00
hf@deer.(none)
87612b5294 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-23 17:58:55 +04:00
hf@deer.(none)
7ab1c2106d Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
Problem is that Item::save_in_field modifies str_value member
 before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field
2004-03-23 17:57:14 +04:00
serg@serg.mylan
99886df867 correct support for a mix of UNION/UNION ALL in the same query.
Bug#1428
2004-03-23 14:43:24 +01:00
bell@sanja.is.com.ua
ce7798c45e fixed union with prepared statement bug found by Konstantin 2004-03-23 14:26:54 +02:00
Sinisa@sinisa.nasamreza.org
cef627cece Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-23 14:04:32 +02:00
hf@deer.(none)
ea2c160919 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3188
2004-03-23 13:09:50 +04:00
hf@deer.(none)
a90f34ab6b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-23 11:58:04 +04:00
jcole@mugatu.jcole.us
15cc92cacb Added LOCAL INFILE callback function support. 2004-03-22 19:58:49 -05:00
Greg@greg-laptop.
663b3ffea8 Changes to project files precipitated from 4.1 test builds. 2004-03-22 14:30:30 -07:00
Greg@greg-laptop.
de09e55b8b Merge gweir@build.mysql.com:/home/bk/mysql-4.1
into greg-laptop.:C:/cygwin/bk/mysql-4.1
2004-03-22 13:42:22 -07:00
paul@ice.snake.net
d30313666a Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-22 14:39:09 -06:00
hf@deer.(none)
1f709b1985 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-22 21:38:32 +04:00
hf@deer.(none)
1b78e7dd41 Fix for #3067 (REPAIR TABLE reenables disabled keys) 2004-03-22 21:34:36 +04:00
bell@sanja.is.com.ua
6158c94b32 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alias-4.1
2004-03-22 18:19:02 +02:00
heikki@hundin.mysql.fi
035778d631 sync0sync.c:
Actually, assembler is used onnly on 32-bit x86 Win, and no need to exclude Netware specifically
2004-03-22 18:11:13 +02:00
heikki@hundin.mysql.fi
d25727c81a Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-03-22 18:07:49 +02:00
heikki@hundin.mysql.fi
d22f36cdfd sync0sync.c:
Fix typo __NETWARE --> __NETWARE__ in mutex creation
2004-03-22 18:06:26 +02:00
paul@teton.kitebird.com
389ab9fc5d "automagically" is not a word. 2004-03-22 09:38:57 -06:00
Sinisa@sinisa.nasamreza.org
6c389aff75 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-22 16:36:27 +02:00
Sinisa@sinisa.nasamreza.org
2eaa07f199 union.result:
A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
union.test:
  A test case for the bug  that allowed table names to be used in ORDER BY columns (But #3064)
sql_union.cc:
  A fix for a bug that allowed table names to be used in ORDER BY columns (But #3064)
2004-03-22 16:35:15 +02:00
hf@deer.(none)
182aa5bec9 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-22 17:48:29 +04:00
bell@sanja.is.com.ua
bbb6642a66 aliases should be compared with my_strcasecmp (BUG#3251)
some db comparison code cleupup
removed compiler warnings
2004-03-22 15:43:13 +02:00
bar@bar.intranet.mysql.r18.ru
5c4b54f495 uca-dump.c:
new file
2004-03-22 15:14:12 +04:00
bar@bar.intranet.mysql.r18.ru
d82d09b699 .del-uca-dump.c~da786d5a909db27a:
Delete: mysys/uca-dump.c
2004-03-22 15:13:47 +04:00
monty@mysql.com
8c4ade710b Fixed wrong 'mysql.func' definition 2004-03-22 11:18:29 +02:00
Greg@greg-laptop.
7ec29e9fcb Changes in Windows project files instituted after latest 4.1 test build. 2004-03-21 18:03:34 -07:00
paul@ice.snake.net
7b45773fa6 Some SHOW STATUS lines were in non-alphabetic order. 2004-03-21 15:58:08 -06:00
bell@sanja.is.com.ua
7411ac19df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-21 16:39:37 +02:00
bell@sanja.is.com.ua
947e6e00f8 after merge changes 2004-03-21 16:39:14 +02:00
bell@sanja.is.com.ua
b0722aad12 fixed BUG in query cahe statistic counting 2004-03-21 11:48:51 +02:00
paul@ice.snake.net
f122e75108 Be picky. 2004-03-20 18:37:15 -06:00
bell@sanja.is.com.ua
8215fbe957 fixed config parser to recognize correctly strings like following:
test="\"#no comment here"#real comment
2004-03-20 23:50:04 +02:00
serg@serg.mylan
61a365e696 more sys_var_str fixes 2004-03-20 17:08:01 +01:00
serg@serg.mylan
d1f1bbefab sys_var_str.value is never NULL 2004-03-20 15:56:20 +01:00
guilhem@mysql.com
f657ea978b Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-03-20 15:49:55 +01:00
guilhem@mysql.com
d89f148de6 The automatic DROP TEMPORARY TABLE is now DROP TEMPORARY TABLE IF EXISTS,
this is better in this case:
- imagine user1 has created a temp table
- imagine user2 does FLUSH TABLES WITH READ LOCK, then takes a backup,
then RESET MASTER then UNLOCK TABLES, like mysqldump --first-slave
- then in the binlog you will finally have the DROP TEMPORARY TABLE,
but not the CREATE TEMPORARY TABLE, so when you later restore with
mysqlbinlog|mysql, mysql will complain that table does not exist.
Replication was already protected of this (it processes DROP TEMPORARY
TABLE as if there was a IF EXISTS), now I add it directly to the query
for mysqlbinlog|mysql to work.
2004-03-20 15:49:17 +01:00
serg@serg.mylan
10a4ed0e00 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-20 14:36:49 +01:00
serg@serg.mylan
581996393a select @@smth=@@sys_str_var crash fixed 2004-03-20 14:36:00 +01:00
bell@sanja.is.com.ua
e0766ed685 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 14:36:58 +02:00
bell@sanja.is.com.ua
b7efa3e5f6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
2004-03-20 13:37:30 +02:00
bell@sanja.is.com.ua
d095d4753e after review changes 2004-03-20 13:36:26 +02:00
monty@mysql.com
042af556d5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-20 12:50:12 +02:00
monty@mysql.com
59f9dcd51d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-03-20 12:49:17 +02:00
monty@mysql.com
b6e5c23c26 Ensure that we use unix file format (no \r\n) for all new files
Portability fixes
2004-03-20 12:48:14 +02:00
heikki@hundin.mysql.fi
a8da91f9fb btr0btr.c:
Correct previous bk commit comment about page splits: actually, in versions < 4.0.19 space utilization is very poor if 1500 - 8000 byte rows are inserted in the order of the primary key
2004-03-20 06:09:18 +02:00
heikki@hundin.mysql.fi
c9bbc83d11 btr0btr.c:
Improve space utilization if we have 3 kB - 8 kB rows to insert in the order of the primary key
btr0cur.c:
  Fix bug: The row count and key cardinality estimate was grossly too small if each clustered index page only contained one record
2004-03-19 22:51:25 +02:00
lenz@mysql.com
64a19e383a Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-03-19 18:57:45 +01:00
lenz@mysql.com
2539395737 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2004-03-19 18:50:18 +01:00
lenz@mysql.com
8c5d7e5490 - Do-pkg: PGK and DMG names now include the full arch name (e.g.
"-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)
2004-03-19 18:49:14 +01:00