mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37006 commits 2781 branches 343 tags 1.6 GiB
Commit graph

1929 commits

Author SHA1 Message Date
mskold@mysql.com
5eb07ec747 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
 2006-04-25 08:48:10 +02:00
cmiller@zippy.(none)
9ae7dd9e35 Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-24 16:17:50 -04:00
mskold@mysql.com
e95e6ddcb4 Fix for Bug #17840 mysqldump should not dump tables in database cluster, reuse existing define 2006-04-24 15:50:05 +02:00
mskold@mysql.com
14d8fdb295 Fix for Bug #17840 mysqldump should not dump tables in database cluster, skip cluster internal database 2006-04-24 15:39:49 +02:00
jimw@mysql.com
3761b25696 Bug #18495: mysqltest does not use the correct error number 
When looking up the error number for named errors in mysqltest .test
  files, we inadvertantly would match ER_WRONG_VALUE against
  ER_WRONG_VALUE_COUNT because we were using the length of the shorter
  string in strncmp(). Now we double-check the length of matches to
  make sure it was a complete match.
 2006-04-21 19:29:22 -07:00
msvensson@neptunus.(none)
29ace143a1 Backport fix for mysql client not using SSl library directly 
- Add function mysql_get_ssl_cipher
 - Use function mysql_get_ssl_cipher from mysql
 2006-04-22 00:48:13 +02:00
kent@mysql.com
1472ed2061 Merge 2006-04-21 20:04:13 +02:00
jimw@mysql.com
c28ea5b03b Bug #18312: mysqltest: --sleep=0 doesn't disable sleep 
Allow --sleep=0 to be specified to mysqltest, so that sleep calls
  can be disabled.

  Original patch from Paul DuBois.
 2006-04-21 10:48:53 -07:00
msvensson@neptunus.(none)
a51668c74c Bug#17208 SSL: client does not verify server certificate 
- Add new function 'ssl_verify_server_cert' which is used if we are 
   connecting to the server with SSL. It will compare the hostname in 
   the server's cert against the hostname that we used when connecting 
   to the server. Will reject the connection if hostname does not match.
 - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
   which will turn on checking of servers cert.
 - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
   will activate the above option.
 - Generate a new server cert with 1024 bits that has "localhost" as the server name.
 2006-04-18 17:58:27 +02:00
kent@mysql.com
64295d82d1 Merge 2006-04-18 17:16:27 +02:00
kent@mysql.com
58c153c629 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
 2006-04-18 10:34:56 +02:00
serg@mysql.com
98ea03931e mysql.cc: 
revert bug#16855 "fix" per Monty's request
 2006-04-18 10:16:06 +02:00
cmiller@zippy.(none)
7d282984f3 Only expand the empty string to the letters "NULL" if the column 
does not have "NOT NULL" attribute set.  Also, calculate the padding
characters more safely, so that a negative number doesn't cause it to 
print MAXINT-n spaces.
 2006-04-16 17:17:36 -04:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
cmiller@zippy.(none)
c7513d482f Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new
 2006-04-14 13:33:02 -04:00
tomas@poseidon.ndb.mysql.com
07753c59a0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-04-13 10:48:24 +02:00
bpontz@shasta.mysql.com
19688a131a Child segfault when tring to call "mysql_error(NULL)", fixed by not 
assigning "mysql" variable from return value of mysql_real_connect.
 2006-04-12 23:16:15 -04:00
jimw@mysql.com
c490aff57e Merge mysql.com:/home/jimw/my/mysql-5.1-refactor 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-04-12 08:24:20 -07:00
tomas@poseidon.ndb.mysql.com
10692ba84f increase save_master_pos timeout to 30 seconds for higher test predictability 
better replicaiton test cleanup to ensure better test predictability
+ some ndb test cleanup
 2006-04-12 15:55:41 +02:00
jimw@mysql.com
276109b155 Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, 
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
 2006-04-11 18:54:24 -07:00
msvensson@neptunus.(none)
ee76a12c09 Protect from empty --query argument 2006-04-11 23:24:06 +02:00
cmiller@zippy.(none)
a1e78b3d36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready
 2006-04-11 16:39:09 -04:00
msvensson@neptunus.(none)
52c9feff13 Bug#18012 mysqlslap fails if querystring starts with delimiter 
- Terminate loop not only when the limit is met, but alse when there is no more stmts
 2006-04-11 22:23:16 +02:00
msvensson@neptunus.(none)
0bdb9ff547 Fix syntax error 2006-04-11 22:10:11 +02:00
msvensson@neptunus.(none)
5848a4276d Bug#17478 mysqlslap not issuing any queries 
- Add more printouts it depending on verbose level
 - New common function 'run_query' to be used when executing a query
 2006-04-11 22:04:08 +02:00
msvensson@neptunus.(none)
c8c8041804 Don't use the MYSQL* returned from mysql_real_connect to overwrite the already initalised mysql variable 2006-04-11 20:49:31 +02:00
msvensson@neptunus.(none)
53ff7dfbc9 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:54:00 +02:00
msvensson@neptunus.(none)
8fe764fbb2 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-04-11 09:11:36 +02:00
kent@mysql.com
691822a929 mysql_upgrade.c: 
No declarations after first expression in block
 2006-04-11 02:48:19 +02:00
holyfoot@deer.(none)
b5afca05a4 WL#2645 (mysql_upgrade tool) 2006-04-10 20:54:43 +05:00
holyfoot@mysql.com
a5d18bc8ab Merging 2006-04-10 20:54:42 +05:00
msvensson@neptunus.(none)
24a6dd64b5 Update implementation of new function 'mysql_get_ssl_cipher' after review 2006-04-10 12:23:20 +02:00
msvensson@neptunus.(none)
0d98d97170 Remove #if 0 2006-04-07 14:21:00 +02:00
msvensson@neptunus.(none)
98904a8caa Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client. 2006-04-07 11:26:21 +02:00
msvensson@neptunus.(none)
1452892816 Incorporate a patch to write a timestamp for every new line of the test that is executed. 
This makes it possible make a graph (with for example gnuplot) of a test run and spot where most time is consumed.
Add the new code inside an "#if 0" until it's portable.
 2006-04-05 11:47:12 +02:00
cmiller@zippy.(none)
0db6176bfc Bug#18265: mysql client: No longer right-justifies numeric columns 
Also fixes a new bug for which "NULL" wasn't printed (because the 
data it represents has length zero).  (Discovered my Paul DuBois.)
 2006-04-04 17:35:07 -04:00
knielsen@mysql.com
da000b2d2a Fix AIX compile failure. 2006-03-30 11:12:24 +02:00
monty@mysql.com
c3e7c7aa4b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1
 2006-03-29 17:28:40 +03:00
monty@mysql.com
1994ed49ec Fixed compiler and valgrind warnings 
Added missing DBUG_xxx_RETURN statements
Fixed some usage of not initialized variables (as found by valgrind)
Ensure that we don't remove locked tables used as name locks from open table cache until unlock_table_names() are called.
This was fixed by having drop_locked_name() returning any table used as a name lock so that we can free it in unlock_table_names()
This will allow Tomas to continue with his work to use namelocks to syncronize things.

Note: valgrind still produces a lot of warnings about using not initialized code and shows memory loss errors when running the ndb tests
 2006-03-29 14:27:36 +03:00
brian@zim.(none)
097804fbdb Behavior change to preserve schema unless you specify autogenerated SQL or create values. 2006-03-28 17:59:11 -08:00
knielsen@mysql.com
cc57e4e01b Manual merge. 2006-03-28 10:07:03 +02:00
ian@zim.(none)
9caff206c2 Merge zim.(none):/home/ian/workspace/mysql-5.0 
into  zim.(none):/home/ian/workspace/mysql-5.1-new

Updated bug message in disabled file -Brian
 2006-03-27 19:48:44 -08:00
ian@zim.(none)
a66aace3e9 Fix for bug #16855 2006-03-27 17:45:06 -08:00
bpontz@shasta.mysql.com
2d14a5e560 netware doesnt use fork 2006-03-27 12:25:01 -05:00
knielsen@mysql.com
bc6628d27f Some changes to make it possible to build for Windows with CMake from 
a normal 'make dist' source .tar.gz.
 2006-03-24 22:50:56 +01:00
msvensson@neptunus.(none)
ab1f95df3e Merge 192.168.0.100:mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-24 12:33:11 +01:00
msvensson@shellback.(none)
8f1ed3c463 Dump result to .log file at test failure 2006-03-23 21:48:31 +01:00
msvensson@shellback.(none)
4602e426dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 18:58:53 +01:00
msvensson@shellback.(none)
b5bea5e312 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 18:14:02 +01:00
msvensson@shellback.(none)
5ebda1d2f6 Update after merge, function renamed 2006-03-23 16:21:20 +01:00
msvensson@shellback.(none)
e6bf664c62 Merge shellback.(none):/home/msvensson/mysql/mysqltestrun_pl/my50-mysqltestrun_pl 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-23 15:30:21 +01:00
msvensson@shellback.(none)
5ec7aa3aaf Dump reject file before mysqltest in 'die' 
Makes it easier to see what happened before the failure
 2006-03-23 15:04:46 +01:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
 2006-03-20 21:35:05 +01:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 20:16:53 +01:00
holyfoot@deer.(none)
9bc866d9b2 bug #18115 (mysql_upgrade missing in Windows binary) 2006-03-18 17:56:24 +04:00
knielsen@mysql.com
8567553bcb Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
knielsen@mysql.com
ca4ec28146 CMake Windows comp_error dependency fix after last push. 2006-03-16 15:42:48 +01:00
knielsen@mysql.com
24e29bf9d1 Fix Windows CMake dependency problem. 2006-03-16 13:30:59 +01:00
Reggie@xgeek.
11979eec94 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06:00
anozdrin@mysql.com
0e172496eb Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree 
into  mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.1-tree
 2006-03-10 22:37:38 +03:00
anozdrin@mysql.com
41423cd05c Fix version of DEFINER-clause in mysqldump. 
Now DEFINER-clause in stored routines is expected to appear
in 5.0.20 release, not in 5.0.19. as it was supposed before.
 2006-03-10 22:23:04 +03:00
brian@zim.(none)
07bd25c9f5 This is a patch to test the default schema location. 2006-03-10 08:54:12 -08:00
msvensson@neptunus.(none)
31804060aa Improve mysqltest 
Add comment's for enable/disable_query_log and enable/disable_result_log
Update comment for "check_result"
Add check in "handle_error" that detects if the server crashed when running a "require" query to check if a certain feature is available
 2006-03-10 12:08:53 +01:00
cmiller@calliope.local
34a74d65ba Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 22:23:35 -05:00
cmiller@calliope.local
9747057fa9 Merge calliope.local:/Users/cmiller/work/src/mysql-5.1-new 
into  calliope.local:/Users/cmiller/work/src/mysql-5.1-new__cleanup_mysqldump
 2006-03-09 15:22:11 -05:00
