monty@mysql.com
cd3dab49cc
Merge with 4.0.20
2004-05-17 01:52:13 +03:00
guilhem@mysql.com
a039062ef3
Replication testsuite: making the master-slave synchronization less likely to fail,
...
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
2004-05-14 23:08:03 +02:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1
Fixed charsetnr sent to the client
2004-04-06 19:57:33 +05:00
monty@mysql.com
ddafa2cc16
simple optimzation
...
Portability fixes
2004-03-31 03:32:38 +03:00
monty@mysql.com
f602829c75
Fix to get correct metadata when using temporary tables to create result. (Bug #2654 )
2004-03-30 19:24:28 +03:00
monty@mysql.com
b6e5c23c26
Ensure that we use unix file format (no \r\n) for all new files
...
Portability fixes
2004-03-20 12:48:14 +02:00
monty@mysql.com
b49b24d94a
Added test to show bug in current union implementation
...
After merge fixes
Portability fixes
2004-03-19 18:33:38 +02:00
monty@mysql.com
933278a52b
merge with 4.0 (to get compiler error fixes for innodb)
2004-03-19 15:17:56 +02:00
monty@mysql.com
b7fc7188d0
Portability fixes
...
Removed \r from new tests
Fixes to get new sustem_mysql_db... tests to work
2004-03-19 14:52:48 +02:00
monty@mysql.com
19d0a60eca
Don't change server suffix if given to configure
...
Portability fixes
2004-03-18 01:48:46 +02:00
monty@mysql.com
53c810cda4
merge fixes (use old code)
2004-03-18 00:16:04 +02:00
monty@mysql.com
350b433569
merge with 4.0
2004-03-16 22:41:30 +02:00
vva@eagle.mysql.r18.ru
58f6936b5e
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-16 18:30:06 +04:00
vva@eagle.mysql.r18.ru
414fb616e3
fixed a lot of warnings in processing of
...
Q_QUERY_VERTICAL/Q_QYERY_HORIZONTAL in client/mysqltest.c
(changed switch to ?:)
2004-03-16 18:26:00 +04:00
vva@eagle.mysql.r18.ru
189761bcd3
actions for bug
...
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical
1. added COPY_INFO::updated to work with it in
'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
2004-03-15 21:36:16 +04:00
vva@eagle.mysql.r18.ru
faa9c92765
fixed BUG #2874 "Grant table bug" and
...
added tests for testing structure of mysql db
2004-03-10 22:54:07 +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
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
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
ulli@morbus.(none)
709a5d6a8b
fix for bug #2905 -
...
"mysqladmin.c & co fail to use MYSQL_PORT as the default value of the TCP/IP port"
2004-02-26 19:09:49 +01:00
monty@mysql.com
ce14578909
Merge with 4.0.18
2004-02-11 00:06:46 +01:00
monty@mysql.com
c1dd070ba7
Some small portability fixes.
...
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
2003-12-30 13:14:21 +02:00
monty@mysql.com
0279dc4234
Portability fixes found during 5.0 test compilation
...
Fixed bug in ORDER BY on a small column (Bug #2147 )
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
2003-12-21 19:39:32 +02:00
jani@rhols221.arenanet.fi
c1bde7d8bd
Removed unneccessary sprintf call and a variable.
2003-12-18 13:56:13 +02:00
jani@rhols221.adsl.netsonic.fi
5678574922
Fixed parenthesis needed by valgrind-max.
2003-12-16 16:03:39 +02:00
monty@mysql.com
56f0abf7bb
Portability fixes (mostly test suite)
...
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
2003-12-16 13:20:17 +02:00
jani@rhols221.adsl.netsonic.fi
90a2456faf
Some minor code clean up.
2003-12-16 11:44:22 +02:00
jani@rhols221.adsl.netsonic.fi
96555b5f90
Added support for multi statement tests. Use mysqltest internal
...
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
2003-12-16 06:09:44 +02:00
monty@mysql.com
cde713023a
Cleanup
2003-12-16 02:23:40 +02:00
monty@mysql.com
6a95123971
Added checking of return value from my_once_alloc() in charset
...
Added checking of return value from malloc() in reg_init()
2003-12-10 00:00:20 +02:00
monty@mysql.com
8aeb63dd3b
Update VC++ files
...
Portability fixes
After merge fixes
2003-11-21 01:53:01 +02:00
monty@narttu.mysql.fi
d9ff665102
Fixes after merge
2003-10-08 12:01:58 +03:00
monty@narttu.mysql.fi
6056cfadfc
Merge with 4.0.16
2003-10-07 15:42:26 +03:00
dlenev@mysql.com
573e5bffbf
Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution).
2003-09-29 23:10:30 +04:00
monty@narttu.mysql.fi
89f30200bc
Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog)
...
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
2003-09-29 12:31:35 +03:00
ram@gw.mysql.r18.ru
5e07599ebe
#1169 : Add --exec command to mysqltest
2003-09-24 16:13:47 +05:00
hf@deer.(none)
a2dbfaefa3
SCRUM
...
embedded library
hash_insert renamed to my_hash_insert to avoid name intersection
with another libraries
is there better idea?
2003-09-19 14:44:31 +05:00
hf@deer.(none)
0e059dcb74
SCRUM:
...
embedded library
I decided to get rid of #define mysql_some_function in mysql.h
It puzzles users and makes problems with dynamic libraries
Finally, there are only two functions left, that are covered with
the #define-s and it won't hurt performance at all
2003-09-18 18:28:42 +05:00
monty@mashka.mysql.fi
7538242e4f
merge with 4.1 tree
2003-09-11 20:31:40 +03:00
ram@mysql.r18.ru
0caa462b77
#1169 : Add --exec command to mysqltest
2003-09-08 10:53:51 +05:00
monty@narttu.mysql.fi
77a70a0a24
merge with 4.0.15
2003-08-29 13:44:35 +03:00
monty@narttu.mysql.fi
a2a1e97226
Portability fixes
2003-08-28 22:18:02 +03:00
monty@narttu.mysql.fi
5192a58140
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into narttu.mysql.fi:/my/mysql-4.0
2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49
Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
2003-08-22 04:07:40 +03:00
serg@serg.mylan
ae8b080549
comment added
2003-08-20 12:27:06 +02:00
monty@mashka.mysql.fi
4f7512160b
After merge fixes
...
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
hf@deer.(none)
9d4bae335c
Resolving conflicts
2003-07-04 13:21:14 +05:00
monty@mashka.mysql.fi
dfac0fc90a
Allow one to use MERGE tables with tables from different databases
...
Added command 'replace_column' to mysqltest
2003-06-27 16:29:10 +03:00
hf@deer.(none)
b82e89d872
SCRUM
...
merged conflicts about my previous commit
it seems there are some errors left - gonna check...
2003-06-17 21:53:13 +05:00
