summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* After merge fixesmonty@mysql.com2004-10-203-6/+6
|
* Merge with 4.0monty@mysql.com2004-10-2017-31/+255
|\
| * Fix test case for innodb-lockmonty@mysql.com2004-10-206-32/+62
| |
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.0monty@mysql.com2004-10-208-25/+91
| |\ | | | | | | | | | into mysql.com:/home/my/mysql-4.0
| | * Code cleanups (done during review of new code)monty@mysql.com2004-10-208-25/+91
| | | | | | | | | | | | | | | | | | Rename innodb_table_locks_old_behavior -> innodb_table_locks Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20 (This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
| * | trx0rec.c:heikki@hundin.mysql.fi2004-10-191-1/+1
| | | | | | | | | | | | test
| * | libmysql.c:paul@ice.snake.net2004-10-191-0/+3
| |/ | | | | | | Add note to mysql_hex_string() comment.
| * libmysql.c:bar@mysql.com2004-10-191-0/+33
| | | | | | | | New function mysql_hex_string()
| * Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0dellis@goetia.(none)2004-10-172-1/+2
| |\ | | | | | | | | | into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
| | * mysqld.cc:dellis@goetia.(none)2004-10-171-1/+1
| | | | | | | | | | | | BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
| | * mysqld.cc:dellis@goetia.(none)2004-10-032-1/+2
| | | | | | | | | | | | BUG #5731 Restrict key_buffer_size to 4GB on 64 bit platforms
| * | Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0hartmut@mysql.com2004-10-161-2/+2
| |\ \ | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/4.0
| | * | the $^ directive is a GNU make extension and not really needed herehartmut@mysql.com2004-10-151-2/+2
| | | | | | | | | | | | | | | | so lets get rid of it (Bug #6112)
| * | | texi2html:paul@ice.snake.net2004-10-151-1/+1
| | | | | | | | | | | | | | | | Change parsing of @image argument.
| * | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0marko@hundin.mysql.fi2004-10-152-3/+17
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/k/mysql-4.0
| | * \ \ Merge mysql.com:/home/mydev/mysql-4.0ingo@mysql.com2004-10-142-3/+17
| | |\ \ \ | | | |/ / | | |/| | | | | | | into mysql.com:/home/mydev/mysql-4.0-bug5625
| | | * | BUG#5625 - MyISAM Index corruption on ALTER TABLE x ENABLE KEYS due to full ↵ingo@mysql.com2004-10-142-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tmpdir. Added a try to a normal repair() if repair_by_sort() failed. This was not done with ENABLE KEYS and OPTIMIZE TABLE. Fixed error code handling in mysql_alter_table().
| * | | | Added startup option and settable session variablemarko@hundin.mysql.fi2004-10-134-2/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | innodb_table_locks_old_behavior: do not acquire an InnoDB table lock for LOCK TABLES, as in mysql-4.0.18 and earlier.
| * | | ha_innodb.cc:heikki@hundin.mysql.fi2004-10-121-1/+1
| | | | | | | | | | | | | | | | Change error code to HA_ERR_ROW_IS_REFERENCED if we cannot DROP a parent table referenced by a FOREIGN KEY constraint; this error number is less misleading than the previous value HA_ERR_CANNOT_ADD_FOREIGN, but misleading still; we should introduce to 5.0 a proper MySQL error code
| * | | Merge heikki@build.mysql.com:/home/bk/mysql-4.0heikki@hundin.mysql.fi2004-10-124-10/+68
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.0
| | * \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0sergefp@mysql.com2004-10-111-8/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
| | | * | | Fix for BUG#4785 part two:sergefp@mysql.com2004-09-291-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If at least one of indexes is disabled, use data file size as an estimate for key file size. * Added handling for joined tables.
| | * | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2004-10-113-2/+38
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | * | | | Fix for BUG#5949 "error code 1223 in binlog when using innobackup":guilhem@mysql.com2004-10-113-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT, it was accepted but my_error() was called and so, while client got no error, error was logged in binlog. We now don't call my_error() in this case; we assume the connection know what it does. This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
| * | | | | | trx0rec.c:heikki@hundin.mysql.fi2004-10-091-12/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | Fix bug #5960: if one updated a column so that its size changed, or updated it to an externally stored (TEXT or BLOB) value, then ANOTHER externally stored column would show up as 512 bytes of good data + 20 bytes of garbage in a consistent read that fetched the old version of the row
| * | | | | Using MySQL 4.0 with privilege tables from 5.0 caused a crash.monty@mysql.com2004-10-081-20/+36
| | | | | | | | | | | | | | | | | | | | | | | | (Fixed this by backporting some logic from 4.1)
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-204-17/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-084-17/+30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1
| | * \ \ \ \ \ Mergemonty@mysql.com2004-10-085-17/+31
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fixed Bug#5575, mysqlhotcopy is broken when using --noindicesjani@a80-186-41-201.elisa-laajakaista.fi2004-10-072-4/+5
| | | | | | | |
| | | * | | | | InnoDB: tolerate system clock glitches a little bettermarko@hundin.mysql.fi2004-10-073-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the error monitor thread. (Bug #5898)
* | | | | | | | NDB dbtux compile fix for sol9x86pekka@mysql.com2004-10-203-30/+62
| | | | | | | |
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-10-2043-261/+373
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1
| * | | | | | | | Review of all code pushed since last reviewmonty@mishka.local2004-10-2028-134/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2004-10-1417-129/+183
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-4.1
| | * | | | | | | | true,false -> TRUE, FALSEmonty@mishka.local2004-10-1417-129/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple fixes/optimization of things discovered during review of new pushed code
* | | | | | | | | | fix for platforms that have lower_case_table_names == 2tomas@poseidon.ndb.mysql.com2004-10-191-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-191-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbtomas@poseidon.ndb.mysql.com2004-10-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
| | * | | | | | | | | | bumped up ndb version to 3.5.3tomas@poseidon.ndb.mysql.com2004-10-181-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-192-24/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-192-24/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-182-24/+27
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-182-24/+27
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | * \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-182-24/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | * | | | | | | | | | | remove possibility of connectstring error like "hostname=..."tomas@poseidon.ndb.mysql.com2004-10-182-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + some fixed string length cleanup + fixed a better error printout
* | | | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-1913-127/+293
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
| * | | | | | | | | | | | | | | os0file.c:heikki@hundin.mysql.fi2004-10-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB: print info about how many bytes we were able to read if a file read is not able to read as many bytes as we requested
| * | | | | | | | | | | | | | | Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1marko@hundin.mysql.fi2004-10-194-110/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/marko/j/mysql-4.1
| | * | | | | | | | | | | | | | | ha_innodb.cc:marko@hundin.mysql.fi2004-10-181-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace a tolower() loop with innobase_casedn_str()
View Lorry Controller Status