cmiller@calliope.local
d3c0dc0eed Added code to mysqldump to dump timed events when instructed to do so, with 
the '-E' or '--events' flag.  (Closes Bug#16853 and Bug#17714.)


WARNING:

At present, these tests fail due to b*g number 18078.
 2006-03-09 15:12:43 -05:00
anozdrin@mysql.com
c1ef46fcc7 Merge mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-tree 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-merged
 2006-03-09 20:41:21 +03:00
reggie@linux.site
980434bf4b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-03-07 14:52:51 -06:00
kent@mysql.com
05f3d1710a Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-07 21:52:50 +01:00
anozdrin@mysql.com
d5e641fec7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
 2006-03-07 21:47:41 +03:00
kent@mysql.com
0aaded3707 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-07 18:21:38 +01:00
msvensson@neptunus.(none)
48bef14042 Fix missing call to init_tmp_sh_file 2006-03-07 14:34:20 +01:00
anozdrin@mysql.com
d9d4dc5ef8 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.0-rt
 2006-03-07 14:28:09 +03:00
msvensson@neptunus.(none)
647a940649 Enable ifdef for windows specific functions 2006-03-07 08:57:57 +01:00
msvensson@neptunus.(none)
456b2d6b14 Improve error message for faulty usage of "inc" and "dec" 2006-03-07 07:50:04 +01:00
msvensson@neptunus.(none)
f2ce7dc787 Fix typo 2006-03-06 22:18:04 +01:00
msvensson@neptunus.(none)
0cc14310e8 Remove unused var 
Reduce code
 2006-03-06 22:08:34 +01:00
msvensson@neptunus.(none)
a336f48552 Win fixes 
- Use tmp sh file both in system and popen
 2006-03-06 22:05:39 +01:00
pem@mysql.com
a065843799 Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0 
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
 2006-03-06 19:46:17 +01:00
msvensson@neptunus.(none)
3f935b2777 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-06 12:00:51 +01:00
dlenev@mysql.com
0fb4a6645e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg17866-2 
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
 2006-03-04 23:58:48 +03:00
reggie@big_geek.
97a4671f1f Bug #17720 Partition ALTER TABLE fails on rename of .MYI file 
Fix this by passing the HA_EXTRA_PREPARE_FOR_DELETE onto the newly added or about to be dropped partitions
so they have an opportunity to close their OS file handle.
 2006-03-04 14:21:27 -06:00
cmiller@zippy.(none)
599c710a5b Bug#16859 involves truncating column data at NUL characters. Instead, the 
client will now substitute spaces for NULs, so that the grid isn't messed up
due to silently consumed NULs and that the full field is shown.
 2006-03-03 16:26:38 -05:00
paul@snake-hub.snake.net
53ea1584bc Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1-clone
 2006-03-03 14:41:55 -06:00
paul@snake-hub.snake.net
1442be9798 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone
 2006-03-03 14:37:43 -06:00
paul@snake-hub.snake.net
f3cf52832d mysqltest.c: 
Typos.
 2006-03-03 14:34:30 -06:00
paul@snake-hub.snake.net
f3c7e2d3ed mysqltest.c: 
Better fix for do_sleep().
 2006-03-03 13:57:49 -06:00
msvensson@neptunus.(none)
21cc7c9555 Windows fixes 
- Use pipes "|"
 - Improved system command, create a temporary .sh faile that is executed  with cygwins sh(bash)
   This makes the Windows version behave exactly as the Lunix version(well almost...) 
 - Give unix path to DBUG, trace files is no produced if running ./mysql-test-run.pl --debug"
 2006-03-03 14:55:05 +01:00
msvensson@neptunus.(none)
f601d26961 Remove superfluous DBUG_PRINT 2006-03-02 17:33:34 +01:00
msvensson@neptunus.(none)
52d51e5e26 Make the "system" command become executed in a bash shell in cygwin. 2006-03-02 16:28:45 +01:00
anozdrin@mysql.com
fbb5920399 Implementation of WL#2897: Complete definer support in the stored routines. 
The idea is to add DEFINER-clause in CREATE PROCEDURE and CREATE FUNCTION
statements. Almost all support of definer in stored routines had been already
done before this patch.

NOTE: this patch changes behaviour of dumping stored routines in mysqldump.
Before this patch, mysqldump did not dump DEFINER-clause for stored routines
and this was documented behaviour. In order to get full information about stored
routines, one should have dumped mysql.proc table. This patch changes this
behaviour, so that DEFINER-clause is dumped.

Since DEFINER-clause is not supported in CREATE PROCEDURE | FUNCTION statements
before this patch, the clause is covered by additional version-specific comments.
 2006-03-02 15:18:49 +03:00
msvensson@neptunus.(none)
e4b6f64a16 Make do_block return void, return value never used. 2006-03-02 11:10:29 +01:00
msvensson@neptunus.(none)
ff391e9fe1 Fix unsigned warning on windows 2006-03-02 11:08:43 +01:00
serg@serg.mylan
c7513d18db crazy - for the last week mysqlslap.test was generating 400 sigsegvs 
per run, failing ALL mysql_real_connect() calls - nobody noticed,
the test always appeared to "pass".
 2006-03-02 10:48:54 +01:00
kent@mysql.com
bc5c186828 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-03-01 03:18:59 +01:00
kent@mysql.com
5d722a8491 Merge 2006-02-28 23:29:58 +01:00
paul@snake-hub.snake.net
1986796849 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-28 15:14:31 -06:00
paul@snake-hub.snake.net
67e4580e29 mysqltest.c: 
expand tab
 2006-02-28 15:11:44 -06:00
paul@snake-hub.snake.net
d8a6e41c6b Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 15:09:45 -06:00
paul@snake-hub.snake.net
d6654fe9cb mysql-test-run.sh: 
Fix URLs.
README:
  Fix URL.
mysqltest.result:
  Update test result for real_sleep error message.
mysqltest.c:
  Fix do_sleep() to print correct command name for real_sleep.
 2006-02-28 15:08:16 -06:00
paul@snake-hub.snake.net
49de5254f3 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-28 14:05:20 -06:00
paul@snake-hub.snake.net
7ff2ede8c9 mysqltest.c: 
Fix reference to incorrect (non-existent) options in comment.
 2006-02-28 14:04:21 -06:00
paul@snake-hub.snake.net
486bd42b06 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 14:01:16 -06:00
paul@snake-hub.snake.net
fc8ed82da4 mysqltest.c: 
Correct/clarify comments.
 2006-02-28 14:00:17 -06:00
paul@snake-hub.snake.net
c28c6aa953 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-28 12:20:48 -06:00
paul@snake-hub.snake.net
a052ef7d82 mysqltest.c: 
Fix typos.
 2006-02-28 12:19:30 -06:00
paul@snake-hub.snake.net
a2c639d813 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-28 12:10:38 -06:00
paul@snake-hub.snake.net
6d4dc91bbf mysqltest.c: 
Fix typos.
 2006-02-28 12:01:24 -06:00
dlenev@mysql.com
8dbdf5237e Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525 
into  mysql.com:/home/dlenev/src/mysql-5.1-merges2
 2006-02-27 20:00:07 +03:00
msvensson@neptunus.(none)
90e5ca96be Look for and "convert" paths that start with $MYSQL_TMP_DIR 2006-02-26 19:54:09 +01:00
brian@zim.(none)
7234f79c4a This patch handles compiles with threads, namely if you don't have pthreads it will remove support for threads in the applications (and it is fixed in such a way that tests won't break). 2006-02-25 18:03:11 -08:00
msvensson@neptunus.(none)
7d29ace754 Bug #17443 mysqldump test failure 2006-02-24 17:10:40 +01:00
kent@mysql.com
5484ee5815 Makefile.am: 
Conditionally link with libmysqlclient.la or libmysqlclient_r.la
configure.in:
  Corrected help text for --with-debug option
  Changed default to be with thread safe client
  Added THREAD_SAFE_CLIENT to be used in 'if' in make files
 2006-02-24 01:24:41 +01:00
