Commit graph

1236 commits

Author SHA1 Message Date
serg@serg.mylan
40ce1e174d merged 2005-05-14 19:28:29 +02:00
brian@zim.(none)
8636468466 Merge 2005-05-08 16:19:06 -07: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
antony@ltantony.mysql.com
7a56977a79 Bug#6925
Comment/*COMMENT*/is not a separator
  Ensure that whitespace is inserted after C-style comment if required.
2005-05-08 00:13:35 +01:00
brian@brian-akers-computer.local
39f4e5755d Patch for --insert-ignore 2005-05-07 09:49:39 -07:00
jimw@mysql.com
80933d9f95 Merge 2005-05-07 08:25:58 -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
monty@mishka.local
3d03746899 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2005-05-06 16:34:09 +03:00
rburnett@bk-internal.mysql.com
82f4a0b021 Merge bk-internal.mysql.com:/users/rburnett/bug10245
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:21:30 +02:00
monty@mishka.local
015cd1cd21 merge 2005-05-06 13:51:58 +03:00
monty@mishka.local
a9f6aab4c9 Fixes while reviewing new code
Added option --count to mysqlshow (to show number of rows)
Fixed possible core dump in information schema
2005-05-06 11:39:30 +03: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
serg@serg.mylan
530b6ba541 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-05-01 23:10:55 +02:00
serg@serg.mylan
9c332d8d2a yassl changeset 2:
remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly
2005-04-30 19:48:45 +02:00
monty@mysql.com
c0e8a8d625 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-30 03:46:38 +03:00
geert@kriem.kemuri.org
0dab212f5c Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-29 14:46:53 +02:00
monty@mysql.com
215be0264b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-04-27 17:19:32 +03:00
monty@mysql.com
69b813a901 mysqladmin extended-status now displays global status
Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part
2005-04-27 17:16:08 +03:00
geert@kriem.kemuri.org
166af66440 Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-27 14:17:50 +02:00
msvensson@neptunus.(none)
203cdde955 Merge from 4.1 to 5.0 2005-04-27 12:56:01 +02:00
jani@ua141d10.elisa.omakaista.fi
0ca934de63 Improved client internal help.
Doc fix for Bug#9870.
2005-04-26 14:02:16 +03: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
geert@kriem.kemuri.org
e432a7b263 Removing useless mysql_field_seek 2005-04-25 09:51:37 +02:00
geert@kriem.kemuri.org
718d3a3cac Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-25 09:28:08 +02:00
msvensson@neptunus.(none)
3aecb8acce Upgrade to libedit-2.9 2005-04-21 12:06:46 +02:00
msvensson@neptunus.(none)
da386f3134 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug9391
2005-04-15 10:13:42 +02:00
geert@kriem.kemuri.org
8e671105ac \W enables show warnings, \w disables; Showing message while interactive when using the \w and \W commands; using strmov instead of my_strdup; removed case for options, my_getopt does it 2005-04-14 15:07:08 +02:00
ramil@mysql.com
9f440d2b20 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-04-14 16:39:42 +05: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
msvensson@neptunus.(none)
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
geert@kriem.kemuri.org
e5c607e0ad Removing for-loop in print_warnings() 2005-04-08 16:54:50 +02:00
geert@kriem.kemuri.org
dd1f0267ad Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-08 14:11:22 +02:00
monty@mysql.com
780202f130 Moved some old test and added a new test to only be run with mysql-test-run --big
Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files
2005-04-07 19:24:14 +03:00
jimw@mysql.com
4caef066c7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-04-06 15:24:12 -07: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
geert@kriem.kemuri.org
f68d4a2d47 Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0
into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0
2005-04-06 18:07:28 +02:00
geert@kriem.kemuri.org
8c42aceb0a Adding --show-warnings option for the mysql command line tool so warnings,
if any, are shown after execution of a statement in both batch and 
interactive mode. 
In interactive mode \w means show the warnings and \W means don't 
show the warnings.
2005-04-05 15:30:17 +02:00
jimw@mysql.com
bb215f648b Merge 2005-04-04 23:03:56 -07:00
petr@mysql.com
8197710349 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-04-05 06:12:41 +04: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
monty@mysql.com
1be0a0c82a Now one gets an error if one tries to insert an invalid value via a stored procedure in STRICT mode. (Bug #5907) 2005-04-05 00:32:48 +03:00
petr@mysql.com
7730319738 Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)
2005-04-04 03:49:10 +04:00
reggie@mdk10.(none)
a722daa1e3 Merge 2005-04-01 08:35:33 -06: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
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02: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