Commit graph

1180 commits

Author SHA1 Message Date
serg@sergbook.mylan
247052fecc few harmless warnings from automated code-checking tools fixed 2005-01-08 21:25:31 +01:00
jimw@mysql.com
5010be1d8b Merge mysql.com:/home/jwinstead2/mysql-4.1-clean
into mysql.com:/home/jwinstead2/mysql-5.0
2005-01-06 21:39:57 +01:00
bell@sanja.is.com.ua
a8861fe9ec Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-01-06 20:49:27 +02:00
bell@sanja.is.com.ua
d944dc9a78 postreview changes 2005-01-06 20:47:08 +02:00
bell@sanja.is.com.ua
779c33a5e7 fixed comparation with string constant on some platform (BUG#7651) 2005-01-06 19:13:58 +02:00
jimw@mysql.com
d4b236fe8f Merge mysql.com:/home/jwinstead2/mysql-4.1-7451
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-06 17:27:48 +01:00
jimw@mysql.com
9971b2f0f5 Add support for --default-character-set to mysqladmin (Bug #7524) 2005-01-06 01:08:03 +01:00
jimw@mysql.com
4d025523e5 Fix "mysqladmin password" to use correct password scrambling function when
talking to pre-4.1 servers or 4.1 and later servers where the old_passwords
option is enabled. "mysqladmin old-password" is unchanged. (Bug #7451)
2005-01-05 21:56:18 +01:00
hf@deer.(none)
5eb5fd12be fix for bug #5920 (embedded-server mysql doesn't handle --defaults-file) 2005-01-03 19:21:54 +04:00
wax@mysql.com
36edf8297a Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-01-02 20:01:08 +05:00
wax@kishkin.ru
9d5fc07494 WL#964
move my_end() after free_used_memory()
2005-01-02 19:58:49 +05:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00
dlenev@mysql.com
536cb92195 Manual merge. 2004-12-31 12:48:27 +03:00
monty@mysql.com
34d5331cee Merge with global tree 2004-12-31 00:50:30 +02:00
dlenev@mysql.com
a8deefa3dd Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330 WL#1339 "Add per account max_user_connections limit (maximum number
of concurrent connections for the same account)"

Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.

(After review version).
2004-12-29 20:30:37 +03:00
serg@serg.mylan
cf6e2214d8 client/mysqldump.c
compilation failure fixed
    cleanup
2004-12-28 17:33:49 +01:00
lars@mysql.com
967fac4ef6 WL#2319 V2: Exclude tables from dump
- Added a hash to keep track of database-table pairs.
- Specified database-table tables do not get dumped
2004-12-27 19:10:30 +01:00
bar@mysql.com
e53b446a73 Bug#7020: mysqldump --compatible=mysql40 still dumps in UTF8
See mysqldump.test comments for more details
2004-12-22 16:02:27 +04:00
monty@mishka.local
4f4bbfc279 Merge with 4.1 2004-12-22 13:54:39 +02:00
ram@gw.mysql.r18.ru
22f3ca4d8e A fix (bug #7283: Test failure: 'update' (using '--ps-protocol': server crash)). 2004-12-20 20:18:17 +04:00
paul@frost.snake.net
66f0ff16a3 mysql.cc:
Fix up mysql help messages.
2004-12-18 14:30:00 -06:00
guilhem@mysql.com
884663662b Fix for BUG#7358: removing warning reporting of mysqldump 4.1.8 when calling SHOW CREATE DATABASE, as we deal almost gracefully with it
(back to behaviour of 4.1.7). Warning was not fatal: mysqldump continued. And the good thing is that it helped spot that starting from 4.1.7,
SHOW CREATE DATABASE failed (if --single-transaction and first db has non-empty InnoDB table and there is a second db) and thus mysqldump
produced CREATE DATABASE statements missing the CHARACTER SET clause. Removing the bug which was in the server, and the warning reporting in
mysqldump (compatibility with old servers).
2004-12-17 23:37:43 +01:00
wax@kishkin.ru
e81d48fdd9 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script
2004-12-14 18:46:55 +05:00
anjuta@arthur.local
f9451974be WL#1051, more maintanable error messages. 2004-12-13 22:51:54 +02:00
monty@mysql.com
3b14ba64fd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-12 18:44:15 +02:00
gluh@gluh.mysql.r18.ru
58e75f6f24 fix according to review 2004-12-10 18:25:12 +03:00
kent@mysql.com
081fdcc2e1 Makefile.am:
Moved "../regex/libregex.a" before "../libmysql/libmysqlclient.la"
  when linking. For -all-static linking libtool put -lc after the .la
  file and this put the libc regex functions before our regex functions
  when linking on Linux.
2004-12-10 13:06:58 +01:00
gluh@gluh.mysql.r18.ru
2e912bbbe8 Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
mysqldump skips information_schema db
'use' now can use information_schema db
changed value of column 'Null' to 'NO' if column is not nullable
2004-12-10 12:07:11 +03:00
monty@mysql.com
36d11d950a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2004-12-10 02:58:39 +02:00
guilhem@mysql.com
eac128ef2d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-12-09 15:42:06 +01:00
guilhem@mysql.com
1cbc904c59 Changing the default of libmysqlclient : it's now NO reconnection.
All our programs which use mysql_real_connect() and mysql_connect() are updated accordingly, though I have deliberately
made mysqlimport not reconnect anymore (already true for mysqldump >= 4.1.8).
All Connector devs have been warned about the change I'm doing here - which was agreed with Monty,
and fixes BUG#2555.
2004-12-09 14:44:10 +01:00
monty@mysql.com
b68f2307e0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-12-09 12:50:37 +02:00
monty@mysql.com
01e4740f4c Ensure that we free memory used with --order-by-primary (in mysqldump)
Simple, non critical, fix to mysql_fix_privilege_tables
2004-12-09 12:47:20 +02:00
monty@mysql.com
1316954b3f Fixed that mysql-test-run --ps-protocol works with system_mysql_db_fix.test 2004-12-08 01:17:52 +02:00
monty@mysql.com
77207d19f2 Merge with new VARCHAR code 2004-12-06 19:18:35 +02:00
monty@mysql.com
0de4777187 Merge with 4.1 2004-12-06 11:38:56 +02:00
monty@mysql.com
67ce247965 Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART
Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors
Added support for VARCHAR KEYS to heap
Removed support for ISAM
Now only long VARCHAR columns are changed to TEXT on demand (not CHAR)
Internal temporary files can now use fixed length tables if the used VARCHAR columns are short
2004-12-06 02:00:37 +02:00
serg@serg.mylan
9c23871867 help text corrected 2004-12-04 10:06:38 +01:00
tsmith@build.mysql.com
88f48f33c5 Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tsmith/m/41/b
2004-12-02 15:33:12 +01:00
konstantin@mysql.com
dc4f845103 Fix for Bug#6377 "Password Generation Discrepancy" 2004-12-02 14:28:59 +03:00
brian@avenger.(none)
b85f4677d5 Merge for Matt for Innodb bug. 2004-11-30 10:10:40 -08:00
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
2004-11-30 12:27:17 +04:00
tsmith@build.mysql.com
c02e81b018 Merge 2004-11-30 03:24:17 +01:00
tsmith@build.mysql.com
6968523df1 mysqldump.c:
minor cleanup to the --order-by-primary feature code
2004-11-30 02:26:24 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
57b30a1eef Applied some patches for Netware. 2004-11-29 18:32:52 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
b09068f8a4 Applied some Netware related patches. 2004-11-29 17:41:47 +02:00
brian@avenger.(none)
2b0b6ec20c Merging 4.1 to 5.0 2004-11-24 12:34:44 -08:00
joerg@mysql.com
9e467cc009 Merge from 4.0 for immediate use in the current 5.0 builds. 2004-11-24 17:32:11 +01:00
joerg@mysql.com
c356b37b0c Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/mysql-4.1 2004-11-24 15:29:35 +01:00
joerg@mysql.com
cf722bc3f5 Ensure consistent sources up to 5.0 where a C++ problem occurs. 2004-11-24 15:24:23 +01:00
joreland@mysql.com
5ac41f60e3 merge error 2004-11-24 12:33:09 +01:00
joreland@mysql.com
41222efa7b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl2077
2004-11-22 08:20:34 +01:00
paul@kite-hub.kitebird.com
4720cc1fae Merge kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
into kite-hub.kitebird.com:/src/extern/MySQL/bk/merge-5.0
2004-11-20 15:22:57 -06:00
serg@serg.mylan
2d3dd65cc1 merged 2004-11-20 18:36:41 +01:00
paul@kite-hub.kitebird.com
59c0102e23 mysql.cc:
Tweak some help text.
2004-11-19 14:53:40 -06:00
petr@mysql.com
bc0f2ea51c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/cps/mysql/trees/mysql-4.1
2004-11-19 20:21:28 +03:00
tomas@poseidon.ndb.mysql.com
65d31b3e92 Makefile.am, mysqladmin.cc:
reverting linking ndbclisnt to mysqladmin.cc
2004-11-19 17:21:27 +00:00
petr@mysql.com
edc868e397 Added --disable-log-bin option to the mysqlbinlog (WL1787) 2004-11-19 18:35:36 +03:00
tomas@poseidon.ndb.mysql.com
bcd7f9a907 Merge 2004-11-18 22:06:51 +00:00
tomas@poseidon.ndb.mysql.com
3f36910639 fix for mysqladmin link problem
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin
2004-11-18 20:28:36 +00:00
tomas@poseidon.ndb.mysql.com
7ec0239162 changed mysqladmin.c to mysqladmin.cc
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
    aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
    removed all dependencies of LocalConfig, except for mgmapi internals
    enabled multiple management servrs to fetch data configurations from eachother
2004-11-18 18:38:38 +00:00
serg@serg.mylan
e68bd85b77 merged 2004-11-17 18:04:36 +01:00
tsmith@build.mysql.com
decd710b59 Add --order-by-primary option, which adds an ORDER BY
clause the the SELECT statement used to dump the data
for any table which has a primary or unique key.  This
is useful for dumping MyISAM tables which will be later
imported into InnoDB tables.
2004-11-16 23:45:24 +01:00
tomas@poseidon.ndb.mysql.com
4d89516226 Makefile.am:
changed link order to fix linking problems
2004-11-16 09:10:29 +00:00
guilhem@mysql.com
9d54779de5 Merge mysql.com:/home/mysql_src/mysql-4.1-clean
into mysql.com:/home/mysql_src/mysql-5.0-clean
2004-11-16 00:14:46 +01:00
guilhem@mysql.com
fb8b9ca6a4 compilation failures fixes. mysqldump now compiles on AIX 4.3. 2004-11-16 00:10:32 +01:00
guilhem@mysql.com
e38dae0bc1 Merge 2004-11-16 00:04:12 +01:00
guilhem@mysql.com
99417e07eb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2004-11-15 23:52:04 +01:00
tomas@poseidon.ndb.mysql.com
16e34bd27d changed compile order, mysqladmin with ndbcluster extensions needs ndb to be compiled first
added libs variable for ndbmgmclient used by mysqladmin
    add linkage with @ndb_mgmclient_libs@
    additional options for ndbcluster
    added support for managing the cluster to mysqladmin
    added DEFINE_CXA_PURE_VIRTUAL flag to CFLAGS to enable linkage with c++ libs
    use macros for C_MODE_START/END so that define of FIX_GCC_LINKING_PROBLEM works in c-programs
2004-11-15 12:40:32 +00:00
guilhem@mysql.com
e8049f0649 Try to lower the probability of a stall of mysqldump AND most client connections, when mysqldump does a FLUSH TABLES WITH READ LOCK
(doing FLUSH TABLES first).
2004-11-14 17:45:37 +01:00
guilhem@mysql.com
8387d0000c allowing --master-data without arg to be compatible with < 4.1.8 mysqldump. 2004-11-14 17:18:31 +01:00
monty@mysql.com
addd1a0da8 Merge with 4.1 2004-11-12 19:58:24 +02:00
monty@mysql.com
e9c3887b58 After merge fixes 2004-11-12 17:44:17 +02:00
pem@mysql.comhem.se
232abd5f6e Fixed merge bug(?) in mysqldump.c. 2004-11-12 13:02:17 +01:00
monty@mysql.com
9252656d49 merge with 4.0 2004-11-12 11:17:53 +02:00
brian@avenger.(none)
1d8a6a06a5 Merge avenger.(none):/export/brian/mysql/test/4.1
into avenger.(none):/export/brian/mysql/test/5.0
2004-11-11 22:12:01 -08:00
brian@avenger.(none)
3e4ca194f8 Mainly resolving Guilhem's 4.1 patch to 5.0 2004-11-11 19:01:46 -08:00
brian@avenger.(none)
f05daf02ba Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) 2004-11-11 18:58:57 -08:00
paul@kite-hub.kitebird.com
af8d361217 mysqldump.c:
Reorder options, revise --hex-blob help string.
2004-11-11 14:55:55 -06:00
joerg@mysql.com
437a80ed66 Corrected a syntax error detected in test build. 2004-11-11 14:12:45 +01:00
guilhem@mysql.com
600b965f32 Merge 2004-11-10 18:02:00 +01:00
guilhem@mysql.com
6cd218cc56 WL#1596 "make mysqldump --master-data --single-transaction able to do online dump of InnoDB AND report reliable
binlog coordinates corresponding to the dump".
The good news is that now mysqldump can be used to get an online backup of InnoDB *which works for
point-in-time recovery and replication slave creation*. Formerly, mysqldump --master-data --single-transaction
used to call in fact mysqldump --master-data, so the dump was not an online dump (took big lock all time of dump).
The only lock which is now taken in this patch is at the beginning of the dump: mysqldump does:
FLUSH TABLES WITH READ LOCK; START TRANSACTION WITH CONSISTENT SNAPSHOT; SHOW MASTER STATUS; UNLOCK TABLES;
so the lock time is in fact the time FLUSH TABLES WITH READ LOCK takes to return (can be 0 or very long, if
a table is undergoing a huge update).
I have done some more minor changes listed in the paragraph of mysqldump.c.
WL#2237 "WITH CONSISTENT SNAPSHOT clause for START TRANSACTION":
it's a START TRANSACTION which additionally starts a consistent read on all
capable storage engine (i.e. InnoDB). So, can serve as a replacement for
BEGIN; SELECT * FROM some_innodb_table LIMIT 1; which starts a consistent read too.
2004-11-10 17:56:45 +01:00
paul@kite-hub.kitebird.com
0d0ed072da Alphabetize some out-of-order options in option structure.
Revise the --hex-blob help message string. (This will need
revising after merge to 4.1, too, but the CHAR BINARY and
VARCHAR BINARY data types will be BINARY and VARBINRY.)
2004-11-09 11:03:02 -06:00
lars@mysql.com
0fb9cfc974 Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2004-11-09 09:36:34 +01:00
monty@mysql.com
1087186657 Merge with 4.1 to get new thd->mem_root handling 2004-11-08 17:53:32 +02:00
lars@mysql.com
3e3cac142e Merge mysql.com:/home/bkroot/mysql-4.1
into mysql.com:/home/bk/b6239-4.1-v2-pending
2004-11-08 13:45:42 +01:00
monty@mysql.com
4fbf62e6c2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-11-08 01:15:26 +02:00
monty@mysql.com
b903a129e2 Simpler arena swapping code
Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root.
This gives us the following benefits:
- Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases)
- Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT)
- We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root
2004-11-08 01:13:54 +02:00
bar@mysql.com
954f88db9f mysqldump.c:
in 4.1: Dump only VARBINARY() in hex,
  while VARCHAR() COLLATE xxx_bin as a string.