paul@snake-hub.snake.net
082e9ddbe3 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 13:56:00 -06:00
paul@snake-hub.snake.net
b11c033f49 mysqltest.c: 
Rearrange out of order options in option struct.
 2006-02-23 13:54:55 -06:00
msvensson@neptunus.(none)
f824345be6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 16:11:47 +01:00
msvensson@neptunus.(none)
36a1d6392b Change snprintf to my_snprintf 2006-02-23 16:08:28 +01:00
msvensson@neptunus.(none)
167b625e62 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 14:35:57 +01:00
msvensson@neptunus.(none)
269ab365aa Aix52 build fix 2006-02-23 14:06:29 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
msvensson@neptunus.(none)
5c4bf37259 Merge fixup 2006-02-23 10:35:53 +01:00
msvensson@neptunus.(none)
f80555880a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:30:31 +01:00
msvensson@neptunus.(none)
ec91a79c9f Add new parameter to do_eval so that only unescaped variables in input string is expanded and rest of string is left untouched. 2006-02-23 10:11:57 +01:00
knielsen@mysql.com
da6e7e172f Merge mysqldev@win2003-x86:my/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/tmpbuild-5.1
 2006-02-22 10:19:45 +01:00
msvensson@neptunus.(none)
d35ba92a24 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 15:57:56 +01:00
msvensson@neptunus.(none)
a699a2ea1b Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 15:05:58 +01:00
msvensson@neptunus.(none)
f64effb570 Merge neptunus.(none):/home/msvensson/mysql/bug14871/my50-bug14871 
into  neptunus.(none):/home/msvensson/mysql/bug14871/my51-bug14871
 2006-02-21 15:03:15 +01:00
