summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1paul@ice.snake.net2003-11-2038-211/+262
|\ | | | | | | into ice.snake.net:/Users/paul/mysql-4.1
| * Update VC++ filesmonty@mysql.com2003-11-218-34/+42
| | | | | | | | | | Portability fixes After merge fixes
| * Merge with 4.0 to revert patch for BIGINT assignment to doublemonty@mysql.com2003-11-211-11/+5
| |\
| | * Revert patch for bigint handling in double context as it broke normal bigint ↵monty@mysql.com2003-11-212-13/+0
| | | | | | | | | | | | | | | | | | | | | handling The right way to fix this is to change the Field::store(longlong) method to be Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
| * | Merge with 4.0 to get:monty@mysql.com2003-11-204-3/+73
| |\ \ | | |/ | | | | | | | | | Fix for storing negative values in decimal fields Fix for FLUSH TABLE with HANDLER
| | * added comments to simple_order, simple_group, no_order, skip_sort_orderkonstantin@mysql.com2003-11-201-2/+15
| | |
| | * Merge bk-internal:/home/bk/mysql-4.0/serg@serg.mylan2003-11-192-8/+54
| | |\ | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.0
| | | * Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0guilhem@mysql.com2003-11-181-4/+45
| | | |\ | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-4.0
| | | | * Fix for BUG#1870guilhem@mysql.com2003-11-181-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "CHANGE MASTER makes SQL thread restart from coordinates of I/O thread". So, in CHANGE MASTER: when it seems reasonable that the user did not want to discontinue its replication (i.e. when he is not specifying host or port or master_log_file or master_log_pos; this will be documented), set the coordinates of the I/O thread to those of the SQL thread. This way, the SQL thread will see no discontinuity in the relay log (i.e. will skip no events), because the I/O thread will fill the brand new relay log with the events which are just after the position where the SQL thread had stopped (before CHANGE MASTER was issued). And a new test for this bug.
| | * | | Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in ↵serg@serg.mylan2003-11-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test suite) more user variable tests
| | * | | Item_uint::save_in_field() added to take into account bigint->decimal caseserg@serg.mylan2003-11-162-1/+15
| | | | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2003-11-2036-177/+156
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/my/mysql-4.1
| | * | | | Merge key cache structures to onemonty@mysql.com2003-11-2036-177/+156
| | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings (IRIX C compiler and VC++)
* | | | | | Use same style for SHOW MASTER STATUS fields aspaul@ice.snake.net2003-11-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | for SHOW SLAVE STATUS.
* | | | | | Write slave status field names using consistent style.paul@ice.snake.net2003-11-201-16/+16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | (Initial caps for each word.) For example, instead of writing Until_condition, Until_Log_File, and Until_log_pos, write Until_Condition, Until_Log_File, and Until_Log_pos.
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-201-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
| * | | | fixed memory allocationbell@sanja.is.com.ua2003-11-201-4/+4
| | | | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-11-201-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1
| * | | | Portability fixes (AIX43)monty@mashka.mysql.fi2003-11-201-0/+3
| | | | | | | | | | | | | | | | | | | | Add missing file to VC++ project
* | | | | fixed memory allocation problem in IN with const rowsbell@sanja.is.com.ua2003-11-191-1/+5
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-11-192-33/+48
|\ \ \ \ | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1
| * | | | Changed mysql_next_result() to return int instead of boolmonty@mashka.mysql.fi2003-11-192-33/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Changed ~Item_func_in() to call cleanup() (to fix memory leak) Fixed test_multi_statements() test in client_test
* | | | | cp850.xml:bar@bar.mysql.r18.ru2003-11-191-25/+25
| | | | | | | | | | | | | | | | | | | | There were errors in cp850: in unicode, ctype and sort arrays
* | | | | - added a missing comma in sql_yacc.yy (maybe a merge error?)lenz@kallisto.local2003-11-181-0/+1
| | | | |
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-182-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
| * \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-181-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
| * | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-182-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
| | * | | | | IGNORE option was added for DELETE statement (WL#1334)bell@sanja.is.com.ua2003-11-172-1/+5
| | | | | | |
* | | | | | | changed name of bit on more descriptive (after rewie change)bell@sanja.is.com.ua2003-11-185-14/+14
| | | | | | |
* | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-181-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
| * | | | | | Merge with 4.0 treemonty@mashka.mysql.fi2003-11-181-2/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Merge with 3.23 (only comment changes)monty@mashka.mysql.fi2003-11-171-4/+9
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Safety fix for alarms on windows.monty@mashka.mysql.fi2003-11-171-6/+11
| | | | | |
| | | * | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23guilhem@mysql.com2003-10-181-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-3.23
| | | | * | | backport of a fix made in 4.0 to make replication work in 64-bit binaries.guilhem@mysql.com2003-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 4.0 changeset was: ChangeSet@1.1579.3.1, 2003-09-26 23:43:22+02:00, guilhem@mysql.com Fix for 64-bit machines. I am almost sure this is the cause for BUG#1381 [Opn]: Bug in replication on HP-UX 64 bit binaries? BUG#1256 [CRp]: Replication slave fails to connect to master in 64-bit version (Solaris) The reason why I think it's wrong is that the normal client code has uint32 ip_addr. (of course on 32-bit machines it does not matter, but on 64-bit it does).
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-3.23monty@mishka.mysql.fi2003-10-081-8/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mishka.mysql.fi:/home/my/mysql-3.23
| | | | * | | | Fixed memory leak in send_filemonty@mishka.mysql.fi2003-10-081-8/+1
| | | | |/ / /
| | | * | | | fixed processing of COM_BINLOG_DUMP to use in mysqlbinlogvva@eagle.mysql.r18.ru2003-09-292-2/+9
| | | |/ / /
| | | * | | Quick backport of the following bugfix from MySQL 4.0.14.guilhem@mysql.com2003-09-122-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0, but here in 3.23 we don't want to add a new error code so we just use ER_EMPTY_QUERY. Bug was: "If a query was ignored on the slave (because of @code{replicate-ignore-table} and other similar rules), the slave still checked if the query got the same error code (0, no error) as on the master. So if the master had an error on the query (for example, ``Duplicate entry'' in a multiple-row insert), then the slave stopped and warned that the error codes didn't match. (Bug #797)"
| | * | | | make error message more detailedserg@serg.mylan2003-11-121-2/+2
| | | | | |
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2003-11-1810-60/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
| * | | | | fixed using 'uncachable' tag and RAND_TABLE_BIT settingbell@sanja.is.com.ua2003-11-1710-60/+62
| | |_|/ / | |/| | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mashka.mysql.fi2003-11-181-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mashka.mysql.fi:/home/my/mysql-4.1
| * | | | | Fix for bug #1820sergefp@mysql.com2003-11-181-1/+2
| | | | | |
* | | | | | Delete duplicate error message namesmonty@mashka.mysql.fi2003-11-1826-86/+17
| | | | | |
* | | | | | mergemonty@mashka.mysql.fi2003-11-1849-686/+599
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTSmonty@mashka.mysql.fi2003-11-1849-686/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables. ALTER TABLE table_name ... CHARACTER SET ... now changes all char/varchar/text columns to the given character set (One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set) Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib) New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones) Removed compiler warnings Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
* | | | | | word substitution in error messages removed - can create problems for i18nserg@serg.mylan2003-11-1826-156/+133
| | | | | |
* | | | | | Merge bk-internal:/home/bk/mysql-4.1/serg@serg.mylan2003-11-176-3/+45
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| * | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2003-11-175-1/+42
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.lastday