monty@mysql.com
eca9418ca7
Added missing my_time.c file to mysqlclient project
...
Moved include <assert.h> to my_global.h
2004-06-28 00:42:02 +03:00
serg@serg.mylan
2be661a204
portability fix
2004-06-27 20:30:48 +02:00
serg@serg.mylan
5c371299b8
tell make how to create mysql_tzinfo_to_sql.cc
2004-06-27 20:17:32 +02:00
monty@mysql.com
406ae8a59e
Ensure that we don't create long temporary .o file (breaks on qnx)
2004-06-27 20:07:21 +03:00
serg@serg.mylan
08ac1d1bda
memory leak in tz code closed
...
(table opened in my_tz_init, was removed from thd->open_tables in
tz_load_from_db w/o being unlocked, so it was stayng in open_cache
forever preventing the latter from being free'd in table_cache_free)
2004-06-27 01:32:52 +02:00
serg@serg.mylan
3236093b8b
removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288)
2004-06-27 00:34:05 +02:00
serg@serg.mylan
a5c8b3ee59
correct eq() method for Item_param (BUG#4233)
2004-06-26 23:55:38 +02:00
serg@serg.mylan
e3a713bf34
BUG#4276 - socket path too long
2004-06-26 19:37:48 +02:00
serg@serg.mylan
450e5b0119
after merge fixed
2004-06-26 14:21:32 +02:00
serg@serg.mylan
d2adc38cb6
merged
2004-06-25 23:20:46 +02:00
serg@serg.mylan
924de89305
release cursors in return_zero_rows
2004-06-25 21:43:02 +02:00
monty@mysql.com
8c867328cd
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-06-25 21:56:42 +03:00
monty@mysql.com
e7a01ed3dc
After merge fixes
2004-06-25 21:56:23 +03:00
monty@mysql.com
b1d08ba2b4
Merge with 4.0 to get the latest bug patches to 4.1
2004-06-25 20:13:05 +03:00
dlenev@brandersnatch.localdomain
ab26a68498
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix
2004-06-25 21:05:25 +04:00
dlenev@brandersnatch.localdomain
9c35c402f2
Removed mysql_tzinfo_to_sql dependancy on sql/mysql_priv.h for circumventing
...
problems with unresolved dependancies on some platforms.
2004-06-25 21:04:48 +04:00
monty@mysql.com
c3eb936040
Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
2004-06-25 18:55:03 +03:00
monty@mysql.com
f6765146c1
Added missing root user to mysql.user on windows. (Bug #4242 )
...
Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938 )
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull
2004-06-25 18:49:36 +03:00
bell@sanja.is.com.ua
45411ca0b5
merge
2004-06-25 18:33:31 +03:00
igor@rurik.mysql.com
29f616205a
af
2004-06-25 06:54:01 -07:00
igor@rurik.mysql.com
6fa845d7c0
After merge fix
2004-06-25 06:52:01 -07:00
igor@rurik.mysql.com
64d46dfe9b
After merge fix
2004-06-25 06:48:10 -07:00
ingo@mysql.com
8db6c064df
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
bell@sanja.is.com.ua
74b01ca387
type of parameter assignment for parameters from variables added (BUG#4280)
2004-06-25 15:16:00 +03:00
bell@sanja.is.com.ua
6e1eb6a78c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-06-25 14:48:15 +03:00
ingo@mysql.com
57da928039
Merge
2004-06-25 12:59:47 +02:00
ingo@mysql.com
958cf857a3
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-bug3565
2004-06-25 12:14:54 +02:00
igor@rurik.mysql.com
c5b289c577
sql_select.cc, sql_parse.cc:
...
Nested joins: review modifications.
2004-06-25 02:54:05 -07:00
serg@serg.mylan
3452445559
remove ^M's
...
compile even without InnoDB
2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155
fixed EXPLAIN behaviour with prepared statements (BUG#4271)
2004-06-25 11:37:43 +03:00
serg@serg.mylan
db46b47be8
undone
2004-06-25 01:43:41 +02:00
serg@serg.mylan
b511996ff4
workaround for gcc 2.95.3 bug
...
anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?
2004-06-25 01:25:02 +02:00
serg@serg.mylan
04bd8c9a44
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-25 00:56:34 +02:00
serg@serg.mylan
d8984ba396
free open cursors
2004-06-25 00:50:48 +02:00
konstantin@mysql.com
f99224fe2d
One more const method.
2004-06-25 01:30:43 +04:00
konstantin@mysql.com
b6cb8cb5f7
Followup to cleanup in handler interface.
2004-06-25 01:29:30 +04:00
serg@serg.mylan
37314708b7
merged
2004-06-24 23:29:28 +02:00
bell@sanja.is.com.ua
5db861c3e4
parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
2004-06-24 22:15:15 +03:00
serg@serg.mylan
1c37f8e20e
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-06-24 19:47:53 +02:00
serg@serg.mylan
1ff21a9e64
bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before
2004-06-24 19:46:50 +02:00
bell@sanja.is.com.ua
c6e2f6ac13
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:43:47 +03:00
bell@sanja.is.com.ua
85c9d81c4b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:40:18 +03:00
bell@sanja.is.com.ua
de9cefaa77
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
2004-06-24 19:03:58 +03:00
konstantin@mysql.com
29b88ff539
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/kostja/mysql/mysql-4.1-4030
2004-06-24 19:09:31 +04:00
konstantin@mysql.com
a30fcdc690
Fix for Bug#4030 "Client side conversion string -> date type doesn't
...
work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.
2004-06-24 19:08:36 +04:00
bar@mysql.com
62aeb88638
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-06-24 18:51:32 +05:00
bar@mysql.com
aa27a7858e
"Version" column in SHOW TABLE STATUS.
2004-06-24 18:46:41 +05:00
mskold@mysql.com
8ba4ab195f
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-06-24 15:32:33 +02:00
guilhem@mysql.com
e14aef7820
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-1717
2004-06-24 15:32:32 +02:00
ingo@mysql.com
18cd61d0d0
bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
...
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.
2004-06-24 15:06:56 +02:00