msvensson@neptunus.(none)
c293324eb0 Bug#14871 mysqldump: invalid view dump output 
- Add comments with embeded veriosn info around the parts of the view syntax that are only supported by a certain version of MySQL Server
 2006-02-21 13:21:17 +01:00
msvensson@neptunus.(none)
8e760bc6cc Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 10:37:10 +01:00
msvensson@neptunus.(none)
40fe710394 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 09:40:18 +01:00
msvensson@neptunus.(none)
751d625865 Merge neptunus.(none):/home/msvensson/mysql/bug17382/my51-bug17382 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 09:28:36 +01:00
msvensson@neptunus.(none)
8e9d535676 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-21 09:11:59 +01:00
msvensson@neptunus.(none)
6006c9ac36 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 09:11:03 +01:00
msvensson@neptunus.(none)
3d1f99f8f9 Merge neptunus.(none):/home/msvensson/mysql/bug13809/my50-bug13809 
into  neptunus.(none):/home/msvensson/mysql/bug13809/my51-bug13809
 2006-02-21 09:09:54 +01:00
msvensson@neptunus.(none)
3764d3dab1 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-21 08:55:13 +01:00
msvensson@neptunus.(none)
ac336241b3 Merge neptunus.(none):/home/msvensson/mysql/bug16795/my50-bug16795 
into  neptunus.(none):/home/msvensson/mysql/bug16795/my51-bug16795
 2006-02-21 08:54:08 +01:00
msvensson@neptunus.(none)
40fca5ca11 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
 2006-02-20 15:06:18 +01:00
msvensson@neptunus.(none)
6a8be78acc Merge fix 2006-02-20 15:05:23 +01:00
msvensson@neptunus.(none)
4cde1d1259 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 2006-02-20 13:04:40 +01:00
msvensson@neptunus.(none)
ae174fbef8 Fix typo 2006-02-20 12:05:45 +01:00
kent@mysql.com
2f3811b50c Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2006-02-20 00:36:40 +01:00
kent@mysql.com
0120bac7f6 mysql-test-run.pl: 
Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>
 2006-02-20 00:32:07 +01:00
kent@mysql.com
4c81413932 Merge 2006-02-19 23:47:00 +01:00
brian@zim.tangent.org
faa1b42989 Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 2006-02-19 09:41:59 -08:00
msvensson@neptunus.(none)
e592227529 Fix build failure 2006-02-18 16:18:51 +01:00
kent@mysql.com
a50023d772 mysqlimport.c: 
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
 2006-02-18 08:46:18 +01:00
