Commit graph

1145 commits

Author SHA1 Message Date
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
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