2004-11-05 20:35:56 +04:00
bar@mysql.com
b911810af7 mysqldump.c:
Dump VARCHAR(n) BINARY in HEX if --hex-blob too.
2004-11-05 20:33:56 +04:00
bar@mysql.com
630ea6e63c client_priv.h:
Backport --hex-blob to 4.0
2004-11-05 09:23:53 +04:00
bar@mysql.com
7253d4c4f6 mysqldump.c:
- 'mysqldump --help' comment that --xeh-blob
    doesn't work with --extended-inserts was removed.
    It does work now. Thanks to Lachlan
    who noticed this wrong help message.
  - Switched to use the recently introduced
    mysql_hex_string() instead of slow sprintf().
    Thanks to Sinisa for the idea.
  - 'mysqldump --hex-blob' dumps in HEX not only
    BLOBs but also BINARY(x) columns. 
    Thanks to Paul.
2004-11-05 08:54:52 +04:00
bar@mysql.com
1a6889bb5c mysqladmin.c:
Missing initialized for "lengths" element.
  ,
2004-11-05 08:08:38 +04:00
wax@kishkin.ru
ff32313dd5 autocommit and changed name mysql_test_run_new 2004-11-04 21:25:51 +05:00
wax@mysql.com
bf2685a690 autocommit 2004-11-04 21:25:49 +05:00
lars@mysql.com
0d5290fc5c BUG#6239 V2: Since uint can be shorter than ulong on 64 bit platforms,
the comparision of "packet_len" (uint) and "len" (uint) with 
"packet_error"  (ulong) was always false.
2004-11-04 15:59:19 +01:00
monty@mysql.com
071001950e Merge with 4.1 to get in latest bug fixes 2004-11-04 15:06:24 +02:00
monty@mysql.com
47bbf768d4 Fixes after merge with 4.1
FOUND is not a reserved keyword anymore
Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted
Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT
Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete
2004-11-03 12:39:38 +02:00
monty@mysql.com
2185f1a56c Remove usage of !$ from mysql-tests
Added protocol::flush() for easier embedded-server code
Increase block allocation variables a bit as they where a bit too small for MySQL 4.1
Added option --silent to client_test
2004-11-02 20:13:27 +02:00
ram@gw.mysql.r18.ru
e1979f2580 A fix (bug #6309: myisamchk compiled without debug support , --help shows vise versa
bug #6380: mysqlcheck --help prints wrong --debug msg for non-debug version).
2004-11-02 13:14:07 +04:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
mleich@mysql.com
86143bc832 These modifications are the result of
WL#2067 add features to mysqltest: "disable_error_abort" + "$mysql_errno"

$mysql_errno is a new builtin variable of mysqltest and contains the
return code of the last command send to the server.

"--disable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements off.
"--enable_abort_on_error" switches the abort of mysqltest
after "unmasked" failing statements on. (default)

"Maskings" are
    !$<error number>  and  --error <error number>
in the line before the statement to be checked.

The benefit of the option "--disable_abort_on_error" is that
- all statements after the failing statement are executed
- a r/<test>.reject will be produced
- it is possible to write test cases, which perform
  code sequences depending on the return code of a single
  statement
2004-10-29 14:51:56 +02:00
monty@mysql.com
6fbc869d18 A lot of fixes for prepared statements (PS):
New mysqltest that can run mysqltest with PS
Added support for ZEROFILL in PS
Fixed crash when one called mysql_stmt_store_result() without a preceding mysql_stmt_bind_result()
Updated test cases to support --ps-protocol
(Some tests are still run using old protocol)
Fixed crash in PS when using SELECT * FROM t1 NATURAL JOIN t2...
Fixed crash in PS when using sub queries
Create table didn't signal when table was created. This could cause a "DROP TABLE created_table" in another thread to wait "forever"
Fixed wrong permissions check in PS and multi-table updates (one could get permission denied for legal quries)
Fix for PS and SELECT ... PROCEDURE
Reset all warnings when executing a new PS query
group_concat(...ORDER BY) didn't work with PS
Fixed problem with test suite when not using innodb
2004-10-26 19:30:01 +03:00
monty@mysql.com
91c80cf44e merge 2004-10-22 19:21:55 +03:00
monty@mysql.com
3afecef4df Fix compiler warnings (detected by Intel's C++ compiler)
Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)
2004-10-22 18:44:51 +03:00
kent@mysql.com
90a8caee45 Merge 2004-10-22 15:41:56 +02:00
kent@mysql.com
7a640b44dd mysqltest.c, mysqltest.result, mysqltest.test:
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file
2004-10-22 05:56:27 +02:00
ram@gw.mysql.r18.ru
61c7767786 A fix (bug #4802 prompt in mysql client shows wrong database after dropping default db). 2004-10-21 17:02:24 +05:00
monty@mishka.local
7af65592c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.local:/home/my/mysql-4.1
2004-10-20 02:55:03 +03:00
monty@mishka.local
04c23808a8 Review of all code pushed since last review
Simple optimzations and cleanups
Removed compiler warnings and fixed portability issues
Added client functions 'mysql_embedded()' to allow client to check if we are using embedded server
Fixes for purify
2004-10-20 01:28:42 +03:00
ram@gw.mysql.r18.ru
ece5c9f293 A fix (bug #6101: mysqldump writes invalid SQL). 2004-10-19 11:00:44 +05:00
bar@mysql.com
f8c7a60c34 Dumping BLOBs in HEX notation. The patch was orinigally
contributed by Takeshi. I also added HEX support for 
"extended-inserts".
2004-10-19 10:40:59 +05:00
lenz@mysql.com
a524835cdd - Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c 2004-10-14 16:52:00 +02:00
jani@a80-186-41-201.elisa-laajakaista.fi
a37355fb98 Added option --sigint-ignore to mysql.cc 2004-10-07 22:47:11 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
724749e9a7 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-07 22:09:14 +03:00
jani@a80-186-41-201.elisa-laajakaista.fi
a44b6b67a5 Fixed a bug in password handling. All related to Bug#5955. 2004-10-07 22:08:17 +03:00
monty@mysql.com
1dd4bd5f6c Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 2004-10-07 12:51:32 +03:00
monty@mysql.com
62f3cd6a31 Merge with 4.0 for 4.1 release
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied
2004-10-06 19:14:33 +03:00
rburnett@build.mysql.com
b4ee4d358a Bug #5829 mysqlimport garbles path of the file to be imported
Original code was checking ! unix_socket for local_file flag.  This doesn't work and so was removed.  Now
to import a local file, you must use the --local command line option.

mysqlimport.c:
  Removed check of unix_socket to set local_file
2004-10-04 20:26:43 +02:00
paul@kite-hub.kitebird.com
d5bb2099f7 mysqldump.c:
typos in comment.
2004-10-02 20:16:14 -05:00
paul@kite-hub.kitebird.com
350dc64c8f mysqldump.c:
Add missing semicolons.
2004-09-28 14:18:23 -05:00
monty@mishka.local
1fc7e6af85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
2004-09-28 20:19:03 +03:00
monty@mishka.local
f2941380c4 Strict mode & better warnings
Under strict mode MySQL will generate an error message if there was any conversion when assigning data to a field.
Added checking of date/datetime fields.
If strict mode, give error if we have not given value to field without a default value (for INSERT)
2004-09-28 20:08:00 +03:00
kent@mysql.com
43d3516cc6 Merge mysql.com:/home/bk/mysql-4.1
into mysql.com:/users/kboortz/daily/work/mysql-4.1-vax
2004-09-28 16:43:05 +02:00
kent@mysql.com
155e1ec330 client_test.test:
Run client_test as a testcase
  new file
mysql-test-run.sh:
  More clearly report failure if --force, also exit 1
client_test.c:
  Use MAXPATHLEN in test_frm_bug()
  Renable test cases disabled for running from mysql-test-run
mysqltest.c:
  Don't check errno from popen, may not be set
2004-09-28 16:27:50 +02:00
kent@mysql.com
0061da910d mysql-test-run.sh:
Added timing output for each test case.
  Added --embedded-server option.
mysqltest.c:
  Added 'start_timer', 'end_timer' commands
Makefile.am:
  Include mysys/my_getsystime.c to get time function in mysqltest
Many files:
  new file
2004-09-27 17:01:26 +02:00
bell@sanja.is.com.ua
ff102adddf fix xml with view 2004-09-26 19:00:55 +03:00
kent@mysql.com
7d4445f17b client_test.c:
Return exit(1) instead of exit(0) on failure.
  Allow longer path names using MAXPATHLEN.
  Added option --testcase that skips some failing tests.
  Replaced 'return' with exit(1) in test_frm_bug().
mysqltest.c:
  Let --exec fail if command fails
2004-09-25 10:30:36 +02:00
bell@sanja.is.com.ua
2264bb01ca new show create view output
mysqldump view support (BUG#4972)
workaround to allow view work after LOCK TABLES
2004-09-24 12:50:10 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
389d418cd2 Bug#5655 - mysqldump fields-escaped-by behaviour
Fix initialization
2004-09-22 11:28:37 +01:00
kent@mysql.com
604acced00 mysqltest.c:
Feature to solve Bug#4640, added "--character_set <charset>" test case option
2004-09-16 20:52:23 +02:00
wax@mysql.com
c315ee2f60 Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
2004-09-16 00:53:06 +06:00
wax@mysql.com
d6dadac46c Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1mysqltest
2004-09-16 00:50:05 +06:00
wax@kishkin.ru
eb7515366b WL#964
porting mysql_test_run on Linux and Windows
2004-09-16 00:47:45 +06:00
bar@mysql.com
dcfb23f37f mysql.cc:
SQL_SELECT_LIMIT=0 protection
2004-09-15 13:26:47 +05:00
bar@mysql.com
1992322af5 Restoring old code to be used with 4.0 server if 4.1-compient query fails.
Restoring displaying database and user which was removed in a mistake
in the previous change.
2004-09-15 10:06:30 +05:00
bar@mysql.com
49728cce7e mysql.cc:
Bug #5536: wrong server character set in "status" command
  More character set variables.
2004-09-13 12:51:08 +05:00
hf@deer.(none)
7aa25240f7 Fix for bug #4809 (Backticks not handled in mysql) 2004-09-13 12:13:24 +05:00
ram@gw.mysql.r18.ru
9f66608a31 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3120
2004-09-09 11:58:11 +05:00
monty@mysql.com
f2829d0386 After merge fixes of merge with 4.1 that included the new arena code.
Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions
2004-09-09 06:59:26 +03:00
paul@kite-hub.kitebird.com
a022b3c549 mysql.cc:
Print sqlstate value in batch mode, not just in interactive mode.
2004-09-08 13:28:11 -05:00
rburnett@build.mysql.com
751071a677 [This patch has already been approved by Serge. I am recommitting and pushing from a new repository because there were other changesets that couldn't be pushed.]
BUG# 5229 --password=foobar does not override the empty 'password' option in the my.cnf
This is a backport of a change made by jani in the 4.1 tree.

mysql.cc:
  Add tty_password=0 in the p case handling in get_one_option
2004-09-08 16:31:01 +02:00
ram@gw.mysql.r18.ru
2b8b1a399a A fix (bug #3120: 'mysqladmin ping' - return error code). 2004-09-08 16:45:03 +05:00
serg@serg.mylan
0afcaac5a8 after merge 2004-09-07 22:10:15 +02:00
serg@serg.mylan
323e683cbf merged 2004-09-07 21:30:28 +02:00
serg@serg.mylan
413a8753e2 merged 2004-09-07 15:18:53 +02:00
ram@gw.mysql.r18.ru
173561b0cd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205
2004-09-07 17:26:15 +05:00
ram@gw.mysql.r18.ru
00830a11fc A fix (Bug #5432: Is this a leak in mysql console client?) 2004-09-07 14:24:47 +05:00
serg@serg.mylan
c0aba1ab98 Bug #5413 mysqlcheck segfaults when user has to few permissions 2004-09-06 22:48:42 +02:00