kent@mysql.com
9aca849da1 Makefile.am: 
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
 2006-02-18 04:23:24 +01:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory 
- Disable --use-threads option in 5.1.7
 2006-02-17 18:19:29 +01:00
msvensson@neptunus.(none)
a50d87da34 Fix after review 2006-02-17 17:16:18 +01:00
msvensson@neptunus.(none)
7632371576 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-17 15:56:01 +01:00
msvensson@neptunus.(none)
e96353cf55 Bug#17382 mysql-test-run mysqldump fails with mysqlimport 
- Remove global  MYSQL connection variable
 2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
3a9bfb00c8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-17 08:33:47 -06:00
paul@snake-hub.snake.net
22f630f59a mysqlcheck.c: 
Tweak --check-upgrade help text.
 2006-02-17 08:32:52 -06:00
msvensson@neptunus.(none)
01cd7a05c7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my50-mysqltest_replace 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_replace/my51-mysqltest_replace
 2006-02-17 12:16:36 +01:00
msvensson@neptunus.(none)
b951068d62 Replace win filename s with unix equivalent 
Evaluate commands passed to "exec" and "system" to expand any $variables before executing command.
 2006-02-17 12:07:45 +01:00
holyfoot@mysql.com
0841480e1e merging 2006-02-17 14:39:38 +04:00
bar@mysql.com
d0e4df18e6 client_priv.h: 
Sorry, forgot to push in the previous changeset.
 2006-02-17 13:10:12 +04:00
bar@mysql.com
ed4f5ac923 mysqlcheck.c: 
WL#3046  Migration tool for 5.1 table-name encoding
 2006-02-17 12:10:36 +04:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
holyfoot@mysql.com
77605c3576 Merge mysql.com:/home/hf/work/mysql-5.0.clean 
into mysql.com:/home/hf/work/mysql-5.1.w2645
 2006-02-17 11:12:05 +04:00
holyfoot@deer.(none)
053d90a234 WL#2645 (CHECK TABLE FOR UPGRADE) 
necessary implementation in the server
mysql_upgrade script added
 2006-02-17 10:52:32 +04:00
paul@snake-hub.snake.net
a9cda1edd3 mysqlcheck.c: 
Fix out of order options.
 2006-02-16 10:00:14 -06:00
serg@serg.mylan
6c7dd562fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-16 14:53:36 +01:00
serg@serg.mylan
661371538b missing DBUG_RETURN 2006-02-16 12:31:33 +01:00
msvensson@neptunus.(none)
3fc22ca4b9 Bug#13809 mysql-test: --replace_result option works on Windows incorrect 2006-02-16 00:53:55 +01:00
msvensson@neptunus.(none)
cac0931b8c Add possibility to have a negative expression in "if" and "while" in mysqltest 2006-02-15 22:43:42 +01:00
jimw@mysql.com
d33b03abef Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-02-15 12:06:20 -08:00
jimw@mysql.com
e75a62aeae Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-15 07:36:33 -08:00
serg@serg.mylan
d5294e86bf Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-02-15 14:04:56 +01:00
msvensson@neptunus.(none)
56ef2e28e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 12:02:20 +01:00
jimw@mysql.com
d70c47b2a9 Merge mysql.com:/home/jimw/my/mysql-4.1-16389 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2006-02-14 18:12:30 -08:00
serg@serg.mylan
48b8e842ca Automerge 2006-02-15 00:01:46 +01:00
serg@serg.mylan
63cfd11859 dbug changes: 
1. dbug state is now local to a thread
2. new macros: DBUG_EXPLAIN, DBUG_EXPLAIN_INITIAL,
   DBUG_SET, DBUG_SET_INITIAL, DBUG_EVALUATE, DBUG_EVALUATE_IF
3. macros are do{}while(0) wrapped
4. incremental modifications to the dbug state (e.g. "+d,info:-t")
5. dbug code cleanup, style fixes
6. _db_on_ and DEBUGGER_ON/OFF removed
7. rest of MySQL code fixed because of 3 (missing ;) and 6
8. dbug manual updated
9. server variable @@debug (global and local) to control dbug from SQL!
a. -#T to print timestamps in the log
 2006-02-14 22:36:11 +01:00
aelkin@mysql.com
7397bc8fb4 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
 2006-02-14 20:48:34 +02:00
paul@snake-hub.snake.net
8298c79b6b Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-14 12:18:23 -06:00
paul@snake-hub.snake.net
bf683f51bc mysqlimport.c: 
Revise option description for --help message.
 2006-02-14 12:11:26 -06:00
msvensson@neptunus.(none)
fed5a68ea8 Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 15:34:30 +01:00
brian@zim.tangent.org
abf4f17761 Fixed comments bug#17239 2006-02-13 19:09:10 -08:00
kent@mysql.com
d60b10d565 mysqlimport.c: 
Removed C++ comment, changed types for pthread_create() usage
 2006-02-13 20:21:15 +01:00
brian@zim.tangent.org
f76c047305 Made mysqlimport link against mysys so that it could make use of the safe mutex functions. 2006-02-13 04:48:14 -08:00
brian@zim.tangent.org
a33a7e274f Cleanup's from Kostja's review. Plus I added a bit more documentation to the --lock-tables option. If selected it disables threads (since you can't quite do it with threads). 2006-02-13 04:04:53 -08:00
msvensson@neptunus.(none)
e486d81a52 Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-13 10:56:45 +01:00
brian@zim.tangent.org
7f3d7af7ae Adding thread support for mysqlimport. You can now specify a number of threads to use and it will thread the loading of the database. Anyone who has had to go through the pain of loading the database will immediatly get the reason for this. 2006-02-13 00:45:59 -08:00
msvensson@neptunus.(none)
5000951ab4 Bug#14013 mysql_stmt_store_result() bombs if a cursor is open 
- Add code to 'mysql_stmt_store_result' to allow it to be called on 
   a prepared statement with open server side cursor.
 - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
 2006-02-10 14:50:29 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 
This changeset is assumed to stay in 4.1.
 2006-02-10 15:12:27 +02:00
knielsen@mysql.com
abcf6ccebb Changes to make testsuite run in CMake build tree. 2006-02-10 13:29:01 +01:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables 
- Evaluate all variables in the text before printing it to result file
 2006-02-10 12:11:16 +01:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its 
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
 2006-02-09 16:23:09 +02:00
msvensson@neptunus.(none)
bbff8ade1a Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
 2006-02-07 18:17:57 +01:00
konstantin@mysql.com
e3663e7659 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 20:54:07 +03:00
tomas@poseidon.ndb.mysql.com
ce8308a503 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql51
 2006-02-02 16:19:49 +01:00
konstantin@mysql.com
92b41ba92a Merge mysql.com:/home/kostja/mysql/tmp_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 16:57:34 +03:00
msvensson@neptunus.(none)
c9b7317ff9 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 11:47:01 +01:00
msvensson@neptunus.(none)
5e31bff387 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result
 2006-02-02 11:46:57 +01:00
msvensson@neptunus.(none)
01ddf96930 Convert exponent results for MYSQL_TYPE_FLOAT on Windows 2006-02-02 11:45:37 +01:00
tomas@poseidon.ndb.mysql.com
92ffe8cf0d Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 10:56:04 +01:00
konstantin@mysql.com
065f8066d5 Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-02 12:03:35 +03:00
tomas@poseidon.ndb.mysql.com
8c024b9072 Bug #16753 DD: mysqldump does not support Cluster Disk Data backups 2006-02-02 00:52:58 +01:00