Commit graph

11541 commits

Author SHA1 Message Date
monty@mysql.com
53196273c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-18 14:54:12 +02:00
monty@mysql.com
75dda82526 Removed compiler warning
Changed _XXX to _MY_XXX to solve conflict problem on Mac OS X
2004-03-18 14:53:38 +02:00
lenz@mysql.com
2de6b52000 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-03-18 13:17:44 +01:00
lenz@kallisto.local
4493a24dc7 - Use AC_CONFIG_SUBDIRS to invoke the InnoDB and BDB configure scripts
instead of calling them directly (WL#1521) - this also fixed a compile
   error with libtool-1.5.2 on FreeBSD (error: tag name "CXX" already 
   exists)
2004-03-18 13:15:05 +01:00
gluh@gluh.mysql.r18.ru
7aee76256b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-18 15:54:04 +04:00
gluh@gluh.mysql.r18.ru
1dfe9a0330 Fix for valgrind errors in str_to_TIME(using of uninitialize variable). 2004-03-18 15:51:08 +04:00
serg@serg.mylan
47747685a3 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-18 11:04:36 +01:00
serg@serg.mylan
1c658417b1 make DROP DATABASE to behave as documented in the manual - to report number of files deleted 2004-03-18 11:03:24 +01:00
heikki@hundin.mysql.fi
2b16cf783f os0file.c:
Remove includes of sys/types.h and sys/stat.h because these are already included through univ.i
2004-03-18 08:26:49 +02:00
monty@mysql.com
19d0a60eca Don't change server suffix if given to configure
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4 merge fixes (use old code) 2004-03-18 00:16:04 +02:00
monty@mysql.com
f34a642d6e after merge fixes 2004-03-18 00:09:13 +02:00
heikki@hundin.mysql.fi
43706715da ha_innodb.cc:
Add a comment that InnoDB always retrieves the row id, if the clustered index was internally generated by InnoDB. Then we know the 'ref' to the row.
2004-03-17 22:28:49 +02:00
paul@teton.kitebird.com
24baf74c15 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 12:43:16 -06:00
paul@teton.kitebird.com
f71f714773 Fix typo. 2004-03-17 12:28:26 -06:00
heikki@hundin.mysql.fi
e8efe9c32a Many files:
Fix Bug #1942: do not retrieve all columns in a table if we only need the 'ref' of the row (usually, the PRIMARY KEY) to calculate an ORDER BY
2004-03-17 19:37:48 +02:00
paul@teton.kitebird.com
9bf6b3eaf9 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 11:15:36 -06:00
ram@gw.mysql.r18.ru
99d374159a merge 2004-03-17 18:57:51 +04:00
paul@teton.kitebird.com
60a3104b03 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-17 08:56:22 -06:00
ram@gw.mysql.r18.ru
bdd70d1cfd Added test case for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(thankee Monty)
2004-03-17 18:43:58 +04:00
ram@gw.mysql.r18.ru
757cff9f9b Code cleanup:
- added unsigned_flag= 1; to Item_uint constructors
- removed Item_uint::fix_fields()
- added a comment about fix_fields() call
2004-03-17 18:40:04 +04:00
gluh@gluh.mysql.r18.ru
9863b6aed9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-17 16:19:52 +04:00
gluh@gluh.mysql.r18.ru
84e04c74c5 Fix for bug#3086: SHOW GRANTS doesn't follow ANSI_QUOTES 2004-03-17 16:19:09 +04:00
ram@gw.mysql.r18.ru
16179dbef0 Fix for the bug #3155: strange results with index (x, y) ... WHERE x=val_1 AND y>=val_2 ORDER BY pk;
(test case is too big to be included, take a look at the bug database)
2004-03-17 15:30:17 +04:00
hf@deer.(none)
5868807b92 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.233
2004-03-17 14:04:02 +04:00
hf@deer.(none)
91d5e55a90 Fix for #233
test for IGNORE added
2004-03-17 14:03:26 +04:00
monty@mysql.com
f9ad650490 merge with 4.0 2004-03-17 10:36:12 +02:00
monty@mysql.com
44667503b7 After merge fixes 2004-03-17 10:30:40 +02:00
monty@mysql.com
e8c65b886d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-17 10:25:53 +02:00
paul@teton.kitebird.com
0fb07014bf Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-16 15:32:11 -06:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
bell@sanja.is.com.ua
d3f2ad2039 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2004-03-16 21:11:59 +02:00
bell@sanja.is.com.ua
da4b43ae17 accidentaly removed empty line added 2004-03-16 21:09:47 +02:00
miguel@hegel.local
bdd771edc5 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1
into hegel.local:/home/miguel/bk/mysql-4.1
2004-03-16 15:55:51 -03:00
bell@sanja.is.com.ua
8a1675c869 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
2004-03-16 20:55:51 +02:00
serg@serg.mylan
574b6acb0c Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-16 19:55:50 +01:00
paul@teton.kitebird.com
882fad2357 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2004-03-16 12:55:49 -06:00
serg@serg.mylan
1e751b9ed8 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-16 19:55:49 +01:00
heikki@hundin.mysql.fi
a472dea224 ut0mem.h, ut0mem.c:
Add ut_strdup
os0file.h, os0file.c:
  Add creation of directories
2004-03-16 20:55:49 +02:00
vva@eagle.mysql.r18.ru
4c6aa03867 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
2004-03-16 22:55:48 +04:00
vva@eagle.mysql.r18.ru
f91acaf9c0 roll back change in client/mysqladmin.c for bug
#3160 '"mysqladmin password" doesn't work if --skip-grant-tables'
because we can't find out the mysql.user.host properly

now mysqladmin just print an advice error-message in this case
2004-03-16 22:54:25 +04:00
bell@sanja.is.com.ua
293bb8fee7 merge 2004-03-16 20:23:07 +02:00
bell@sanja.is.com.ua
579a94a328 after review & some other fixes 2004-03-16 20:19:36 +02:00
paul@teton.kitebird.com
da411b8dbb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2004-03-16 11:43:53 -06:00
paul@teton.kitebird.com
33f569c396 Fix usage line. 2004-03-16 11:42:35 -06:00
marko@hundin.mysql.fi
e39030c027 InnoDB: Remove some debug variables unless UNIV_SEARCH_PERF_STAT is defined 2004-03-16 18:55:44 +02:00
serg@serg.mylan
eb6f68ec9a uuid() tests 2004-03-16 16:35:53 +01:00
serg@serg.mylan
49e9b153ff Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-16 16:35:52 +01:00
bell@sanja.is.com.ua
b8c065c527 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-16 17:35:50 +02:00
serg@serg.mylan
7dde35ae19 warnings removed 2004-03-16 16:35:49 +01:00