Commit graph

11541 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
c9938b9dff merge 2004-03-16 17:35:49 +02:00
bell@sanja.is.com.ua
a99baaba96 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
2004-03-16 17:35:48 +02:00
bell@sanja.is.com.ua
446b1bd260 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 17:35:47 +02:00
serg@serg.mylan
ceec63f18a EOVERFLOW moved to my_base.h - it is used not only in strtod.c
error message corrected
2004-03-16 16:35:47 +01:00
vva@eagle.mysql.r18.ru
e970ff9e87 Merge bk@gate:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_3160/mysql-4.1
2004-03-16 19:35:46 +04:00
vva@eagle.mysql.r18.ru
28ebb5a680 fixed bug #3160 '"mysqladmin password" doesn't work if --skip-grant-tables' 2004-03-16 19:30:22 +04:00
bell@sanja.is.com.ua
28b8501326 after merge fix 2004-03-16 16:30:10 +02:00
bell@sanja.is.com.ua
cd5c30c5dc fix test during merge 2004-03-16 16:30:09 +02:00
bell@sanja.is.com.ua
96a9d0da52 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 16:30:08 +02:00
bell@sanja.is.com.ua
7df80441e1 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 16:30:07 +02:00
vva@eagle.mysql.r18.ru
58f6936b5e Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-16 18:30:06 +04:00
vva@eagle.mysql.r18.ru
50cb1793bf Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
2004-03-16 18:28:23 +04:00
vva@eagle.mysql.r18.ru
414fb616e3 fixed a lot of warnings in processing of
Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c 
(changed switch to ?:)
2004-03-16 18:26:00 +04:00
marko@hundin.mysql.fi
20b6863c9a InnoDB: Make btr_cur_unmark_extern_fields() a static function 2004-03-16 15:26:33 +02:00
bell@sanja.is.com.ua
b206f29e6c 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 15:14:12 +02:00
gluh@gluh.mysql.r18.ru
df842c2fc3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
2004-03-16 17:14:11 +04:00
bell@sanja.is.com.ua
7106dcfd06 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:11 +02:00
ram@gw.mysql.r18.ru
bfc1e46c10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 17:14:10 +04:00
bell@sanja.is.com.ua
73e5e0672c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 15:14:10 +02:00
vva@eagle.mysql.r18.ru
8d5430ef73 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
2004-03-16 17:14:09 +04:00
ram@gw.mysql.r18.ru
f54827e5d0 Fix for the bug #3118: Subquery and order by 2004-03-16 16:28:50 +04:00
monty@mysql.com
df06c6e425 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-03-16 13:52:05 +02:00
monty@mysql.com
dcf5ba1c95 Increase max size of number of elements in key. This fixed a bug when using count(DISTINCT) with lot of distinct values and big 'max_heap_table_size' 2004-03-16 13:51:35 +02:00
hf@deer.(none)
cdc27d597e Fix for #233 (final part) 2004-03-16 14:59:22 +04:00
marko@hundin.mysql.fi
38ae7128f9 InnoDB: Remove unused directory "cry" 2004-03-16 12:48:17 +02:00
marko@hundin.mysql.fi
625c310b5a InnoDB: remove debug code from non-debug version 2004-03-16 12:18:02 +02:00
gluh@gluh.mysql.r18.ru
8ba33d7dd3 Fix for bug#2586 Disallow global/session/local as structured var. instance names 2004-03-16 14:01:05 +04:00
marko@hundin.mysql.fi
a1931a36f9 Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/l/mysql-4.0
2004-03-16 11:49:13 +02:00
marko@hundin.mysql.fi
2c0cabd984 InnoDB: Remove log debug code when UNIV_LOG_DEBUG is not defined 2004-03-16 11:48:20 +02:00
hf@deer.(none)
2011d717cb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.233
2004-03-16 13:27:25 +04:00
hf@deer.(none)
ceaac59c42 Fix for #233 (the second one) 2004-03-16 13:26:37 +04:00
ram@gw.mysql.r18.ru
75ced0832e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
2004-03-16 12:59:06 +04:00
gluh@gluh.mysql.r18.ru
f6816f32bd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
2004-03-16 11:33:36 +04:00
gluh@gluh.mysql.r18.ru
86211a1b44 Fix for bug #2629 NULLIF() doesn't behave as described in manual 2004-03-16 11:33:03 +04:00
bell@sanja.is.com.ua
e8a9242893 merge 2004-03-16 08:32:21 +02:00
bell@sanja.is.com.ua
7ff1a94358 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
2004-03-16 08:18:36 +02:00
bell@sanja.is.com.ua
ac8c1cc4be Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
2004-03-16 07:40:11 +02:00
monty@mysql.com
325f661525 Remove not needed patch 2004-03-16 02:59:39 +02:00
monty@mysql.com
861bf3c8c0 Portability fix 2004-03-16 02:41:36 +02:00
monty@mysql.com
a6ba9f3cbc Fixed memory overrun in spatial init code 2004-03-16 00:42:10 +02:00
monty@mysql.com
56af3931e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-16 00:04:07 +02:00
monty@mysql.com
eb8a9e275f Moved errno to strtod.c as one can use m_string.h without errno.h 2004-03-16 00:04:06 +02:00
serg@serg.mylan
166c068971 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-15 23:04:05 +01:00
monty@mysql.com
37390968e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-16 00:04:05 +02:00
konstantin@mysql.com
420c956d27 Intermediate commit of client library (cleanups + fixes of 3 items from
flaws list)
TODO: 
 * verify that no sequence of API calls produces SIGSEGV.
 That is, verify that mysql_stmt_init  -> mysql_stmt_fetch is OK,
 or mysql_stmt_prepare -> mysql_stmt_fetch_column is OK and sets
 meaningful error.
 * remove alloc_stmt_fields call
 * revise stmt->state codes and statement states.
 * there are other items in prepared statements 'to fix' document.

Done:
 - cleanups and comments
 - revision of prepared statement error codes.
 - mysql_stmt_prepare is now can always be called (that is, you can reprepare
   a statement)
 - new implementation of mysql_stmt_close and fetch cancellation
2004-03-16 01:04:04 +03:00
hf@deer.(none)
e90c78ceb5 Small fix 2004-03-16 02:04:03 +04:00
bell@sanja.is.com.ua
8187b23043 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-15 23:53:28 +02:00
hf@deer.(none)
ac9de85b0f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.clean
2004-03-16 01:53:27 +04:00
hf@deer.(none)
f2ef7e1a32 Yet another fix for spatial parts 2004-03-16 01:50:35 +04:00
serg@serg.mylan
3351b01d83 cleanup 2004-03-15 22:02:47 +01:00