Commit graph

4701 commits

Author SHA1 Message Date
bar@bar.mysql.r18.ru
9dd576c3f8 "make clean" problem fix 2002-08-13 19:13:23 +05:00
serg@sergbook.mysql.com
0a077d74bd Merge work:/home/bk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql
2002-08-13 15:37:11 +02:00
serg@sergbook.mysql.com
e8bf5ef8d4 Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-13 15:28:14 +02:00
serg@sergbook.mysql.com
4dfe0a77c9 "ungone" include/global.h, though deleted, otherwise bk cannot pull from 3.23 (where this fiule is legally present) 2002-08-13 15:26:57 +02:00
serg@sergbook.mysql.com
9a52c01ede disable "dvi" target in TeX is not installed 2002-08-13 15:18:11 +02:00
paul@teton.kitebird.com
f0517bde21 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-08-12 22:48:04 -05:00
arjen@fred.bitbike.com
f43ac1046e Remove 3.23.53 news section until 3.23.52 is tagged. 2002-08-13 10:07:36 +10:00
monty@hundin.mysql.fi
c369d5296f merge (+ multi-table fix) 2002-08-13 02:38:48 +03:00
monty@hundin.mysql.fi
c531b43272 merge with 3.23.52 2002-08-13 02:33:25 +03:00
monty@hundin.mysql.fi
ae1ec6e16a Changed SQL variable delay_key_write to an enum
able delay_key_write as default (as it was in 4.0.2)
2002-08-13 02:18:39 +03:00
heikki@hundin.mysql.fi
a101405b03 os0thread.h, os0thread.c:
Fix a critical portability bug introduced in the Windows version
2002-08-13 01:22:27 +03:00
serg@sergbook.mysql.com
cf45c14347 Merge work:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
2002-08-12 20:38:32 +02:00
paul@teton.kitebird.com
c17616d4cf manual.texi small change note mods 2002-08-12 12:45:58 -05:00
paul@teton.kitebird.com
7f15737b84 manual.texi addition to mysql_real_escape_string() description. 2002-08-12 11:20:21 -05:00
paul@teton.kitebird.com
830076ccd0 Merge 2002-08-12 10:01:23 -05:00
heikki@hundin.mysql.fi
49f658281f ha_innobase.h, ha_innobase.cc:
Put a note that the InnoDB HANDLER code is not used until 4.1, and appears for documentational purposes only
2002-08-12 17:31:57 +03:00
serg@sergbook.mysql.com
7cbe8b369a put InnoDB HANDLER patch back again :)) 2002-08-12 16:18:37 +02:00
serg@sergbook.mysql.com
35255fa72b "ungone" files, that were some time ago erroneously (?) marked as "gone"
now it should be safe to do 'bk rmgone' to make the tree ~25M less :)
2002-08-12 16:06:50 +02:00
serg@sergbook.mysql.com
efe85086c6 undo InnoDB HANDLER patch as it should not go into 3.23 tree 2002-08-12 15:11:58 +02:00
arjen@fred.bitbike.com
ce61cb54c8 Update docs because of stable tree revert. 2002-08-12 18:24:28 +10:00
heikki@hundin.mysql.fi
389d730d03 ha_innobase.cc:
Cleanup of latest rewrite of innobase_mysql_print_thd; from now on changing this code is forbidden unless a written permission is received from Heikki 3 days in advance
2002-08-12 08:29:15 +03:00
arjen@fred.bitbike.com
4861939801 Various little docs fixups. 2002-08-12 14:55:07 +10:00
paul@teton.kitebird.com
509305c231 manual.texi add change note for QUOTE().
manual.texi	Add entry for QUOTE() function.
2002-08-11 23:32:28 -05:00
monty@hundin.mysql.fi
454339b29c Fixes after last merge 2002-08-12 07:02:08 +03:00
monty@hundin.mysql.fi
4dfe327a06 Fix after merge 2002-08-12 06:49:28 +03:00
monty@hundin.mysql.fi
3ef9d44edc merge with 3.23.52 2002-08-12 04:04:43 +03:00
monty@hundin.mysql.fi
d825808a72 merge 2002-08-12 03:40:36 +03:00
monty@hundin.mysql.fi
c99c1fd384 Changed IF(expr, column, NULL) to take type from column
Fixed some windows portability problems and removed some compiler warnings
 Cleaned up QUOTE() function and fixed bug in \0 and \Z handling.
