Commit graph

11263 commits

Author SHA1 Message Date
ram@gw.mysql.r18.ru
cd7ec53dad Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
2004-03-10 13:36:20 +04:00
jani@ua72d24.elisa.omakaista.fi
f75fc89c7f Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into ua72d24.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2004-03-09 22:03:23 +02:00
jani@ua72d24.elisa.omakaista.fi
8dcb41d8d9 Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL
is false.
2004-03-09 22:03:01 +02:00
lenz@kallisto.local
c104b25693 - added mysql-@VERSION@.spec to pkgdata_DATA again
(it got lost during a recent BK merge)
2004-03-09 19:23:29 +01:00
ram@gw.mysql.r18.ru
8ffd9a9190 Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY 2004-03-09 16:52:37 +04:00
paul@ice.snake.net
c3920549bd Reapply change after merge. 2004-03-08 15:07:49 -06:00
paul@ice.snake.net
037b4724fc Merge 2004-03-08 14:38:03 -06:00
paul@ice.snake.net
0ad9849ec5 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-08 14:05:07 -06:00
serg@serg.mylan
a10d3d5673 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-08 20:59:03 +01:00
konstantin@oak.local
6a10859bee Comment for do_command moved inside #ifndef EMBEDDED_LIBRARY. 2004-03-08 17:47:42 +03:00
paul@ice.snake.net
ea28e842cd Make SHOW VARIABLES output really alphabetic.
Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].
2004-03-07 20:19:37 -06:00
paul@ice.local
09113817d2 SESSION instead of LOCAL in error messages. 2004-03-07 08:32:00 -06:00
paul@ice.snake.net
f47fa6a780 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-06 10:02:43 -06:00
vva@eagle.mysql.r18.ru
99cd60a448 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-06 20:02:42 +04:00
vva@eagle.mysql.r18.ru
2501a54d31 corrected spelling error horisontal->horizontal
into client/mysqltest.c
2004-03-06 20:00:54 +04:00
vva@eagle.mysql.r18.ru
5ccb6a1cc7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
2004-03-06 18:27:11 +04:00
paul@ice.snake.net
72d8315541 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 18:24:38 -06:00
serg@serg.mylan
0192481ebe Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-06 00:02:13 +01:00
vva@eagle.mysql.r18.ru
d52086295f 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-06 03:02:12 +04:00
vva@eagle.mysql.r18.ru
e8d78e5a4a 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-06 03:01:09 +04:00
vva@eagle.mysql.r18.ru
a8bbcc52a9 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')
2004-03-06 03:00:21 +04:00
paul@ice.snake.net
cd1eecf97b Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 12:38:36 -06:00
monty@mysql.com
9618683f3c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-03-05 19:50:12 +02:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
paul@ice.snake.net
1d9a89b23f Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-05 11:16:06 -06:00
konstantin@mysql.com
1d624d3546 Fix for C++ style declaration 2004-03-05 19:04:59 +03:00
ingo@mysql.com
5e54670a09 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql/mysql-4.1
2004-03-05 15:20:45 +01:00
vva@eagle.mysql.r18.ru
d2f0d0726b commented testcases in show_check.test with quotation marks in table name
to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem
2004-03-05 17:57:36 +04:00
konstantin@mysql.com
ce2db5c303 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-rename
2004-03-05 16:55:50 +03:00
konstantin@mysql.com
7753c6b93e New call mysql_stmt_init() introduced.
Renames:
mysql_bind_param      -> mysql_stmt_bind_param
mysql_bind_result     -> mysql_stmt_bind_result
mysql_execute         -> mysql_stmt_execute
mysql_fetch           -> mysql_stmt_fetch
mysql_fetch_column    -> mysql_stmt_fetch_column
mysql_get_metadata    -> mysql_stmt_result_metadata
mysql_param_count     -> mysql_stmt_param_count
mysql_param_result    -> mysql_stmt_param_metadata
mysql_prepare         -> mysql_stmt_prepare
mysql_send_long_data  -> mysql_stmt_send_long_data

client_test.c cleaned up from memory leaks
2004-03-05 16:55:09 +03:00
ingo@mysql.com
235f0ffec1 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql/mysql-4.1
2004-03-05 13:48:38 +01:00
serg@serg.mylan
a5c2e89654 variable's name corrected 2004-03-05 12:03:04 +01:00
greg@mysql.com
54c1debc1c Enhanced my_getsystime for NetWare. 2004-03-04 22:59:04 -01:00
serg@serg.mylan
46c03de1a9 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-05 00:20:24 +01:00
serg@serg.mylan
de6d3b8dff UNHEX() function 2004-03-04 23:18:54 +01:00
mydev@mysql.com
3d13fb00b3 Fixed a type mismatch between int_table_flags and table_flags() in MyISAM handler. 2004-03-04 22:53:48 +01:00
vva@eagle.mysql.r18.ru
16dccfae3c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1
2004-03-04 22:21:19 +04:00
vva@eagle.mysql.r18.ru
9b54c1bfde Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1661/mysql-4.1
2004-03-04 22:19:41 +04:00
vva@eagle.mysql.r18.ru
b097995293 Fixed bug #2082 'mysqldump converts "inf" to NULL' and
added commands vertical_results and horisontal_results to client/mysqltest.c
2004-03-04 21:08:14 +04:00
hf@deer.(none)
18d722ff93 Merging 2004-03-04 17:52:06 +04:00
monty@mashka.mysql.fi
b049159431 Cleanup 2004-03-04 13:20:17 +02:00
monty@mashka.mysql.fi
93dd971bed Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2004-03-04 10:07:32 +02:00
monty@mashka.mysql.fi
afd8f38f4e Optimized GIS functions 2004-03-04 08:50:37 +02:00
harrison@corona.lordblink.com
ab1786129c Fix up history in readline implementation.
Two things changed:
1. Repeated queries are only stored once in the history.
2. Multiline queries are stored in a concated format in the history, 
   in addition to pieces. 
(Push approved by serg)
2004-03-03 15:54:37 -05:00
konstantin@oak.local
5e360685c1 Comment on handler::unlock_row() 2004-03-03 12:44:00 +03:00
bar@bar.intranet.mysql.r18.ru
c93ff40c51 Bug #2959 UTF8 charset breaks joins with mixed column/string constant 2004-03-03 11:22:25 +04:00
guilhem@mysql.com
eb2783cd91 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2004-03-02 23:08:24 +01:00
guilhem@mysql.com
6cf1059f9d More comments on what could explain -1 in Seconds_Behind_Master in
SHOW SLAVE STATUS.
2004-03-02 23:03:52 +01:00
guilhem@mysql.com
db37d9a062 After hours of unsuccessful research on
BUG#2826 "Seconds behind master weirdness"
(sometimes this column of SHOW SLAVE STATUS shows a very big value,
in fact a small negative number casted to ulonglong).
This problem was reported by only one user, but which uses
synchronized time between his servers.
As suggested by the user, to hide this I display max(0, the value)
so that it will be less confusing. For a user, seeing 0 is probably
better than seeing -1 (both tell you that the slave is very close
to the master).
2004-03-02 22:38:14 +01:00
serg@serg.mylan
5cacc972a2 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-02 22:22:11 +01:00