summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-04-198-37/+347
|\ | | | | | | into mysql.com:/home/bk/b17400-mysql-5.1-new
| * Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):mats@mysql.com2006-04-195-23/+25
| | | | | | | | This is not a bug. Enabling disabled test and adding comment.
| * Merge mysql.com:/home/bkroot/mysql-5.1-newmats@mysql.com2006-04-194-14/+322
| |\ | | | | | | | | | into mysql.com:/home/bk/b17400-mysql-5.1-new
| | * Bug#17400 (Cluster Replication: Delete and update of row w/o PK fails):mats@mysql.com2006-04-124-14/+323
| | | | | | | | | | | | Restarting scan after call to delete_row().
* | | Fixed timeing problem by ignoring failures and results from first select ↵monty@mysql.com2006-04-194-1/+10
| | | | | | | | | | | | after table definition change
* | | Only run test with row based loggingmonty@mysql.com2006-04-193-0/+3
| | |
* | | Fix wrong auto mergemonty@mysql.com2006-04-191-8/+0
| | |
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-04-196-38/+68
|\ \ \ | |/ / |/| | | | | into mysql.com:/home/my/mysql-5.1
| * | Fixed compilation errormonty@mysql.com2006-04-191-1/+10
| | | | | | | | | | | | ensure check_if_legal_table_name is also defined on unix
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-04-195-37/+58
| |\ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * | Fix compilation failure when compiling with BUILD/compile-pentium-debug-maxmonty@mysql.com2006-04-194-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | (Problem with embedded server and ndb) Fix broken mysql-test-run.sh Removed memory leak in ha_example.cc
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-04-19595-90642/+85
| | |\ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newmonty@mysql.com2006-04-181-9/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| | | * | | Remove warnings about missing DBUG_RETURN'smonty@mysql.com2006-04-181-9/+15
| | | | | |
* | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-191-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new
| * | | | | | my_access.c:bar@mysql.com2006-04-191-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | After merge fix.
* | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug18881stewart@mysql.com2006-04-191-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
| * | | | | | BUG#18881 valgrind: kernel memory leak in vm/Emulator.cppstewart@mysql.com2006-04-071-0/+1
| | | | | | |
* | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug15530stewart@mysql.com2006-04-191-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.1/merge
| * | | | | | BUG#15530: Cluster start up "show" shows all data nodes as master during startstewart@mysql.com2006-04-071-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | along with the fix for 18843, this should fix the bug.
* | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-196-7/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
| * \ \ \ \ \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-196-7/+142
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b17870v1
| | * | | | | bug#17870 Table names conflict with Windows device namesbar@mysql.com2006-04-116-8/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was impossible to create some table names on Windows (e.g. LPT1, AUX, COM1, etc). Fixed to pad dangerous names with thee "at" signs (e.g. LPT1@@@, AUX@@@, COM1@@@, and so on).
* | | | | | | item_xmlfunc.cc:bar@mysql.com2006-04-191-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After review minor fixes for bug#16319 Thanks to Gluh for suggestions.
* | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-newbar@mysql.com2006-04-19682-91511/+831
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-new.b16319
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-ndb-cleanupjimw@mysql.com2006-04-18581-90603/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| | * | | | | | Nuke all of the old_* directories in the ndb tree.jimw@mysql.com2006-04-18581-90603/+0
| | | | | | | |
| * | | | | | | Mergekent@mysql.com2006-04-1814-39/+85
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Mergekent@mysql.com2006-04-1813-30/+83
| | |\ \ \ \ \ \
| | | * | | | | | configure.in:kent@mysql.com2006-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stepped up version to 5.0.20a
| | | * | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.0-releasemsvensson@neptunus.(none)2006-04-1813-30/+83
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
| | | | * | | | | | Bug#18815 libmysql using yassl can't be linked with c programmsvensson@neptunus.(none)2006-04-1813-30/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Apply patch to remove dependency on C++ libs when linking "libmysql" from c
| | * | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2006-04-181-9/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
| | | * | | | | | | mysql.cc:serg@mysql.com2006-04-181-9/+2
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | revert bug#16855 "fix" per Monty's request
| | * | | | | | | Child segfault when tring to call "mysql_error(NULL)", fixed by notbpontz@shasta.mysql.com2006-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assigning "mysql" variable from return value of mysql_real_connect.
| * | | | | | | | Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-newpetr@mysql.com2006-04-181-11/+27
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
| | * | | | | | | | fix for Bug#18848 "SIGHUP crashes the server" (v2)petr@mysql.com2006-04-181-11/+27
| | | | | | | | | |
| * | | | | | | | | BUG#19158 Fixing rpl_row_log_innodb test for pushbuild.elliot@mysql.com2006-04-181-0/+5
| |/ / / / / / / /
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newcmiller@zippy.(none)2006-04-172-3/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new
| | * | | | | | | | Fixing a merge from a few days ago.cmiller@zippy.(none)2006-04-172-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without a flush this test is nondeterministic for "row" binlog-format.
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-newjimw@mysql.com2006-04-1712-106/+209
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| | * \ \ \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-newbrian@zim.(none)2006-04-177-92/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/dep-5.1
| | | * | | | | | | | UNIXWARE removalbrian@zim.(none)2006-04-177-92/+2
| | | | | | | | | | |
| | * | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-newpekka@mysql.com2006-04-181-14/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51
| | | * | | | | | | | BUG#18752mikael@c-4909e253.1238-1-64736c10.cust.bredbandsbolaget.se2006-04-171-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed forgotten merge fix
| | * | | | | | | | | ndb - bug#16796pekka@mysql.com2006-04-174-0/+203
| | |/ / / / / / / /
| * | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.1-19059jimw@mysql.com2006-04-173-4/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.1-clean
| | * | | | | | | | Bug #19059: Failure to get version information when running from source treejimw@mysql.com2006-04-173-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the way that instance manager finds the version number of instances, so that it works properly when the executable name isn't the same as what the instance-manager launched, such as when wrapping a libtool-wrapped executable from the source tree. This removes the 'Ver ' reported in the version column output by 'SHOW INSTANCE STATUS ...', but the format of this column is not documented (and is pretty free-form to begin with).
| * | | | | | | | | Found one piece I missed when I removed HAVE_mit (just broke on windows and ↵brian@zim.(none)2006-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't have windows locally). This I believe should fix it.
| * | | | | | | | | Fixed a few pieces around support for data directory. brian@zim.(none)2006-04-164-20/+84
| | | | | | | | | |
View Lorry Controller Status