| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | After merge fixes | monty@mysql.com | 2006-05-04 | 1 | -8/+11 |
| | | | | | | | Remove compiler warnings Fix some broken tests Workaround for syncronization bug in NDB (Bug #16445) | ||||
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852 | jimw@mysql.com | 2006-05-03 | 1 | -6/+52 |
| |\ | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean | ||||
| | * | In the command-line client, try to abort the current query by issuing a | jimw@mysql.com | 2005-10-05 | 1 | -6/+53 |
| | | | | | | | | | | | | | KILL command on a second connection when handling Ctrl-C. (WL#2852) Based on patch by Harrison Fisk. | ||||
| * | | Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 | dlenev@mysql.com | 2006-05-02 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | into mysql.com:/home/dlenev/mysql-5.1-merges | ||||
| | * \ | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 | holyfoot@mysql.com | 2006-05-02 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.clean | ||||
| | | * | | Win build fix | holyfoot@deer.(none) | 2006-05-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-clean | jimw@mysql.com | 2006-05-01 | 2 | -6/+9 |
| |\ \ \ \ | |/ / / | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean | ||||
| | * | | | Merge bk-internal:/home/bk/mysql-5.0 | jimw@mysql.com | 2006-05-01 | 1 | -2/+4 |
| | |\ \ \ | | |/ / | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean | ||||
| | | * | | Fix for Win build | holyfoot@deer.(none) | 2006-05-01 | 1 | -2/+4 |
| | | | | | |||||
| | * | | | Merge mysql.com:/home/jimw/my/mysql-5.0-18312 | jimw@mysql.com | 2006-05-01 | 1 | -4/+5 |
| | |\ \ \ | | |/ / | |/| | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean | ||||
| | | * | | Bug #18312: mysqltest: --sleep=0 doesn't disable sleep | jimw@mysql.com | 2006-04-21 | 1 | -4/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow --sleep=0 to be specified to mysqltest, so that sleep calls can be disabled. Original patch from Paul DuBois. | ||||
| | * | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0 | holyfoot@mysql.com | 2006-04-28 | 2 | -1/+405 |
| | |\ \ \ | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/mysql-5.0.upgd | ||||
| | | * | | | bug #18115 (mysql_upgrade on Windows) | holyfoot@deer.(none) | 2006-04-28 | 2 | -1/+405 |
| | | | | | | | | | | | | | | | | | | | | | pushed in 5.0 | ||||
| | * | | | | Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 | msvensson@shellback.(none) | 2006-04-27 | 1 | -3/+2 |
| | |\ \ \ \ | | |/ / / | |/| | | | | | | | | into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint | ||||
| | | * | | | Backport fix for mysql client not using SSl library directly | msvensson@neptunus.(none) | 2006-04-22 | 1 | -3/+2 |
| | | |/ / | | | | | | | | | | | | | | | | | - Add function mysql_get_ssl_cipher - Use function mysql_get_ssl_cipher from mysql | ||||
| | * | | | Merge | kent@mysql.com | 2006-04-21 | 1 | -9/+2 |
| | |\ \ \ | | |/ / | |/| | | |||||
| * | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-18495 | jimw@mysql.com | 2006-05-01 | 1 | -1/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean | ||||
| | * | | | | Bug #18495: mysqltest does not use the correct error number | jimw@mysql.com | 2006-04-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | mysqlslap.c: | paul@polar.kitebird.com | 2006-04-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | Avoid embedding a bunch of whitespace in --help message. | ||||
| * | | | | | Corrected include path to work under Windows | mskold@mysql.com | 2006-04-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new | mskold@mysql.com | 2006-04-25 | 1 | -1/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new | ||||
| | * | | | | | Fix for Bug #17840 mysqldump should not dump tables in database cluster, ↵ | mskold@mysql.com | 2006-04-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | reuse existing define | ||||
| | * | | | | | Fix for Bug #17840 mysqldump should not dump tables in database cluster, ↵ | mskold@mysql.com | 2006-04-24 | 1 | -1/+3 |
| | |/ / / / | | | | | | | | | | | | | | | | skip cluster internal database | ||||
| * | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/jimw_merge | cmiller@zippy.(none) | 2006-04-24 | 1 | -8/+10 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new | ||||
| | * | | | Only expand the empty string to the letters "NULL" if the column | cmiller@zippy.(none) | 2006-04-16 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge | kent@mysql.com | 2006-04-18 | 1 | -9/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release | kent@mysql.com | 2006-04-18 | 1 | -9/+2 |
| | |\ \ \ \ | | | |/ / | | |/| | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release | ||||
| | | * | | | mysql.cc: | serg@mysql.com | 2006-04-18 | 1 | -9/+2 |
| | | | | | | | | | | | | | | | | | | | | | revert bug#16855 "fix" per Monty's request | ||||
| | * | | | | Child segfault when tring to call "mysql_error(NULL)", fixed by not | bpontz@shasta.mysql.com | 2006-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | assigning "mysql" variable from return value of mysql_real_connect. | ||||
| * | | | | | Final patch to remove the last of the OS2 support. | brian@zim.(none) | 2006-04-15 | 2 | -43/+9 |
| | | | | | | |||||
| * | | | | | Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge | cmiller@zippy.(none) | 2006-04-14 | 1 | -29/+50 |
| |\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new | ||||
| | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | cmiller@zippy.(none) | 2006-04-11 | 1 | -29/+50 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.0__ready | ||||
| | | * | | | | Bug#18265: mysql client: No longer right-justifies numeric columns | cmiller@zippy.(none) | 2006-04-04 | 1 | -29/+50 |
| | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Also fixes a new bug for which "NULL" wasn't printed (because the data it represents has length zero). (Discovered my Paul DuBois.) | ||||
| * | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new | tomas@poseidon.ndb.mysql.com | 2006-04-13 | 1 | -12/+18 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new | ||||
| | * | | | | | increase save_master_pos timeout to 30 seconds for higher test predictability | tomas@poseidon.ndb.mysql.com | 2006-04-12 | 1 | -12/+18 |
| | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | better replicaiton test cleanup to ensure better test predictability + some ndb test cleanup | ||||
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-refactor | jimw@mysql.com | 2006-04-12 | 3 | -338/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean | ||||
| | * | | | | | Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new, | jimw@mysql.com | 2006-04-11 | 3 | -338/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
| * | | | | | | Protect from empty --query argument | msvensson@neptunus.(none) | 2006-04-11 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Bug#18012 mysqlslap fails if querystring starts with delimiter | msvensson@neptunus.(none) | 2006-04-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Terminate loop not only when the limit is met, but alse when there is no more stmts | ||||
| * | | | | | | Fix syntax error | msvensson@neptunus.(none) | 2006-04-11 | 1 | -2/+1 |
| | | | | | | | |||||
| * | | | | | | Bug#17478 mysqlslap not issuing any queries | msvensson@neptunus.(none) | 2006-04-11 | 1 | -75/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add more printouts it depending on verbose level - New common function 'run_query' to be used when executing a query | ||||
| * | | | | | | Don't use the MYSQL* returned from mysql_real_connect to overwrite the ↵ | msvensson@neptunus.(none) | 2006-04-11 | 1 | -5/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | already initalised mysql variable | ||||
| * | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 | msvensson@neptunus.(none) | 2006-04-11 | 1 | -0/+30 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 | ||||
| | * | | | | Remove #if 0 | msvensson@neptunus.(none) | 2006-04-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Incorporate a patch to write a timestamp for every new line of the test that ↵ | msvensson@neptunus.(none) | 2006-04-05 | 1 | -0/+30 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Merge bk-internal:/home/bk/mysql-5.1-new | msvensson@neptunus.(none) | 2006-04-11 | 1 | -3/+2 |
| |\ \ \ \ | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1 | ||||
| | * | | | | Update implementation of new function 'mysql_get_ssl_cipher' after review | msvensson@neptunus.(none) | 2006-04-10 | 1 | -2/+2 |
| | | | | | | |||||
| | * | | | | Add new function mysql_get_ssl_cipher to libmysl and use it from client to ↵ | msvensson@neptunus.(none) | 2006-04-07 | 1 | -3/+2 |
| | | |/ / | |/| | | | | | | | | | | avoid dependency on SSL libs from mysql client. | ||||
| * | | | | mysql_upgrade.c: | kent@mysql.com | 2006-04-11 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | No declarations after first expression in block | ||||
| * | | | | WL#2645 (mysql_upgrade tool) | holyfoot@deer.(none) | 2006-04-10 | 1 | -77/+269 |
| | | | | | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |