kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
msvensson@neptunus.(none)
11d3c28575
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-1.2310.2.2
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-07-01 15:40:29 +02:00
msvensson@neptunus.(none)
9613c434e0
Win port fixes
2005-07-01 15:39:36 +02:00
monty@mishka.local
7398252d02
Portability fixes
...
Fixes while reviewing new pushed code
NULL as argument to encrypt/decrypt should return NULL without a warning
2005-06-27 20:31:00 +03:00
msvensson@neptunus.(none)
87d681c7bb
Include <sys/wait.h> to get WEXITSTATUS
2005-06-27 15:11:40 +02:00
msvensson@neptunus.(none)
f8472c0e49
Add "#include <stdlib.h>" to define WEXITSTATUS
2005-06-27 15:01:49 +02:00
msvensson@neptunus.(none)
01b025c2d2
Fix so that my_progname is set to "mysqldump"
2005-06-22 20:37:14 +02:00
msvensson@neptunus.(none)
2dd6a58d58
BUG#9657 mysqldump xml ( -x ) does not format NULL fields correctly
...
- Importing the bug fixes by patch due to merge problems.
2005-06-22 20:22:54 +02:00
msvensson@neptunus.(none)
ddeaf342a7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)[msvensson]
39636f48f0
patch
2005-06-21 14:19:56 +02:00
jimw@mysql.com
5381e18673
Fix handling of command-line on Windows, missed as part of earlier
...
commit. (Bug #10840 )
2005-06-20 18:54:45 +02:00
lars@mysql.com
869882f321
WL#2076: Added if(...) construct to mysqltest
...
Removed SHOW BINLOG EVENTS in test case for ps-protocol and row-based replication
2005-06-16 16:56:03 +02:00
jimw@mysql.com
e4cb794750
Fix use of _cgets() to handle an input line that exceeds our buffer space
...
before a newline is found. (Bug #10840 )
2005-06-09 19:44:59 +02:00
jimw@mysql.com
9ba4a6c722
Fix calculation of buffer size for _cgets() on Windows. (Bug #10841 )
2005-06-08 00:43:57 +02:00
serg@serg.mylan
6a5349028c
a compiler must see '#pragma implementation' *before*
...
'#pragma interface' (that comes with the #include'd header file)
2005-06-05 19:38:52 +02:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
msvensson@neptunus.(none)
975ca22872
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-05-26 12:10:05 +02:00
msvensson@neptunus.(none)
83d430353e
Add ifdefs to control when "#pragma implementation" should be used
...
Added some more ifdefs for "#pragma interface"
2005-05-26 12:09:14 +02:00
brian@zim.(none)
6182241268
Additions for --add-drop-database
2005-05-20 06:56:02 -07:00
jimw@mysql.com
79ce5dcd90
Resolve bugfix merge
2005-05-18 09:25:06 -07:00
jimw@mysql.com
be221cc012
Small optimization to bug fix, from Monty.
2005-05-18 09:12:37 -07:00
monty@mysql.com
8b1673f18e
Fix memory leak
2005-05-16 20:16:46 +03:00
kent@mysql.com
63fcb5de6f
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-05-16 02:55:51 +02:00
kent@mysql.com
b076cdb208
mysqltest.c:
...
To solve bug#8455, call mysql_affected_rows() earlier, before query to find warnings
2005-05-16 01:08:42 +02:00
kent@mysql.com
6374bfeb61
mysqltest.c:
...
To solve bug#6193, also reset require when using 'eval' for running query
mysql-test-run.pl:
In cleanup, remove possible soft link to var directory
2005-05-15 20:38:54 +02:00
kent@mysql.com
221b1ccae8
mysqltest.c, mysql-test-run.sh:
...
Not to conflict with Windows return code 2 for "not found", use 62 for "skip"
mysql-test-run.sh, suppress.purify:
Use Purify suppress file
2005-05-15 06:59:34 +02:00
brian@brian-akers-computer.local
a8968e337d
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
2005-05-08 14:24:43 -07:00
jimw@mysql.com
e2a11cc15e
Fix crash in mysqldump -c triggered by tables with a large number of long
...
field names. (Bug #10286 )
2005-05-08 12:02:46 -07:00
brian@brian-akers-computer.local
39f4e5755d
Patch for --insert-ignore
2005-05-07 09:49:39 -07:00
jimw@mysql.com
7e7ed0f6a8
Merge mysql.com:/home/jimw/my/mysql-4.1-9186
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:05:19 -07:00
rburnett@bk-internal.mysql.com
8e286b7934
Bug #10245 VC++ compiler error with mysql.cc
...
Only print the read line version if we are on a platform that supports readline
mysql.cc:
Add #ifdef to only print readline version if we are on a platform that supports readline
2005-05-05 17:48:50 +02:00
msvensson@neptunus.(none)
e0edc9a630
BUG#2596 MySQL Client Segmentation Fault on Solaris 9
...
- Print readline or libedit version
2005-04-25 12:05:13 +02:00
msvensson@neptunus.(none)
3aecb8acce
Upgrade to libedit-2.9
2005-04-21 12:06:46 +02:00
ramil@mysql.com
a835045b8f
Merge mysql.com:/usr/home/ram/work/mysql-4.0
...
into mysql.com:/usr/home/ram/work/mysql-4.1
2005-04-14 16:26:39 +05:00
ramil@mysql.com
c7a6c8de06
In order not to conflict with a Linux kernel header
...
set_bit replaced with internal_set_bit,
clear_bit replaced with internal_clear_bit.
2005-04-14 11:13:08 +05:00
jimw@mysql.com
699c35c80e
Merge mysql.com:/home/jimw/my/mysql-4.0-clean
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-06 11:02:20 -07:00
jimw@mysql.com
1f1c44779a
Merge mysql.com:/home/jimw/my/mysql-4.1-8866
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
jimw@mysql.com
e286515667
Fix segmentation fault in mysqlcheck when the last table
...
checked with --auto-repair mode returned an error (such
as being a merge table). (Bug #9492 )
2005-03-31 11:43:39 -08:00
reggie@mdk10.(none)
cca1e62b80
Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
...
mysqldump.c:
Fixed get_actual_table_name so that it calls mysql_free_result in all cases that a non-NULl result is returned
2005-03-31 08:37:18 -06:00
reggie@mdk10.(none)
04b3c901d6
Bug #9175 seg fault on 'mysqldump --single-transaction --tab mysql nonexistent'
...
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows. Now I check that the resultset is not null and has at least 1 row before I process the table.
mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
2005-03-28 13:06:43 -06:00
jimw@mysql.com
9c86b35194
Fix reconnect when using prepared statements, and add
...
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866 )
2005-03-28 09:59:41 -08:00
serg@serg.mylan
2dd1847bc2
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-26 19:49:24 +01:00
jimw@mysql.com
4d2db80ee8
Merge mysql.com:/home/jimw/my/mysql-4.1-8499
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:30 -08:00
serg@serg.mylan
091f069671
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-03-23 21:10:01 +01:00
serg@serg.mylan
f21f8f983f
client/mysqltest.c
...
corrected number of fields for --enable_metadata
sql/sql_union.cc
fixed a apparent typo in assert
2005-03-23 20:38:42 +01:00
lars@mysql.com
fc6eda1336
Fixes after Sinisa and Serg comments after push of patch for BUG#9123.
...
BUG#9123 is solved earlier than this patch though.
2005-03-16 21:56:56 +01:00
lars@mysql.com
52f190c098
BUG#9123: Updates after Mats review
2005-03-16 13:57:59 +01:00
lars@mysql.com
11f93ffd2d
Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1
2005-03-16 08:14:05 +01:00