2002-08-12 03:33:46 +03:00
monty@hundin.mysql.fi
b779b63862 Fixed problem with BIGINT and shutdown on AIX
Moved IF(test,column,NULL) code to 4.0
Changed mysys_priv.h to include my_pthread.h or my_no_pthread.h.
Removed some CR's in os2 files.
2002-08-12 03:28:02 +03:00
heikki@hundin.mysql.fi
1239863b64 trx0trx.h, trx0trx.c, ha_innobase.cc, ha_innobase.h:
Add tentative code which can be used in HANDLER implementation for InnoDB
2002-08-12 00:17:39 +03:00
heikki@hundin.mysql.fi
bee3f072e4 ha_innobase.cc, ut0ut.c, univ.i, ut0ut.h:
Redefine sprintf as ut_sprintf inside InnoDB code; some old Unixes may have a pointer as the return type of sprintf
lock0lock.c:
  Add safety against buffer overruns in latest deadlock info
srv0srv.c:
  Add safety against buffer overruns in SHOW INNODB STATUS
os0thread.h, os0thread.c:
  Fix a portability bug introduced in Windows when we changed os_thread_id_t to be the same as os_thread_t
2002-08-11 18:49:47 +03:00
Sinisa@sinisa.nasamreza.org
0005f28b4e A small fix for last_insert_id with multi-row inserts 2002-08-10 22:08:00 +03:00
paul@teton.kitebird.com
053211f6d3 Merge paul@work.mysql.com:/home/bk/mysql-4.0
into teton.kitebird.com:/home/paul/mysql-4.0
2002-08-10 13:06:11 -05:00
Sinisa@sinisa.nasamreza.org
eecb743ed9 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2002-08-10 16:40:20 +03:00
Sinisa@sinisa.nasamreza.org
2ff9032244 removal of lines that make problems with texi 2002-08-10 16:38:30 +03:00
ram@ram.(none)
deaec7b0e0 QUOTE() code cleanup 2002-08-10 15:13:05 +05:00
lenz@mysql.com
50958d6237 Moved a News entry from the 3.23.53 section into the 3.23.52 section
and removed the 3.23.53 News section for now until 3.23.52 is officially
tagged.
2002-08-10 02:08:41 +02:00
lenz@mysql.com
7d33814c1b After discussing it with Monty by phone once more:
- Only define alloca as a compiler builtin, if we use GCC and there
   is no alloca.h installed
2002-08-10 01:47:51 +02:00
Sinisa@sinisa.nasamreza.org
a80d185e40 A change in IF behaviour that several users asked for ... 2002-08-09 23:14:02 +03:00
paul@teton.kitebird.com
34fca60c38 manual.texi BDB log files have 10 digit extension, not 6. 2002-08-09 13:46:15 -05:00
ram@ram.(none)
8f7f648d8d Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into ram.(none):/home/ram/work/mysql-4.0
2002-08-09 19:37:47 +05:00
ram@ram.(none)
390678905b added NULLs check to the QUOTE() function 2002-08-09 19:36:36 +05:00
monty@hundin.mysql.fi
43f1fb7972 Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0 2002-08-09 16:50:24 +03:00
monty@hundin.mysql.fi
ac6e640c4d Fix for SSL and new my_getopt
Fix for syntax error bug in SET TRANSACTION ISOLATION
2002-08-09 16:47:16 +03:00
Sinisa@sinisa.nasamreza.org
34c07904ae Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2002-08-09 16:06:00 +03:00
Sinisa@sinisa.nasamreza.org
14de3138bd reverting a fix 2002-08-09 16:05:02 +03:00
ram@ram.(none)
eebad763f8 Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.0
into ram.(none):/home/ram/work/mysql-4.0
2002-08-09 17:59:45 +05:00
ram@ram.(none)
eb910c8d10 test case for the QUOTE() function 2002-08-09 17:58:30 +05:00
Sinisa@sinisa.nasamreza.org
5ac3792e16 bk resolve 2002-08-09 15:55:02 +03:00
heikki@hundin.mysql.fi
edf3929cd5 ha_innobase.cc, trx0trx.h, lock0lock.c, trx0trx.c:
Add some more safety margin to buffer sizes in prints
2002-08-09 15:34:23 +03:00