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
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
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
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
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
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
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
jimw@mysql.com
dee535be63
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 10:51:08 -08: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
jimw@mysql.com
252bbe9eb9
Merge mysql.com:/home/jimw/my/mysql-5.0-5036
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-22 16:09:51 -08:00
gbichot@production.mysql.com
56495a3691
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into production.mysql.com:/nfstmp1/guilhem/mysql-5.0-prod
2005-03-22 00:28:33 +01:00
gbichot@production.mysql.com
c766efdc5d
Last part of WL#1062: better replication of timezones: no more use
...
of SET ONE_SHOT; storing tz info directly in event (if this info is needed),
it's now allowed to have different global tz on master and slave.
2005-03-22 00:26:12 +01:00
monty@mysql.com
d8b078e423
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-21 23:46:11 +02:00
monty@mysql.com
a1ab786091
Cleanups during review of code
...
Fixed newly introduced bug in rollup
2005-03-21 23:41:28 +02:00
dlenev@brandersnatch.localdomain
c87912c8da
Fix for spurious failures of sp.test on many platforms (aka Bug #9161
...
"Warnings on 'drop procedure' platform-specific").
In mysqltest we should not issue "SHOW WARNINGS" until we have not
read results from all statements in multi-statement.
Otherwise such "SHOW WARNINGS" will either cause "Packets out of order"
error and thus will ruin current connection (but we may not notice this as
it happened in sp.test because we ignore errors from such auxilary
SHOW WARNINGS and use auto-reconnecting connections) or will
succeed but consume first packet from next statement in multi-statement
sequence (this happens if "SHOW WARNINGS" is issued when this packet
is already received by client. Packet is thrown away by net_clear()
call which is issued when "SHOW WARNINGS" is sent to server).
In our case sp.test failed because usually we had first situation
but sometimes second situation occured causing warning to pop-up.
2005-03-20 20:29:03 +03:00
jimw@mysql.com
3828b47807
Merge mysql.com:/home/jimw/my/mysql-5.0-8866
...
into mysql.com:/home/jimw/my/mysql-5.0-build
2005-03-17 08:26:12 -08:00
gluh@gluh.mysql.r18.ru
b435d6e862
Merge 4.1 -> 5.0
2005-03-17 16:51:07 +03:00
jimw@mysql.com
1055e52575
Fix failure in 'kill' test due to change of default
...
reconnect setting in mysql client library. (Bug #8866 )
2005-03-16 17:13:45 -08:00
monty@mysql.com
f42941073d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-16 22:59:06 +02: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
monty@mysql.com
594ef41b2d
Cleanup during reviews
...
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02:00